--- openjdk/jdk/make/com/sun/Makefile.orig +++ openjdk/jdk/make/com/sun/Makefile @@ -31,13 +31,6 @@ PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk -ifndef OPENJDK - ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,) - ifneq ("$(ORG_EXISTS)", "") - SCRIPT_SUBDIR = script - endif -endif - # jarsigner is part of JRE SUBDIRS = java security net/ssl jarsigner --- openjdk/jdk/make/com/sun/script/Makefile.orig +++ openjdk/jdk/make/com/sun/script/Makefile @@ -31,6 +31,8 @@ AUTO_FILES_JAVA_DIRS = com/sun/script +OTHER_JAVACFLAGS = -classpath $(RHINO_JAR) + # # Files that need to be copied # --- openjdk/jdk/make/common/Release.gmk.orig +++ openjdk/jdk/make/common/Release.gmk @@ -766,6 +766,7 @@ $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar + $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar @# Generate meta-index to make boot and extension class loaders lazier $(CD) $(JRE_IMAGE_DIR)/lib && \ $(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \ --- openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java.orig +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java @@ -24,7 +24,7 @@ */ package com.sun.script.javascript; -import sun.org.mozilla.javascript.internal.*; +import sun.org.mozilla.javascript.*; import javax.script.*; import java.util.*; --- openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java.orig +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java @@ -25,7 +25,7 @@ package com.sun.script.javascript; -import sun.org.mozilla.javascript.internal.*; +import sun.org.mozilla.javascript.*; import java.util.*; /** --- openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java.orig +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java @@ -26,7 +26,7 @@ package com.sun.script.javascript; import javax.script.Invocable; -import sun.org.mozilla.javascript.internal.*; +import sun.org.mozilla.javascript.*; /** * This class implements Rhino-like JavaAdapter to help implement a Java --- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java.orig +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java @@ -26,7 +26,7 @@ package com.sun.script.javascript; import java.util.*; -import sun.org.mozilla.javascript.internal.*; +import sun.org.mozilla.javascript.*; /** * This class prevents script access to certain sensitive classes. --- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java.orig +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java @@ -25,7 +25,7 @@ package com.sun.script.javascript; import javax.script.*; -import sun.org.mozilla.javascript.internal.*; +import sun.org.mozilla.javascript.*; /** * Represents compiled JavaScript code. --- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java.orig +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java @@ -26,7 +26,7 @@ package com.sun.script.javascript; import com.sun.script.util.*; import javax.script.*; -import sun.org.mozilla.javascript.internal.*; +import sun.org.mozilla.javascript.*; import java.lang.reflect.Method; import java.io.*; import java.security.*; --- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java.orig +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java @@ -26,7 +26,7 @@ package com.sun.script.javascript; import javax.script.*; import java.util.*; -import sun.org.mozilla.javascript.internal.*; +import sun.org.mozilla.javascript.*; import com.sun.script.util.*; /** --- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java.orig +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java @@ -25,7 +25,7 @@ package com.sun.script.javascript; -import sun.org.mozilla.javascript.internal.*; +import sun.org.mozilla.javascript.*; import java.security.AccessControlContext; import javax.script.*; import java.security.AccessControlContext; --- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java.orig +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java @@ -27,7 +27,7 @@ import java.lang.reflect.*; import static sun.security.util.SecurityConstants.*; -import sun.org.mozilla.javascript.internal.*; +import sun.org.mozilla.javascript.*; /** * This wrap factory is used for security reasons. JSR 223 script