Split IKVM.OpenJDK.Naming.dll off from Misc.

3 files changed, 57 insertions, 44 deletions

diff --git a/openjdk/dependencies.txt b/openjdk/dependencies.txt
index bacf39ed..83f17c07 100644
--- a/openjdk/dependencies.txt
+++ b/openjdk/dependencies.txt
@@ -16,6 +16,7 @@ IKVM.OpenJDK.Corba
 ->IKVM.OpenJDK.Util
 ->IKVM.OpenJDK.SwingAWT
 ->IKVM.OpenJDK.Text
+->IKVM.OpenJDK.Naming
 
 IKVM.OpenJDK.XML.API
 
@@ -87,16 +88,17 @@ IKVM.OpenJDK.Text
 ->IKVM.OpenJDK.SwingAWT
 
 IKVM.OpenJDK.Security
-->IKVM.OpenJDK.Misc
 ->IKVM.OpenJDK.Text
 ->IKVM.OpenJDK.SwingAWT
 ->IKVM.OpenJDK.Util
+->IKVM.OpenJDK.Naming
 
 IKVM.OpenJDK.Management
 ->IKVM.OpenJDK.Misc
 ->IKVM.OpenJDK.Security
 ->IKVM.OpenJDK.Corba
 ->IKVM.OpenJDK.Util
+->IKVM.OpenJDK.Naming
 
 IKVM.OpenJDK.Misc
 ->System.Drawing
@@ -106,6 +108,7 @@ IKVM.OpenJDK.Misc
 ->IKVM.OpenJDK.Corba
 ->IKVM.OpenJDK.Text
 ->IKVM.OpenJDK.Security
+->IKVM.OpenJDK.Naming
 
 IKVM.OpenJDK.Jdbc
 ->System.Data
@@ -113,3 +116,8 @@ IKVM.OpenJDK.Jdbc
 ->IKVM.OpenJDK.Misc
 ->IKVM.OpenJDK.XML.API
 ->IKVM.OpenJDK.Util
+->IKVM.OpenJDK.Naming
+
+IKVM.OpenJDK.Naming
+->IKVM.OpenJDK.Security
+->IKVM.OpenJDK.SwingAWT
diff --git a/openjdk/openjdk.build b/openjdk/openjdk.build
index 568bfa51..5cf4b070 100644
--- a/openjdk/openjdk.build
+++ b/openjdk/openjdk.build
@@ -136,6 +136,7 @@
             <exec program="peverify" commandline="-nologo IKVM.OpenJDK.Jdbc.dll" />
             <exec program="peverify" commandline="-nologo IKVM.OpenJDK.Management.dll" />
             <exec program="peverify" commandline="-nologo IKVM.OpenJDK.Misc.dll" />
+            <exec program="peverify" commandline="-nologo IKVM.OpenJDK.Naming.dll" />
             <exec program="peverify" commandline="-nologo IKVM.OpenJDK.Security.dll" />
             <exec program="peverify" commandline="-nologo IKVM.OpenJDK.SwingAWT.dll" />
             <exec program="peverify" commandline="-nologo IKVM.OpenJDK.Text.dll" />
diff --git a/openjdk/response.txt b/openjdk/response.txt
index b33d89f9..dabee17f 100644
--- a/openjdk/response.txt
+++ b/openjdk/response.txt
@@ -126,6 +126,7 @@ assembly.class
     -out:IKVM.OpenJDK.Corba.dll
     -baseaddress:0x56D50000
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/corba/*
+    -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/jndi/cosnaming/jndiprovider.properties
     ../../openjdk6-b16/build/linux-amd64/impsrc/com/sun/corba/se/impl/activation/*.class
     ../../openjdk6-b16/build/linux-amd64/impsrc/com/sun/corba/se/impl/copyobject/*.class
     ../../openjdk6-b16/build/linux-amd64/impsrc/com/sun/corba/se/impl/corba/*.class
@@ -232,10 +233,15 @@ assembly.class
     ../../openjdk6-b16/build/linux-amd64/impsrc/org/omg/SendingContext/*.class
     ../../openjdk6-b16/build/linux-amd64/impsrc/org/omg/stub/java/rmi/*.class
     ../../openjdk6-b16/build/linux-amd64/impsrc/sun/corba/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/cosnaming/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/toolkit/corba/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/url/corbaname/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/url/iiop/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/url/iiopname/*.class
 }
 {
     -out:IKVM.OpenJDK.XML.API.dll
-    -baseaddress:0x57410000
+    -baseaddress:0x57440000
     ../../openjdk6-b16/build/linux-amd64/impsrc/javax/xml/*.class
     ../../openjdk6-b16/build/linux-amd64/impsrc/javax/xml/datatype/*.class
     ../../openjdk6-b16/build/linux-amd64/impsrc/javax/xml/namespace/*.class
@@ -267,7 +273,7 @@ assembly.class
 }
 {
     -out:IKVM.OpenJDK.XML.XPath.dll
-    -baseaddress:0x574D0000
+    -baseaddress:0x57500000
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/org/apache/xalan/internal/res/*
     ../../openjdk6-b16/build/linux-amd64/impsrc/com/sun/org/apache/xalan/internal/extensions/*.class
     ../../openjdk6-b16/build/linux-amd64/impsrc/com/sun/org/apache/xalan/internal/res/*.class
@@ -292,7 +298,7 @@ assembly.class
 }
 {
     -out:IKVM.OpenJDK.XML.Parse.dll
-    -baseaddress:0x57800000
+    -baseaddress:0x57830000
     -resource:com/sun/org/apache/xml/internal/serialize/HTMLEntities.res=../../openjdk6-b16/build/linux-amd64/impsrc/com/sun/org/apache/xml/internal/serialize/HTMLEntities.res
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/org/apache/xerces/*
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/org/apache/xml/internal/serializer/*
@@ -351,7 +357,7 @@ assembly.class
 }
 {
     -out:IKVM.OpenJDK.XML.Transform.dll
-    -baseaddress:0x57EC0000
+    -baseaddress:0x57EF0000
     ../../openjdk6-b16/build/linux-amd64/impsrc/com/sun/java_cup/internal/runtime/*.class
     ../../openjdk6-b16/build/linux-amd64/impsrc/com/sun/org/apache/bcel/internal/*.class
     ../../openjdk6-b16/build/linux-amd64/impsrc/com/sun/org/apache/bcel/internal/classfile/*.class
@@ -375,7 +381,7 @@ assembly.class
 }
 {
     -out:IKVM.OpenJDK.XML.Bind.dll
-    -baseaddress:0x58310000
+    -baseaddress:0x58340000
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/javax/xml/bind/*
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/xml/internal/bind/*
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/xml/internal/fastinfoset/*
@@ -442,7 +448,7 @@ assembly.class
 }
 {
     -out:IKVM.OpenJDK.XML.WebServices.dll
-    -baseaddress:0x587C0000
+    -baseaddress:0x587F0000
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/xml/internal/messaging/*
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/xml/internal/ws/*
     ../../openjdk6-b16/build/linux-amd64/impsrc/com/sun/xml/internal/dtdparser/*.class
@@ -533,7 +539,7 @@ assembly.class
 }
 {
     -out:IKVM.OpenJDK.XML.RelaxNG.dll
-    -baseaddress:0x58BE0000
+    -baseaddress:0x58C10000
     ../../openjdk6-b16/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/ast/builder/*.class
     ../../openjdk6-b16/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/ast/om/*.class
     ../../openjdk6-b16/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/ast/util/*.class
@@ -555,7 +561,7 @@ assembly.class
 }
 {
     -out:IKVM.OpenJDK.XML.Crypto.dll
-    -baseaddress:0x58CD0000
+    -baseaddress:0x58D00000
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/org/apache/xml/internal/security/*
     ../../openjdk6-b16/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/*.class
     ../../openjdk6-b16/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/*.class
@@ -591,7 +597,7 @@ assembly.class
 }
 {
     -out:IKVM.OpenJDK.SwingAWT.dll
-    -baseaddress:0x58E20000
+    -baseaddress:0x58E50000
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/META-INF/services/sun.java2d.*
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/java/swing/*
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/javax/swing/*
@@ -667,13 +673,13 @@ assembly.class
 }
 {
     -out:IKVM.OpenJDK.Charsets.dll
-    -baseaddress:0x59CF0000
+    -baseaddress:0x59D20000
     ../../openjdk6-b16/jdk/src/share/classes/sun/io/*.class
     ../../openjdk6-b16/jdk/src/share/classes/sun/nio/cs/ext/*.class
 }
 {
     -out:IKVM.OpenJDK.Util.dll
-    -baseaddress:0x5AB60000
+    -baseaddress:0x5AB90000
     java/util/zip/*.class
     ../../openjdk6-b16/build/linux-amd64/gensrc/sun/util/logging/resources/*.class
     ../../openjdk6-b16/build/linux-amd64/gensrc/sun/util/resources/*.class
@@ -689,7 +695,7 @@ assembly.class
 }
 {
     -out:IKVM.OpenJDK.Text.dll
-    -baseaddress:0x5AE90000
+    -baseaddress:0x5AEC0000
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/sun/text/*
     java/text/*.class
     ../../openjdk6-b16/jdk/src/share/classes/java/text/*.class
@@ -700,7 +706,7 @@ assembly.class
 }
 {
     -out:IKVM.OpenJDK.Security.dll
-    -baseaddress:0x5B070000
+    -baseaddress:0x5B0A0000
     sun/security/jgss/wrapper/*.class
     ../../openjdk6-b16/jdk/src/share/classes/com/sun/crypto/provider/*.class
     ../../openjdk6-b16/jdk/src/share/classes/com/sun/net/ssl/*.class
@@ -764,7 +770,7 @@ assembly.class
 }
 {
     -out:IKVM.OpenJDK.Management.dll
-    -baseaddress:0x5B7C0000
+    -baseaddress:0x5B7F0000
     ConnectorBootstrap$DefaultValues.class
     ConnectorBootstrap.class
     icedtea/rt/com/sun/jmx/snmp/*.class
@@ -803,19 +809,16 @@ assembly.class
 }
 {
     -out:IKVM.OpenJDK.Misc.dll
-    -baseaddress:0x5BBE0000
+    -baseaddress:0x5BC10000
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/META-INF/services/javax.print.*
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/META-INF/services/javax.sound.*
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/imageio/plugins/common/iio-plugin.properties
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/java/util/jar/pack/intrinsic.properties
-    -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/jndi/cosnaming/jndiprovider.properties
-    -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/jndi/ldap/jndiprovider.properties
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/sun/print/*
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/sun/rmi/*
     -r:System.Drawing
     com/sun/imageio/plugins/jpeg/*.class
     icedtea/rt/com/sun/media/sound/*.class
-    sun/net/dns/*.class
     sun/print/*.class
     ../../openjdk6-b16/build/linux-amd64/classes/com/sun/jndi/rmi/registry/*.class
     ../../openjdk6-b16/build/linux-amd64/classes/java/rmi/activation/*.class
@@ -848,25 +851,8 @@ assembly.class
     ../../openjdk6-b16/jdk/src/share/classes/com/sun/imageio/spi/*.class
     ../../openjdk6-b16/jdk/src/share/classes/com/sun/imageio/stream/*.class
     ../../openjdk6-b16/jdk/src/share/classes/com/sun/java/util/jar/pack/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/cosnaming/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/dns/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/ldap/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/ldap/ext/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/ldap/pool/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/ldap/sasl/*.class
     ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/rmi/registry/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/toolkit/corba/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/toolkit/dir/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/toolkit/url/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/url/corbaname/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/url/dns/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/url/iiop/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/url/iiopname/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/url/ldap/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/url/ldaps/*.class
     ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/url/rmi/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/com/sun/naming/internal/*.class
     ../../openjdk6-b16/jdk/src/share/classes/com/sun/net/httpserver/*.class
     ../../openjdk6-b16/jdk/src/share/classes/com/sun/net/httpserver/spi/*.class
     ../../openjdk6-b16/jdk/src/share/classes/com/sun/pept/*.class
@@ -892,11 +878,6 @@ assembly.class
     ../../openjdk6-b16/jdk/src/share/classes/javax/imageio/plugins/jpeg/*.class
     ../../openjdk6-b16/jdk/src/share/classes/javax/imageio/spi/*.class
     ../../openjdk6-b16/jdk/src/share/classes/javax/imageio/stream/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/javax/naming/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/javax/naming/directory/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/javax/naming/event/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/javax/naming/ldap/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/javax/naming/spi/*.class
     ../../openjdk6-b16/jdk/src/share/classes/javax/print/*.class
     ../../openjdk6-b16/jdk/src/share/classes/javax/print/attribute/*.class
     ../../openjdk6-b16/jdk/src/share/classes/javax/print/attribute/standard/*.class
@@ -969,9 +950,7 @@ assembly.class
     ../../openjdk6-b16/jdk/src/share/classes/sun/io/UnknownCharacterException.class
     ../../openjdk6-b16/jdk/src/share/classes/sun/java2d/*.class
     ../../openjdk6-b16/jdk/src/share/classes/sun/misc/resources/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/sun/net/dns/*.class
     ../../openjdk6-b16/jdk/src/share/classes/sun/net/httpserver/*.class
-    ../../openjdk6-b16/jdk/src/share/classes/sun/net/spi/nameservice/dns/*.class
     ../../openjdk6-b16/jdk/src/share/classes/sun/net/www/protocol/gopher/*.class
     ../../openjdk6-b16/jdk/src/share/classes/sun/net/www/protocol/netdoc/*.class
     ../../openjdk6-b16/jdk/src/share/classes/sun/print/*.class
@@ -986,8 +965,33 @@ assembly.class
     ../../openjdk6-b16/jdk/src/share/classes/sunw/util/*.class
 }
 {
+    -out:IKVM.OpenJDK.Naming.dll
+    -baseaddress:0x5C1B0000
+    -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/jndi/ldap/jndiprovider.properties
+    sun/net/dns/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/dns/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/ldap/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/ldap/ext/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/ldap/pool/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/ldap/sasl/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/toolkit/dir/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/toolkit/url/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/url/dns/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/url/ldap/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/jndi/url/ldaps/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/com/sun/naming/internal/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/javax/naming/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/javax/naming/directory/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/javax/naming/event/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/javax/naming/ldap/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/javax/naming/spi/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/sun/net/dns/*.class
+    ../../openjdk6-b16/jdk/src/share/classes/sun/net/spi/nameservice/dns/*.class
+}
+{
     -out:IKVM.OpenJDK.Jdbc.dll
-    -baseaddress:0x5C2D0000
+    -baseaddress:0x5C300000
     -resource:META-INF/services/java.sql.Driver=resources/META-INF/services/java.sql.Driver
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/rowset/*
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/javax/sql/*