Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorlana
Thu, 20 Aug 2015 12:29:04 -0700
changeset 32176 3a2debd4d023
parent 32169 97ed86ffcb97 (current diff)
parent 32175 6367d5b5766b (diff)
child 32207 6b12d11555ce
Merge
--- a/common/bin/compare_exceptions.sh.incl	Thu Aug 20 11:38:17 2015 -0700
+++ b/common/bin/compare_exceptions.sh.incl	Thu Aug 20 12:29:04 2015 -0700
@@ -42,7 +42,6 @@
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
@@ -54,7 +53,6 @@
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
@@ -62,9 +60,7 @@
 ./lib/i386/client/libjvm.so
 ./lib/i386/libattach.so
 ./lib/i386/libdt_socket.so
-./lib/i386/libhprof.so
 ./lib/i386/libinstrument.so
-./lib/i386/libjava_crw_demo.so
 ./lib/i386/libjsdt.so
 ./lib/i386/libmanagement.so
 ./lib/i386/libnpt.so
@@ -118,7 +114,6 @@
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
@@ -130,16 +125,13 @@
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
 ./demo/jvmti/waiters/lib/libwaiters.so
 ./lib/amd64/libattach.so
 ./lib/amd64/libdt_socket.so
-./lib/amd64/libhprof.so
 ./lib/amd64/libinstrument.so
-./lib/amd64/libjava_crw_demo.so
 ./lib/amd64/libjsdt.so
 ./lib/amd64/libjsig.so
 ./lib/amd64/libmanagement.so
@@ -197,7 +189,6 @@
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
@@ -217,7 +208,6 @@
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
@@ -232,7 +222,6 @@
 ./lib/amd64/libdcpr.so
 ./lib/amd64/libdt_socket.so
 ./lib/amd64/libfontmanager.so
-./lib/amd64/libhprof.so
 ./lib/amd64/libinstrument.so
 ./lib/amd64/libj2gss.so
 ./lib/amd64/libj2pcsc.so
@@ -240,7 +229,6 @@
 ./lib/amd64/libj2ucrypto.so
 ./lib/amd64/libjaas_unix.so
 ./lib/amd64/libjava.so
-./lib/amd64/libjava_crw_demo.so
 ./lib/amd64/libjawt.so
 ./lib/amd64/libjdwp.so
 ./lib/amd64/libjfr.so
@@ -330,7 +318,6 @@
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
@@ -353,7 +340,6 @@
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
@@ -369,7 +355,6 @@
 ./lib/sparcv9/libdcpr.so
 ./lib/sparcv9/libdt_socket.so
 ./lib/sparcv9/libfontmanager.so
-./lib/sparcv9/libhprof.so
 ./lib/sparcv9/libinstrument.so
 ./lib/sparcv9/libj2gss.so
 ./lib/sparcv9/libj2pcsc.so
@@ -377,7 +362,6 @@
 ./lib/sparcv9/libj2ucrypto.so
 ./lib/sparcv9/libjaas_unix.so
 ./lib/sparcv9/libjava.so
-./lib/sparcv9/libjava_crw_demo.so
 ./lib/sparcv9/libjawt.so
 ./lib/sparcv9/libjdwp.so
 ./lib/sparcv9/libjfr.so
@@ -473,7 +457,6 @@
 ./demo/jvmti/heapTracker/lib/heapTracker.dll
 ./demo/jvmti/minst/lib/minst.dll
 ./bin/attach.dll
-./bin/java_crw_demo.dll
 ./bin/jsoundds.dll
 ./bin/server/jvm.dll
 ./bin/appletviewer.exe
@@ -611,9 +594,7 @@
 ./Contents/Home/lib/libawt_lwawt.dylib
 ./Contents/Home/lib/libdeploy.dylib
 ./Contents/Home/lib/libdt_socket.dylib
-./Contents/Home/lib/libhprof.dylib
 ./Contents/Home/lib/libinstrument.dylib
-./Contents/Home/lib/libjava_crw_demo.dylib
 ./Contents/Home/lib/libjdwp.dylib
 ./Contents/Home/lib/libjsdt.dylib
 ./Contents/Home/lib/libjsig.dylib
@@ -635,9 +616,7 @@
 ./lib/libawt_lwawt.dylib
 ./lib/libdeploy.dylib
 ./lib/libdt_socket.dylib
-./lib/libhprof.dylib
 ./lib/libinstrument.dylib
-./lib/libjava_crw_demo.dylib
 ./lib/libjdwp.dylib
 ./lib/libjsdt.dylib
 ./lib/libjsig.dylib
--- a/make/Images.gmk	Thu Aug 20 11:38:17 2015 -0700
+++ b/make/Images.gmk	Thu Aug 20 12:29:04 2015 -0700
@@ -47,7 +47,7 @@
 
 # tools
 TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.scripting.nashorn.shell \
-               jdk.javadoc jdk.jcmd jdk.jconsole jdk.hotspot.agent jdk.hprof.agent jdk.jartool \
+               jdk.javadoc jdk.jcmd jdk.jconsole jdk.hotspot.agent jdk.jartool \
                jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
--- a/modules.xml	Thu Aug 20 11:38:17 2015 -0700
+++ b/modules.xml	Thu Aug 20 12:29:04 2015 -0700
@@ -1623,10 +1623,6 @@
     <depend>jdk.jdi</depend>
   </module>
   <module>
-    <name>jdk.hprof.agent</name>
-    <depend>java.base</depend>
-  </module>
-  <module>
     <name>jdk.httpserver</name>
     <depend>java.base</depend>
     <depend>java.logging</depend>
@@ -1798,7 +1794,7 @@
     <name>jdk.scripting.nashorn</name>
     <depend>java.base</depend>
     <depend>java.logging</depend>
-    <depend>java.scripting</depend>
+    <depend re-exports="true">java.scripting</depend>
     <export>
       <name>jdk.nashorn.internal.runtime</name>
       <to>jdk.scripting.nashorn.shell</to>
@@ -1811,11 +1807,16 @@
       <name>jdk.nashorn.tools</name>
       <to>jdk.scripting.nashorn.shell</to>
     </export>
+    <export>
+      <name>jdk.nashorn.api.scripting</name>
+    </export>
+    <export>
+      <name>jdk.nashorn.api.tree</name>
+    </export>
   </module>
   <module>
     <name>jdk.scripting.nashorn.shell</name>
     <depend>java.base</depend>
-    <depend>java.prefs</depend>
     <depend>jdk.scripting.nashorn</depend>
     <depend>jdk.internal.le</depend>
   </module>
jdk-sandbox