Maj jdk#6u15-1

1 files changed, 72 insertions, 58 deletions

diff --git a/base/jdk/.footprint b/base/jdk/.footprint
index 66999eb0d..8c1a9fddf 100644
--- a/base/jdk/.footprint
+++ b/base/jdk/.footprint
@@ -19,6 +19,7 @@ lrwxrwxrwx	root/root	opt/jdk/bin/ControlPanel -> ../jre/bin/ControlPanel
 -rwxr-xr-x	root/root	opt/jdk/bin/jar
 -rwxr-xr-x	root/root	opt/jdk/bin/jarsigner
 lrwxrwxrwx	root/root	opt/jdk/bin/java -> ../jre/bin/java
+-r-xr-xr-x	root/root	opt/jdk/bin/java-rmi.cgi
 -rwxr-xr-x	root/root	opt/jdk/bin/javac
 -rwxr-xr-x	root/root	opt/jdk/bin/javadoc
 -rwxr-xr-x	root/root	opt/jdk/bin/javah
@@ -3542,60 +3543,6 @@ drwxr-xr-x	root/root	opt/jdk/jre/javaws/
 lrwxrwxrwx	root/root	opt/jdk/jre/javaws/javaws -> ../bin/javaws
 drwxr-xr-x	root/root	opt/jdk/jre/lib/
 -rw-r--r--	root/root	opt/jdk/jre/lib/alt-rt.jar
-drwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/
-drwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/headless/
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/headless/libmawt.so
-drwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/jli/
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/jli/libjli.so
--r--r--r--	root/root	opt/jdk/jre/lib/amd64/jvm.cfg
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libJdbcOdbc.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libattach.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libawt.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libcmm.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libdcpr.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libdeploy.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libdt_socket.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libfontmanager.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libhprof.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libinstrument.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libioser12.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libj2gss.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libj2pcsc.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libj2pkcs11.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libjaas_unix.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libjava.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libjava_crw_demo.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libjavaplugin_jni.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libjawt.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libjdwp.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libjpeg.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libjsig.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libjsound.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libjsoundalsa.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libmanagement.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libmlib_image.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libnative_chmod.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libnative_chmod_g.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libnet.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libnio.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libnpjp2.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libnpt.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/librmi.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libsaproc.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libsplashscreen.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libunpack.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libverify.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/libzip.so
-drwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/motif21/
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/motif21/libmawt.so
-drwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/native_threads/
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/native_threads/libhpi.so
-drwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/server/
--rw-r--r--	root/root	opt/jdk/jre/lib/amd64/server/Xusage.txt
-lrwxrwxrwx	root/root	opt/jdk/jre/lib/amd64/server/libjsig.so -> ../libjsig.so
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/server/libjvm.so
-drwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/xawt/
--rwxr-xr-x	root/root	opt/jdk/jre/lib/amd64/xawt/libmawt.so
 drwxr-xr-x	root/root	opt/jdk/jre/lib/applet/
 drwxr-xr-x	root/root	opt/jdk/jre/lib/audio/
 -r--r--r--	root/root	opt/jdk/jre/lib/audio/soundbank.gm
@@ -3744,6 +3691,67 @@ drwxr-xr-x	root/root	opt/jdk/jre/lib/fonts/
 -r--r--r--	root/root	opt/jdk/jre/lib/fonts/LucidaTypewriterBold.ttf
 -r--r--r--	root/root	opt/jdk/jre/lib/fonts/LucidaTypewriterRegular.ttf
 -r--r--r--	root/root	opt/jdk/jre/lib/fonts/fonts.dir
+drwxr-xr-x	root/root	opt/jdk/jre/lib/i386/
+drwxr-xr-x	root/root	opt/jdk/jre/lib/i386/client/
+-rw-r--r--	root/root	opt/jdk/jre/lib/i386/client/Xusage.txt
+-r--r--r--	root/root	opt/jdk/jre/lib/i386/client/classes.jsa
+lrwxrwxrwx	root/root	opt/jdk/jre/lib/i386/client/libjsig.so -> ../libjsig.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/client/libjvm.so
+drwxr-xr-x	root/root	opt/jdk/jre/lib/i386/headless/
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/headless/libmawt.so
+drwxr-xr-x	root/root	opt/jdk/jre/lib/i386/jli/
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/jli/libjli.so
+-r--r--r--	root/root	opt/jdk/jre/lib/i386/jvm.cfg
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libJdbcOdbc.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libattach.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libawt.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libcmm.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libdcpr.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libdeploy.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libdt_socket.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libfontmanager.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libhprof.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libinstrument.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libioser12.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libj2gss.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libj2pcsc.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libj2pkcs11.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libjaas_unix.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libjava.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libjava_crw_demo.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libjavaplugin_jni.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libjavaplugin_nscp.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libjavaplugin_nscp_gcc29.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libjawt.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libjdwp.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libjpeg.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libjsig.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libjsound.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libjsoundalsa.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libmanagement.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libmlib_image.so
+-rw-r--r--	root/root	opt/jdk/jre/lib/i386/libnative_chmod.so
+-rw-r--r--	root/root	opt/jdk/jre/lib/i386/libnative_chmod_g.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libnet.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libnio.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libnpjp2.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libnpt.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/librmi.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libsaproc.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libsplashscreen.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libunpack.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libverify.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/libzip.so
+drwxr-xr-x	root/root	opt/jdk/jre/lib/i386/motif21/
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/motif21/libmawt.so
+drwxr-xr-x	root/root	opt/jdk/jre/lib/i386/native_threads/
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/native_threads/libhpi.so
+drwxr-xr-x	root/root	opt/jdk/jre/lib/i386/server/
+-rw-r--r--	root/root	opt/jdk/jre/lib/i386/server/Xusage.txt
+lrwxrwxrwx	root/root	opt/jdk/jre/lib/i386/server/libjsig.so -> ../libjsig.so
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/server/libjvm.so
+drwxr-xr-x	root/root	opt/jdk/jre/lib/i386/xawt/
+-rwxr-xr-x	root/root	opt/jdk/jre/lib/i386/xawt/libmawt.so
 drwxr-xr-x	root/root	opt/jdk/jre/lib/im/
 -rw-r--r--	root/root	opt/jdk/jre/lib/im/indicim.jar
 -rw-r--r--	root/root	opt/jdk/jre/lib/im/thaiim.jar
@@ -4300,6 +4308,7 @@ drwxr-xr-x	root/root	opt/jdk/jre/man/
 drwxr-xr-x	root/root	opt/jdk/jre/man/ja_JP.eucJP/
 drwxr-xr-x	root/root	opt/jdk/jre/man/ja_JP.eucJP/man1/
 -rw-r--r--	root/root	opt/jdk/jre/man/ja_JP.eucJP/man1/java.1.gz
+-rw-r--r--	root/root	opt/jdk/jre/man/ja_JP.eucJP/man1/javaws.1.gz
 -rw-r--r--	root/root	opt/jdk/jre/man/ja_JP.eucJP/man1/keytool.1.gz
 -rw-r--r--	root/root	opt/jdk/jre/man/ja_JP.eucJP/man1/orbd.1.gz
 -rw-r--r--	root/root	opt/jdk/jre/man/ja_JP.eucJP/man1/pack200.1.gz
@@ -4325,6 +4334,11 @@ drwxr-xr-x	root/root	opt/jdk/jre/plugin/
 drwxr-xr-x	root/root	opt/jdk/jre/plugin/desktop/
 -rw-r--r--	root/root	opt/jdk/jre/plugin/desktop/sun_java.desktop
 -r--r--r--	root/root	opt/jdk/jre/plugin/desktop/sun_java.png
+drwxr-xr-x	root/root	opt/jdk/jre/plugin/i386/
+drwxr-xr-x	root/root	opt/jdk/jre/plugin/i386/ns7-gcc29/
+-rwxr-xr-x	root/root	opt/jdk/jre/plugin/i386/ns7-gcc29/libjavaplugin_oji.so
+drwxr-xr-x	root/root	opt/jdk/jre/plugin/i386/ns7/
+-rwxr-xr-x	root/root	opt/jdk/jre/plugin/i386/ns7/libjavaplugin_oji.so
 drwxr-xr-x	root/root	opt/jdk/lib/
 -rw-r--r--	root/root	opt/jdk/lib/ct.sym
 -rw-r--r--	root/root	opt/jdk/lib/dt.jar
@@ -4514,11 +4528,11 @@ drwxr-xr-x	root/root	opt/jdk/lib/visualvm/profiler3/config/Services/
 drwxr-xr-x	root/root	opt/jdk/lib/visualvm/profiler3/lib/
 drwxr-xr-x	root/root	opt/jdk/lib/visualvm/profiler3/lib/deployed/
 drwxr-xr-x	root/root	opt/jdk/lib/visualvm/profiler3/lib/deployed/jdk15/
-drwxr-xr-x	root/root	opt/jdk/lib/visualvm/profiler3/lib/deployed/jdk15/linux-amd64/
--rw-r--r--	root/root	opt/jdk/lib/visualvm/profiler3/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
+drwxr-xr-x	root/root	opt/jdk/lib/visualvm/profiler3/lib/deployed/jdk15/linux/
+-rw-r--r--	root/root	opt/jdk/lib/visualvm/profiler3/lib/deployed/jdk15/linux/libprofilerinterface.so
 drwxr-xr-x	root/root	opt/jdk/lib/visualvm/profiler3/lib/deployed/jdk16/
-drwxr-xr-x	root/root	opt/jdk/lib/visualvm/profiler3/lib/deployed/jdk16/linux-amd64/
--rw-r--r--	root/root	opt/jdk/lib/visualvm/profiler3/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so
+drwxr-xr-x	root/root	opt/jdk/lib/visualvm/profiler3/lib/deployed/jdk16/linux/
+-rw-r--r--	root/root	opt/jdk/lib/visualvm/profiler3/lib/deployed/jdk16/linux/libprofilerinterface.so
 -rw-r--r--	root/root	opt/jdk/lib/visualvm/profiler3/lib/jfluid-server-15.jar
 -rw-r--r--	root/root	opt/jdk/lib/visualvm/profiler3/lib/jfluid-server.jar
 drwxr-xr-x	root/root	opt/jdk/lib/visualvm/profiler3/modules/