/[packages]/updates/3/java-1.7.0-openjdk/current/SOURCES/rhino-2.3.patch
ViewVC logotype

Contents of /updates/3/java-1.7.0-openjdk/current/SOURCES/rhino-2.3.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 546572 - (show annotations) (download)
Wed Oct 23 13:41:34 2013 UTC (10 years, 5 months ago) by oden
File size: 7625 byte(s) 
- sync with cauldron
1 diff -ur openjdk.orig/jdk/make/com/sun/Makefile openjdk/jdk/make/com/sun/Makefile
2 --- openjdk.orig/jdk/make/com/sun/Makefile 2012-02-14 16:12:48.000000000 -0500
3 +++ openjdk/jdk/make/com/sun/Makefile 2012-02-22 14:25:10.327518016 -0500
4 @@ -31,13 +31,6 @@
5 PRODUCT = sun
6 include $(BUILDDIR)/common/Defs.gmk
7
8 -ifndef OPENJDK
9 - ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,)
10 - ifneq ("$(ORG_EXISTS)", "")
11 - SCRIPT_SUBDIR = script
12 - endif
13 -endif
14 -
15 # jarsigner is part of JRE
16 SUBDIRS = java security net/ssl jarsigner
17
18 @@ -45,7 +38,7 @@
19 SUBDIRS_desktop = image
20 SUBDIRS_enterprise = crypto/provider jndi \
21 org rowset net/httpserver
22 -SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing servicetag nio demo
23 +SUBDIRS_misc = script tracing servicetag nio demo
24
25 # Omit mirror since it's built with the apt tool.
26 SUBDIRS_tools = tools
27 diff -ur openjdk.orig/jdk/make/com/sun/script/Makefile openjdk/jdk/make/com/sun/script/Makefile
28 --- openjdk.orig/jdk/make/com/sun/script/Makefile 2012-02-14 16:12:48.000000000 -0500
29 +++ openjdk/jdk/make/com/sun/script/Makefile 2012-02-22 14:10:53.325225237 -0500
30 @@ -31,6 +31,8 @@
31
32 AUTO_FILES_JAVA_DIRS = com/sun/script
33
34 +OTHER_JAVACFLAGS = -classpath $(RHINO_JAR)
35 +
36 #
37 # Files that need to be copied
38 #
39 diff -ur openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk
40 --- openjdk.orig/jdk/make/common/Release.gmk 2012-02-14 16:12:48.000000000 -0500
41 +++ openjdk/jdk/make/common/Release.gmk 2012-02-22 14:10:53.325225237 -0500
42 @@ -766,6 +766,7 @@
43 $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
44 $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
45 $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
46 + $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
47 ifneq ($(JFR_JAR),)
48 $(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar
49 endif
50 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
51 --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2012-02-14 16:12:49.000000000 -0500
52 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2012-02-22 14:10:53.325225237 -0500
53 @@ -24,7 +24,7 @@
54 */
55
56 package com.sun.script.javascript;
57 -import sun.org.mozilla.javascript.internal.*;
58 +import sun.org.mozilla.javascript.*;
59 import javax.script.*;
60 import java.util.*;
61
62 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
63 --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2012-02-14 16:12:49.000000000 -0500
64 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2012-02-22 14:10:53.325225237 -0500
65 @@ -26,7 +26,7 @@
66 package com.sun.script.javascript;
67
68 import javax.script.Invocable;
69 -import sun.org.mozilla.javascript.internal.*;
70 +import sun.org.mozilla.javascript.*;
71
72 /**
73 * This class implements Rhino-like JavaAdapter to help implement a Java
74 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
75 --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2012-02-14 16:12:49.000000000 -0500
76 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2012-02-22 14:10:53.326225216 -0500
77 @@ -25,7 +25,7 @@
78
79 package com.sun.script.javascript;
80
81 -import sun.org.mozilla.javascript.internal.*;
82 +import sun.org.mozilla.javascript.*;
83 import java.util.*;
84
85 /**
86 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
87 --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2012-02-14 16:12:49.000000000 -0500
88 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2012-02-22 14:10:53.326225216 -0500
89 @@ -26,7 +26,7 @@
90 package com.sun.script.javascript;
91
92 import java.util.*;
93 -import sun.org.mozilla.javascript.internal.*;
94 +import sun.org.mozilla.javascript.*;
95
96 /**
97 * This class prevents script access to certain sensitive classes.
98 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
99 --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2012-02-14 16:12:49.000000000 -0500
100 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2012-02-22 14:10:53.326225216 -0500
101 @@ -25,7 +25,7 @@
102
103 package com.sun.script.javascript;
104 import javax.script.*;
105 -import sun.org.mozilla.javascript.internal.*;
106 +import sun.org.mozilla.javascript.*;
107
108 /**
109 * Represents compiled JavaScript code.
110 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
111 --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2012-02-14 16:12:49.000000000 -0500
112 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2012-02-22 14:10:53.326225216 -0500
113 @@ -26,7 +26,7 @@
114 package com.sun.script.javascript;
115 import javax.script.*;
116 import java.util.*;
117 -import sun.org.mozilla.javascript.internal.*;
118 +import sun.org.mozilla.javascript.*;
119 import com.sun.script.util.*;
120
121 /**
122 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
123 --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2012-02-14 16:12:49.000000000 -0500
124 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2012-02-22 14:10:53.327225198 -0500
125 @@ -26,7 +26,7 @@
126 package com.sun.script.javascript;
127 import com.sun.script.util.*;
128 import javax.script.*;
129 -import sun.org.mozilla.javascript.internal.*;
130 +import sun.org.mozilla.javascript.*;
131 import java.lang.reflect.Method;
132 import java.io.*;
133 import java.security.*;
134 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
135 --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2012-02-14 16:12:49.000000000 -0500
136 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2012-02-22 14:10:53.327225198 -0500
137 @@ -25,7 +25,7 @@
138
139 package com.sun.script.javascript;
140
141 -import sun.org.mozilla.javascript.internal.*;
142 +import sun.org.mozilla.javascript.*;
143 import java.security.AccessControlContext;
144 import javax.script.*;
145 import java.security.AccessControlContext;
146 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
147 --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2012-02-14 16:12:49.000000000 -0500
148 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2012-02-22 14:10:53.327225198 -0500
149 @@ -27,7 +27,7 @@
150
151 import java.lang.reflect.*;
152 import static sun.security.util.SecurityConstants.*;
153 -import sun.org.mozilla.javascript.internal.*;
154 +import sun.org.mozilla.javascript.*;
155
156 /**
157 * This wrap factory is used for security reasons. JSR 223 script
  ViewVC Help
Powered by ViewVC 1.1.30