diff -ur openjdk.orig/jdk/make/com/sun/Makefile openjdk/jdk/make/com/sun/Makefile

--- openjdk.orig/jdk/make/com/sun/Makefile	2012-02-14 16:12:48.000000000 -0500

+++ openjdk/jdk/make/com/sun/Makefile	2012-02-22 14:25:10.327518016 -0500

@@ -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

@@ -45,7 +38,7 @@

 SUBDIRS_desktop    = image

 SUBDIRS_enterprise = crypto/provider jndi \

                      org rowset net/httpserver

-SUBDIRS_misc       = $(SCRIPT_SUBDIR) tracing nio demo

+SUBDIRS_misc       = script tracing nio demo

 # Omit mirror since it's built with the apt tool.

 SUBDIRS_tools      = tools

diff -ur openjdk.orig/jdk/make/com/sun/script/Makefile openjdk/jdk/make/com/sun/script/Makefile

--- openjdk.orig/jdk/make/com/sun/script/Makefile	2012-02-14 16:12:48.000000000 -0500

+++ openjdk/jdk/make/com/sun/script/Makefile	2012-02-22 14:10:53.325225237 -0500

@@ -31,6 +31,8 @@

 AUTO_FILES_JAVA_DIRS = com/sun/script

+OTHER_JAVACFLAGS = -classpath $(RHINO_JAR)

+

 #

 # Files that need to be copied

 #

diff -ur openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk

--- openjdk.orig/jdk/make/common/Release.gmk	2012-02-14 16:12:48.000000000 -0500

+++ openjdk/jdk/make/common/Release.gmk	2012-02-22 14:10:53.325225237 -0500

@@ -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

 ifneq ($(JFR_JAR),)

 	$(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar

 endif

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

--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java	2012-02-14 16:12:49.000000000 -0500

+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java	2012-02-22 14:10:53.325225237 -0500

@@ -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.*;

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

--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java	2012-02-14 16:12:49.000000000 -0500

+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java	2012-02-22 14:10:53.325225237 -0500

@@ -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

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

--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java	2012-02-14 16:12:49.000000000 -0500

+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java	2012-02-22 14:10:53.326225216 -0500

@@ -25,7 +25,7 @@

 package com.sun.script.javascript;

-import sun.org.mozilla.javascript.internal.*;

+import sun.org.mozilla.javascript.*;

 import java.util.*;

 /**

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

--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java	2012-02-14 16:12:49.000000000 -0500

+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java	2012-02-22 14:10:53.326225216 -0500

@@ -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.

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

--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java	2012-02-14 16:12:49.000000000 -0500

+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java	2012-02-22 14:10:53.326225216 -0500

@@ -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.

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

--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java	2012-02-14 16:12:49.000000000 -0500

+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java	2012-02-22 14:10:53.326225216 -0500

@@ -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.*;

 /**

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

--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java	2012-02-14 16:12:49.000000000 -0500

+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java	2012-02-22 14:10:53.327225198 -0500

@@ -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.*;

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

--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java	2012-02-14 16:12:49.000000000 -0500

+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java	2012-02-22 14:10:53.327225198 -0500

@@ -25,7 +25,7 @@

 package com.sun.script.javascript;

-import sun.org.mozilla.javascript.internal.*;

+import sun.org.mozilla.javascript.*;

 import javax.script.*;

 import java.security.AccessControlContext;

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

--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java	2012-02-14 16:12:49.000000000 -0500

+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java	2012-02-22 14:10:53.327225198 -0500

@@ -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