|
 |
60df80 |
diff -ur openjdk.orig/jdk/make/com/sun/Makefile openjdk/jdk/make/com/sun/Makefile
|
|
|
60df80 |
--- openjdk.orig/jdk/make/com/sun/Makefile 2012-02-14 16:12:48.000000000 -0500
|
|
|
60df80 |
+++ openjdk/jdk/make/com/sun/Makefile 2012-02-22 14:25:10.327518016 -0500
|
|
|
60df80 |
@@ -31,13 +31,6 @@
|
|
|
60df80 |
PRODUCT = sun
|
|
|
60df80 |
include $(BUILDDIR)/common/Defs.gmk
|
|
|
60df80 |
|
|
|
60df80 |
-ifndef OPENJDK
|
|
|
60df80 |
- ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,)
|
|
|
60df80 |
- ifneq ("$(ORG_EXISTS)", "")
|
|
|
60df80 |
- SCRIPT_SUBDIR = script
|
|
|
60df80 |
- endif
|
|
|
60df80 |
-endif
|
|
|
60df80 |
-
|
|
|
60df80 |
# jarsigner is part of JRE
|
|
|
60df80 |
SUBDIRS = java security net/ssl jarsigner
|
|
|
60df80 |
|
|
|
60df80 |
@@ -45,7 +38,7 @@
|
|
|
60df80 |
SUBDIRS_desktop = image
|
|
|
60df80 |
SUBDIRS_enterprise = crypto/provider jndi \
|
|
|
60df80 |
org rowset net/httpserver
|
|
|
60df80 |
-SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing nio demo
|
|
|
60df80 |
+SUBDIRS_misc = script tracing nio demo
|
|
|
60df80 |
|
|
|
60df80 |
# Omit mirror since it's built with the apt tool.
|
|
|
60df80 |
SUBDIRS_tools = tools
|
|
|
60df80 |
diff -ur openjdk.orig/jdk/make/com/sun/script/Makefile openjdk/jdk/make/com/sun/script/Makefile
|
|
|
60df80 |
--- openjdk.orig/jdk/make/com/sun/script/Makefile 2012-02-14 16:12:48.000000000 -0500
|
|
|
60df80 |
+++ openjdk/jdk/make/com/sun/script/Makefile 2012-02-22 14:10:53.325225237 -0500
|
|
|
60df80 |
@@ -31,6 +31,8 @@
|
|
|
60df80 |
|
|
|
60df80 |
AUTO_FILES_JAVA_DIRS = com/sun/script
|
|
|
60df80 |
|
|
|
60df80 |
+OTHER_JAVACFLAGS = -classpath $(RHINO_JAR)
|
|
|
60df80 |
+
|
|
|
60df80 |
#
|
|
|
60df80 |
# Files that need to be copied
|
|
|
60df80 |
#
|
|
|
60df80 |
diff -ur openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk
|
|
|
60df80 |
--- openjdk.orig/jdk/make/common/Release.gmk 2012-02-14 16:12:48.000000000 -0500
|
|
|
60df80 |
+++ openjdk/jdk/make/common/Release.gmk 2012-02-22 14:10:53.325225237 -0500
|
|
|
60df80 |
@@ -766,6 +766,7 @@
|
|
|
60df80 |
$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
|
|
|
60df80 |
$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
|
|
|
60df80 |
$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
|
|
|
60df80 |
+ $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
|
|
|
60df80 |
ifneq ($(JFR_JAR),)
|
|
|
60df80 |
$(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar
|
|
|
60df80 |
endif
|
|
|
60df80 |
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java
|
|
|
60df80 |
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2012-02-14 16:12:49.000000000 -0500
|
|
|
60df80 |
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2012-02-22 14:10:53.325225237 -0500
|
|
|
60df80 |
@@ -24,7 +24,7 @@
|
|
|
60df80 |
*/
|
|
|
60df80 |
|
|
|
60df80 |
package com.sun.script.javascript;
|
|
|
60df80 |
-import sun.org.mozilla.javascript.internal.*;
|
|
|
60df80 |
+import sun.org.mozilla.javascript.*;
|
|
|
60df80 |
import javax.script.*;
|
|
|
60df80 |
import java.util.*;
|
|
|
60df80 |
|
|
|
60df80 |
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java
|
|
|
60df80 |
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2012-02-14 16:12:49.000000000 -0500
|
|
|
60df80 |
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2012-02-22 14:10:53.325225237 -0500
|
|
|
60df80 |
@@ -26,7 +26,7 @@
|
|
|
60df80 |
package com.sun.script.javascript;
|
|
|
60df80 |
|
|
|
60df80 |
import javax.script.Invocable;
|
|
|
60df80 |
-import sun.org.mozilla.javascript.internal.*;
|
|
|
60df80 |
+import sun.org.mozilla.javascript.*;
|
|
|
60df80 |
|
|
|
60df80 |
/**
|
|
|
60df80 |
* This class implements Rhino-like JavaAdapter to help implement a Java
|
|
|
60df80 |
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java
|
|
|
60df80 |
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2012-02-14 16:12:49.000000000 -0500
|
|
|
60df80 |
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2012-02-22 14:10:53.326225216 -0500
|
|
|
60df80 |
@@ -25,7 +25,7 @@
|
|
|
60df80 |
|
|
|
60df80 |
package com.sun.script.javascript;
|
|
|
60df80 |
|
|
|
60df80 |
-import sun.org.mozilla.javascript.internal.*;
|
|
|
60df80 |
+import sun.org.mozilla.javascript.*;
|
|
|
60df80 |
import java.util.*;
|
|
|
60df80 |
|
|
|
60df80 |
/**
|
|
|
60df80 |
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java
|
|
|
60df80 |
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2012-02-14 16:12:49.000000000 -0500
|
|
|
60df80 |
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2012-02-22 14:10:53.326225216 -0500
|
|
|
60df80 |
@@ -26,7 +26,7 @@
|
|
|
60df80 |
package com.sun.script.javascript;
|
|
|
60df80 |
|
|
|
60df80 |
import java.util.*;
|
|
|
60df80 |
-import sun.org.mozilla.javascript.internal.*;
|
|
|
60df80 |
+import sun.org.mozilla.javascript.*;
|
|
|
60df80 |
|
|
|
60df80 |
/**
|
|
|
60df80 |
* This class prevents script access to certain sensitive classes.
|
|
|
60df80 |
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java
|
|
|
60df80 |
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2012-02-14 16:12:49.000000000 -0500
|
|
|
60df80 |
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2012-02-22 14:10:53.326225216 -0500
|
|
|
60df80 |
@@ -25,7 +25,7 @@
|
|
|
60df80 |
|
|
|
60df80 |
package com.sun.script.javascript;
|
|
|
60df80 |
import javax.script.*;
|
|
|
60df80 |
-import sun.org.mozilla.javascript.internal.*;
|
|
|
60df80 |
+import sun.org.mozilla.javascript.*;
|
|
|
60df80 |
|
|
|
60df80 |
/**
|
|
|
60df80 |
* Represents compiled JavaScript code.
|
|
|
60df80 |
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java
|
|
|
60df80 |
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2012-02-14 16:12:49.000000000 -0500
|
|
|
60df80 |
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2012-02-22 14:10:53.326225216 -0500
|
|
|
60df80 |
@@ -26,7 +26,7 @@
|
|
|
60df80 |
package com.sun.script.javascript;
|
|
|
60df80 |
import javax.script.*;
|
|
|
60df80 |
import java.util.*;
|
|
|
60df80 |
-import sun.org.mozilla.javascript.internal.*;
|
|
|
60df80 |
+import sun.org.mozilla.javascript.*;
|
|
|
60df80 |
import com.sun.script.util.*;
|
|
|
60df80 |
|
|
|
60df80 |
/**
|
|
|
60df80 |
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java
|
|
|
60df80 |
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2012-02-14 16:12:49.000000000 -0500
|
|
|
60df80 |
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2012-02-22 14:10:53.327225198 -0500
|
|
|
60df80 |
@@ -26,7 +26,7 @@
|
|
|
60df80 |
package com.sun.script.javascript;
|
|
|
60df80 |
import com.sun.script.util.*;
|
|
|
60df80 |
import javax.script.*;
|
|
|
60df80 |
-import sun.org.mozilla.javascript.internal.*;
|
|
|
60df80 |
+import sun.org.mozilla.javascript.*;
|
|
|
60df80 |
import java.lang.reflect.Method;
|
|
|
60df80 |
import java.io.*;
|
|
|
60df80 |
import java.security.*;
|
|
|
60df80 |
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java
|
|
|
60df80 |
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2012-02-14 16:12:49.000000000 -0500
|
|
|
60df80 |
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2012-02-22 14:10:53.327225198 -0500
|
|
|
60df80 |
@@ -25,7 +25,7 @@
|
|
|
60df80 |
|
|
|
60df80 |
package com.sun.script.javascript;
|
|
|
60df80 |
|
|
|
60df80 |
-import sun.org.mozilla.javascript.internal.*;
|
|
|
60df80 |
+import sun.org.mozilla.javascript.*;
|
|
|
60df80 |
import javax.script.*;
|
|
|
60df80 |
import java.security.AccessControlContext;
|
|
|
60df80 |
|
|
|
60df80 |
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java
|
|
|
60df80 |
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2012-02-14 16:12:49.000000000 -0500
|
|
|
60df80 |
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2012-02-22 14:10:53.327225198 -0500
|
|
|
60df80 |
@@ -27,7 +27,7 @@
|
|
|
60df80 |
|
|
|
60df80 |
import java.lang.reflect.*;
|
|
|
60df80 |
import static sun.security.util.SecurityConstants.*;
|
|
|
60df80 |
-import sun.org.mozilla.javascript.internal.*;
|
|
|
60df80 |
+import sun.org.mozilla.javascript.*;
|
|
|
60df80 |
|
|
|
60df80 |
/**
|
|
|
60df80 |
* This wrap factory is used for security reasons. JSR 223 script
|