river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r1590000 [3/4] - in /river/jtsk/skunk/qa_refactor/trunk: qa/src/com/sun/jini/qa/harness/ qa/src/com/sun/jini/test/impl/start/ qa/src/com/sun/jini/test/share/ qa/src/com/sun/jini/test/spec/io/marshalinputstream/ qa/src/com/sun/jini/test/spec...
Date Fri, 25 Apr 2014 11:34:03 GMT
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttpDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttpDlperm.td?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttpDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttpDlperm.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,6 @@ loader.isHttp=true
 loader.httpPort=8087
 loader.requireDlPerm=true
 loader.annotator=true
-testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
+testjvmargs=-Dnet.jini.loader.ClassLoading.provider=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttpDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttpDlpermCann.td?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttpDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttpDlpermCann.td Fri Apr 25 11:34:00 2014
@@ -6,6 +6,6 @@ loader.httpPort=8087
 loader.requireDlPerm=true
 loader.annotator=true
 loader.classAnnotator=QATestClassAnnotation
-testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
+testjvmargs=-Dnet.jini.loader.ClassLoading.provider=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURL.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURL.td?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURL.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURL.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ loader.isHttp=false
 loader.requireDlPerm=false
 loader.annotator=true
 loader.codebase="Any_invalid_url"
-testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
+testjvmargs=-Dnet.jini.loader.ClassLoading.provider=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLCann.td?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLCann.td Fri Apr 25 11:34:00 2014
@@ -6,6 +6,6 @@ loader.requireDlPerm=false
 loader.annotator=true
 loader.classAnnotator=QATestClassAnnotation
 loader.codebase="Any_invalid_url"
-testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
+testjvmargs=-Dnet.jini.loader.ClassLoading.provider=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLCannNullCodebase.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLCannNullCodebase.td?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLCannNullCodebase.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLCannNullCodebase.td Fri Apr 25 11:34:00 2014
@@ -6,6 +6,6 @@ loader.httpPort=8087
 loader.requireDlPerm=false
 loader.annotator=true
 loader.classAnnotator=QATestClassAnnotation
-testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
+testjvmargs=-Dnet.jini.loader.ClassLoading.provider=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlperm.td?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlperm.td Fri Apr 25 11:34:00 2014
@@ -6,6 +6,6 @@ loader.httpPort=8087
 loader.requireDlPerm=true
 loader.annotator=true
 loader.codebase="Any_invalid_url"
-testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
+testjvmargs=-Dnet.jini.loader.ClassLoading.provider=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermCann.td?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermCann.td Fri Apr 25 11:34:00 2014
@@ -7,6 +7,6 @@ loader.requireDlPerm=true
 loader.annotator=true
 loader.classAnnotator=QATestClassAnnotation
 loader.codebase="Any_invalid_url"
-testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
+testjvmargs=-Dnet.jini.loader.ClassLoading.provider=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermCannNullCodebase.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermCannNullCodebase.td?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermCannNullCodebase.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermCannNullCodebase.td Fri Apr 25 11:34:00 2014
@@ -7,6 +7,6 @@ loader.httpPort=8087
 loader.requireDlPerm=true
 loader.annotator=true
 loader.classAnnotator=QATestClassAnnotation
-testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
+testjvmargs=-Dnet.jini.loader.ClassLoading.provider=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermNullCodebase.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermNullCodebase.td?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermNullCodebase.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermNullCodebase.td Fri Apr 25 11:34:00 2014
@@ -6,6 +6,6 @@ loader.isHttp=true
 loader.httpPort=8087
 loader.requireDlPerm=true
 loader.annotator=true
-testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
+testjvmargs=-Dnet.jini.loader.ClassLoading.provider=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLException.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLException.java Fri Apr 25 11:34:00 2014
@@ -55,6 +55,7 @@ import com.sun.jini.test.spec.loader.uti
 
 // test base class
 import com.sun.jini.test.spec.loader.pref.AbstractTestBase;
+import net.jini.loader.ClassLoading;
 
 
 /**
@@ -201,7 +202,7 @@ public class LoadProxyClassesMalformedUR
 
         /*
          * 3) for each interface do the following:
-         *  - invoke RMIClassLoader.loadProxyClass method passing:
+         *  - invoke ClassLoading.loadProxyClass method passing:
          *    codebase - string representation of invalid url
          *    interfaces - string array of interface name (so that this
          *                 array has one element)
@@ -214,12 +215,12 @@ public class LoadProxyClassesMalformedUR
             String[] in = { name };
 
             try {
-                classLoaded = RMIClassLoader.loadProxyClass(cb, in, parent);
+                classLoaded = ClassLoading.loadProxyClass(cb, in, parent, false, null);
             } catch (ClassNotFoundException e) {
                 // Do not expect ClassNotFoundException.
                 // Tests case with expected ClassNotFoundException
                 // is LoadProxyClassesClassNotFoundException
-                message += "\nRMIClassLoader.loadProxyClass(" + cb + ", "
+                message += "\nClassLoading.loadProxyClass(" + cb + ", "
                          + in[0] + ", defaultLoader)\n"
                          + "  throws: " + e.toString() + "\n"
                          + "  expected: MalformedURLException";
@@ -227,13 +228,13 @@ public class LoadProxyClassesMalformedUR
             } catch (MalformedURLException me) {
                 // Expect MalformedURLException
                 String msg = ""
-                           + "\nRMIClassLoader.loadProxyClass(" + cb + ", "
+                           + "\nClassLoading.loadProxyClass(" + cb + ", "
                            + in[0] + ", defaultLoader)\n"
                            + "  throws " + me.toString() + " as expected";
                 logger.log(Level.FINE, msg);
                 continue;
             }
-            message += "\nRMIClassLoader.loadProxyClass(" + cb + ", "
+            message += "\nClassLoading.loadProxyClass(" + cb + ", "
                      + in[0] + ", defaultLoader)\n"
                      + "  returned: " + classLoaded.toString() + "\n"
                      + "  expected: MalformedURLException";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLNullCodebase.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLNullCodebase.td?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLNullCodebase.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLNullCodebase.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ testCategories=loader,loader_spec
 loader.isHttp=false
 loader.requireDlPerm=false
 loader.annotator=true
-testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
+testjvmargs=-Dnet.jini.loader.ClassLoading.provider=com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClasses.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClasses.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClasses.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClasses.java Fri Apr 25 11:34:00 2014
@@ -47,6 +47,7 @@ import com.sun.jini.test.spec.loader.uti
 
 // test base class
 import com.sun.jini.test.spec.loader.pref.AbstractTestBase;
+import net.jini.loader.ClassLoading;
 
 
 /**
@@ -194,7 +195,7 @@ public class LoadClasses extends Abstrac
         /*
          * 2) for each preferred/non-preferred class do the following:
          *    - invoke Class.forName method passing system class loader,
-         *    - invoke RMIClassLoader.loadClass method passing:
+         *    - invoke ClassLoading.loadClass method passing:
          *        codebase - string representation of url to
          *                   qa1-loader-pref.jar
          *        name - name of preferred/non-preferred class
@@ -210,18 +211,18 @@ public class LoadClasses extends Abstrac
 
             try {
                 classDefault = Class.forName(name, false, parent);
-                classPreferred = RMIClassLoader.loadClass(cb, name, parent);
+                classPreferred = ClassLoading.loadClass(cb, name, parent, false, null);
             } catch (ClassNotFoundException e) {
                 // Do not expect ClassNotFoundException.
-                message += "RMIClassLoader.loadClass(" + cb + ", "
-                         + name + ", defaultLoader)\n"
+                message += "ClassLoading.loadClass(" + cb + ", "
+                         + name + ", defaultLoader, false, null)\n"
                          + "  throws: " + e.toString() + "\n"
                          + "  expected: " + (pref ? str1 : str2);
                 throw new TestException(message);
             } catch (MalformedURLException me) {
                 // Do not expect MalformedURLException.
-                message += "RMIClassLoader.loadClass(" + cb + ", "
-                         + name + ", defaultLoader)\n"
+                message += "ClassLoading.loadClass(" + cb + ", "
+                         + name + ", defaultLoader, false, null)\n"
                          + "  throws: " + me.toString() + "\n"
                          + "  expected: " + (pref ? str1 : str2);
                 throw new TestException(message);
@@ -229,7 +230,7 @@ public class LoadClasses extends Abstrac
                 // Do not expect SecurityException.
                 // Tests case with expected SecurityException
                 // is LoadClassesSecurityException
-                message += "RMIClassLoader.loadClass(" + cb + ", "
+                message += "ClassLoading.loadClass(" + cb + ", "
                          + name + ", false, loader)\n"
                          + "  throws: " + sex.toString() + "\n"
                          + "  expected: " + (pref ? str1 : str2);
@@ -239,15 +240,15 @@ public class LoadClasses extends Abstrac
             boolean returned = classDefault.equals(classPreferred);
 
             if (expected != returned) {
-                message += "\nRMIClassLoader.loadClass(" + cb + ", "
-                         + name + ", defaultLoader)\n"
+                message += "\nClassLoading.loadClass(" + cb + ", "
+                         + name + ", defaultLoader, false, null)\n"
                          + "  returned: " + (expected ? str1 : str2) + "\n"
                          + "  expected: " + (expected ? str2 : str1);
                 throw new TestException(message);
             } else {
                 String msg = ""
-                           + "RMIClassLoader.loadClass(" + cb + ", "
-                           + name + ", defaultLoader)\n"
+                           + "ClassLoading.loadClass(" + cb + ", "
+                           + name + ", defaultLoader, false, null)\n"
                            + "  returned " + (expected ? str2 : str1)
                            + "  as expected";
                 logger.log(Level.FINEST, msg);
@@ -273,18 +274,18 @@ public class LoadClasses extends Abstrac
 
             try {
                 classDefault = Class.forName(name, false, parent);
-                classPreferred = RMIClassLoader.loadClass(cb, name, parent);
+                classPreferred = ClassLoading.loadClass(cb, name, parent, false, null);
             } catch (ClassNotFoundException e) {
                 // Do not expect ClassNotFoundException.
-                message += "RMIClassLoader.loadClass(" + cb + ", "
-                         + name + ", defaultLoader)\n"
+                message += "ClassLoading.loadClass(" + cb + ", "
+                         + name + ", defaultLoader, false, null)\n"
                          + "  throws: " + e.toString() + "\n"
                          + "  expected: returned class";
                 throw new TestException(message);
             } catch (MalformedURLException me) {
                 // Do not expect MalformedURLException.
-                message += "RMIClassLoader.loadClass(" + cb + ", "
-                         + name + ", defaultLoader)\n"
+                message += "ClassLoading.loadClass(" + cb + ", "
+                         + name + ", defaultLoader, false, null)\n"
                          + "  throws: " + me.toString() + "\n"
                          + "  expected: returned class";
                 throw new TestException(message);
@@ -301,15 +302,15 @@ public class LoadClasses extends Abstrac
             boolean returned = classDefault.equals(classPreferred);
 
             if (!returned) {
-                message += "\nRMIClassLoader.loadClass(" + cb + ", "
-                         + name + ", defaultLoader)\n"
+                message += "\nClassLoading.loadClass(" + cb + ", "
+                         + name + ", defaultLoader, false, null)\n"
                          + "  returned:" + str1 + "\n"
                          + "  expected:" + str2;
                 throw new TestException(message);
             } else {
                 String msg = ""
-                           + "RMIClassLoader.loadClass(" + cb + ", "
-                           + name + ", defaultLoader)\n"
+                           + "ClassLoading.loadClass(" + cb + ", "
+                           + name + ", defaultLoader, false, null)\n"
                            + "  returned " + str2
                            + "  as expected";
                 logger.log(Level.FINEST, msg);

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesFile.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesFile.td?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesFile.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesFile.td Fri Apr 25 11:34:00 2014
@@ -2,6 +2,6 @@ testClass=LoadClasses
 testCategories=loader,loader_spec
 testPolicyfile=loader.policy
 loader.isHttp=false
-testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=net.jini.loader.pref.RequireDlPermProvider
+testjvmargs=-Dnet.jini.loader.ClassLoading.provider=net.jini.loader.pref.RequireDlPermProvider
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesHttp.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesHttp.td?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesHttp.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesHttp.td Fri Apr 25 11:34:00 2014
@@ -3,6 +3,6 @@ testCategories=loader,loader_spec
 testPolicyfile=loader.policy
 loader.isHttp=true
 loader.httpPort=8087
-testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=net.jini.loader.pref.RequireDlPermProvider
+testjvmargs=-Dnet.jini.loader.ClassLoading.provider=net.jini.loader.pref.RequireDlPermProvider
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityException.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityException.java Fri Apr 25 11:34:00 2014
@@ -47,6 +47,7 @@ import com.sun.jini.test.spec.loader.uti
 
 // test base class
 import com.sun.jini.test.spec.loader.pref.AbstractTestBase;
+import net.jini.loader.ClassLoading;
 
 
 /**
@@ -129,7 +130,7 @@ import com.sun.jini.test.spec.loader.pre
  *    </li>
  *    <li> for each preferred/non-preferred class do the following:
  *     <ol>
- *       <li> invoke RMIClassLoader.loadClass method passing:
+ *       <li> invoke ClassLoading.loadClass method passing:
  *         <ul>
  *          <li>codebase - string representation of url to
  *                         qa1-loader-pref.jar</li>
@@ -175,7 +176,7 @@ public class LoadClassesSecurityExceptio
 
         /*
          * 2) for each preferred/non-preferred class do the following:
-         *  - invoke RMIClassLoader.loadClass method passing:
+         *  - invoke ClassLoading.loadClass method passing:
          *    codebase - string representation of url to qa1-loader-pref.jar
          *    name - name of preferred/non-preferred class
          *    parent - ClassLoader.getSystemClassLoader()
@@ -192,18 +193,18 @@ public class LoadClassesSecurityExceptio
             Class classPreferred = null;
 
             try {
-                classPreferred = RMIClassLoader.loadClass(cb, name, parent);
+                classPreferred = ClassLoading.loadClass(cb, name, parent, false, null);
             } catch (ClassNotFoundException e) {
                 // Do not expect ClassNotFoundException.
-                message += "RMIClassLoader.loadClass(" + cb + ", "
-                         + name + ", defaultLoader)\n"
+                message += "ClassLoading.loadClass(" + cb + ", "
+                         + name + ", defaultLoader, false, null)\n"
                          + "  throws: " + e.toString() + "\n"
                          + "  expected: " + (pref ? str3 : str2);
                 break;
             } catch (MalformedURLException me) {
                 // Do not expect MalformedURLException.
-                message += "RMIClassLoader.loadClass(" + cb + ", "
-                         + name + ", defaultLoader)\n"
+                message += "ClassLoading.loadClass(" + cb + ", "
+                         + name + ", defaultLoader, false, null)\n"
                          + "  throws: " + me.toString() + "\n"
                          + "  expected: " + (pref ? str3 : str2);
                 break;
@@ -211,14 +212,14 @@ public class LoadClassesSecurityExceptio
                 // Expect SecurityException for preferred classes only
                 if (pref) {
                     String msg = ""
-                               + "RMIClassLoader.loadClass(" + cb + ", "
-                               + name + ", defaultLoader)"
+                               + "ClassLoading.loadClass(" + cb + ", "
+                               + name + ", defaultLoader, false, null)"
                                + "  throws " + sex.toString()
                                + "  as expected";
                     logger.log(Level.FINEST, msg);
                 } else {
-                    message += "RMIClassLoader.loadClass(" + cb + ", "
-                             + name + ", defaultLoader)\n"
+                    message += "ClassLoading.loadClass(" + cb + ", "
+                             + name + ", defaultLoader, false, null)\n"
                              + "  returned: " + sex.toString() + "\n"
                              + "  expected: " + str2;
                     break;
@@ -227,15 +228,15 @@ public class LoadClassesSecurityExceptio
             }
 
             if (pref) {
-                message += "RMIClassLoader.loadClass(" + cb + ", "
-                         + name + ", defaultLoader)\n"
+                message += "ClassLoading.loadClass(" + cb + ", "
+                         + name + ", defaultLoader, false, null)\n"
                          + "  returned: " + str1 + "\n"
                          + "  expected: " + str3;
                 break;
             } else {
                 String msg = ""
-                           + "RMIClassLoader.loadClass(" + cb + ", "
-                           + name + ", defaultLoader)\n"
+                           + "ClassLoading.loadClass(" + cb + ", "
+                           + name + ", defaultLoader, false, null)\n"
                            + "  returned " + str2
                            + "  as expected";
                 logger.log(Level.FINEST, msg);
@@ -268,8 +269,8 @@ public class LoadClassesSecurityExceptio
              * SecurityException for non-preferred classes only.
              */
             if (!classDefault.equals(classPreferred)) {
-                message += "RMIClassLoader.loadClass(" + cb + ", "
-                         + name + ", defaultLoader)\n"
+                message += "ClassLoading.loadClass(" + cb + ", "
+                         + name + ", defaultLoader, false, null)\n"
                          + "  returned: " + str1 + "\n"
                          + "  expected: " + str2;
                 break;

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityExceptionFile.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityExceptionFile.td?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityExceptionFile.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityExceptionFile.td Fri Apr 25 11:34:00 2014
@@ -2,6 +2,6 @@ testClass=LoadClassesSecurityException
 testCategories=loader,loader_spec
 testPolicyfile=loaderNoDlPerm.policy
 loader.isHttp=false
-testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=net.jini.loader.pref.RequireDlPermProvider
+testjvmargs=-Dnet.jini.loader.ClassLoading.provider=net.jini.loader.pref.RequireDlPermProvider
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityExceptionHttp.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityExceptionHttp.td?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityExceptionHttp.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityExceptionHttp.td Fri Apr 25 11:34:00 2014
@@ -3,6 +3,6 @@ testCategories=loader,loader_spec
 testPolicyfile=loaderNoDlPerm.policy
 loader.isHttp=true
 loader.httpPort=8087
-testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=net.jini.loader.pref.RequireDlPermProvider
+testjvmargs=-Dnet.jini.loader.ClassLoading.provider=net.jini.loader.pref.RequireDlPermProvider
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java Fri Apr 25 11:34:00 2014
@@ -48,6 +48,7 @@ import net.jini.constraint.BasicMethodCo
 import net.jini.core.constraint.InvocationConstraint;
 import net.jini.core.constraint.InvocationConstraints;
 import net.jini.core.constraint.Integrity;
+import net.jini.loader.ClassLoading;
 
 
 /**
@@ -235,7 +236,7 @@ public abstract class AbstractTestBase e
 	try {
 	    return (RemoteMethodControl)
 		ProxyTrustUtil.newProxyInstance(
-			impl, ih, RMIClassLoader.getClassLoader(jarURL));
+			impl, ih, ClassLoading.getClassLoader(jarURL));
 	} catch (MalformedURLException e) {
 	    throw new AssertionError(e);
 	}
@@ -418,13 +419,13 @@ public abstract class AbstractTestBase e
 	if (cl == null) {
 	    return false;
 	}
-	String cb = RMIClassLoader.getClassAnnotation(c);
+	String cb = ClassLoading.getClassAnnotation(c);
 	ClassLoader pl = cl.getParent();
 	Thread t = Thread.currentThread();
 	ClassLoader ccl = t.getContextClassLoader();
 	try {
 	    t.setContextClassLoader(pl);
-	    return cl == RMIClassLoader.getClassLoader(cb);
+	    return cl == ClassLoading.getClassLoader(cb);
 	} catch (MalformedURLException e) {
 	    return false;
 	} finally {

Added: river/jtsk/skunk/qa_refactor/trunk/qa/src/manifest/qa1/META-INF/services/java.rmi.server.RMIClassLoaderSpi
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/manifest/qa1/META-INF/services/java.rmi.server.RMIClassLoaderSpi?rev=1590000&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/manifest/qa1/META-INF/services/java.rmi.server.RMIClassLoaderSpi (added)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/manifest/qa1/META-INF/services/java.rmi.server.RMIClassLoaderSpi Fri Apr 25 11:34:00 2014
@@ -0,0 +1 @@
+com.sun.jini.test.spec.loader.util.QATestPreferredClassProvider
\ No newline at end of file

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/fiddler/FiddlerImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/fiddler/FiddlerImpl.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/fiddler/FiddlerImpl.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/fiddler/FiddlerImpl.java Fri Apr 25 11:34:00 2014
@@ -133,6 +133,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.jini.io.MarshalledInstance;
 
 /**
  * This class is the server side of an implementation of the lookup
@@ -440,7 +441,7 @@ class FiddlerImpl implements ServerProxy
                                               LoginException,
                                               ClassNotFoundException
     {
-            this(init( (String[])data.get(), true /* persistent */, activationID ), null);
+            this(init( (String[]) new MarshalledInstance(data).get(false), true /* persistent */, activationID ), null);
     }//end activatable constructor
 
     /**
@@ -731,7 +732,7 @@ class FiddlerImpl implements ServerProxy
                 /* It doesn't contain it, try to marshal it */
                 MarshalledObject mReg = null;
                 try {
-                    mReg = new MarshalledObject(reg);
+                    mReg = new MarshalledInstance(reg).convertToMarshalledObject();
                 } catch(IOException e) { continue nextReg; } //failed, next reg
                 /* Succeeded, map registrar to its marshalled form */
                 discoveredRegsMap.put(reg,mReg);
@@ -784,7 +785,7 @@ class FiddlerImpl implements ServerProxy
          */
         private void writeObject(ObjectOutputStream stream) throws IOException{
             stream.defaultWriteObject();
-            stream.writeObject(new MarshalledObject(listener));
+            stream.writeObject(new MarshalledInstance(listener).convertToMarshalledObject());
         }//end writeObject
 
         /** When this class is deserialized, this method is invoked. This
@@ -798,7 +799,7 @@ class FiddlerImpl implements ServerProxy
             stream.defaultReadObject();
             MarshalledObject mo = (MarshalledObject)stream.readObject();
             try {
-                listener = (RemoteEventListener)mo.get();
+                listener = (RemoteEventListener) new MarshalledInstance(mo).get(false);
             } catch (Throwable e) {
                 problemLogger.log(Level.INFO, "problem recovering listener "
                                   +"for recovered registration", e);
@@ -4679,13 +4680,14 @@ class FiddlerImpl implements ServerProxy
                                                     Entry[] attrs)
     {
         if(attrs == null) return new MarshalledObject[0];
-        ArrayList marshalledAttrs = new ArrayList();
+        List<MarshalledObject> marshalledAttrs = new ArrayList<MarshalledObject>();
         for(int i=0;i<attrs.length;i++) {
             /* Do not let an attribute problem prevent the service from
              * continuing to operate
              */
             try {
-                marshalledAttrs.add(new MarshalledObject(attrs[i]));
+                marshalledAttrs.add(
+                    new MarshalledInstance(attrs[i]).convertToMarshalledObject());
             } catch(Throwable e) {
                 if( problemLogger.isLoggable(Level.INFO) ) {
                     problemLogger.log(Level.INFO,
@@ -4721,7 +4723,7 @@ class FiddlerImpl implements ServerProxy
              * continuing to operate
              */
             try {
-                attrs.add( (Entry)( marshalledAttrs[i].get() ) );
+                attrs.add( (Entry)( new MarshalledInstance(marshalledAttrs[i]).get(false) ) );
             } catch(Throwable e) {
                 if( problemLogger.isLoggable(Level.INFO) ) {
                     problemLogger.log(Level.INFO,
@@ -7983,7 +7985,7 @@ class FiddlerImpl implements ServerProxy
         Object hb = null;
         if(handback != null) {
             try {
-                hb = handback.get();
+                hb = new MarshalledInstance(handback).get(false);
             } catch (ClassNotFoundException e) {
                 problemLogger.log(Levels.HANDLED,
                                   "ClassNotFoundException when "

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/fiddler/FiddlerRegistration.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/fiddler/FiddlerRegistration.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/fiddler/FiddlerRegistration.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/fiddler/FiddlerRegistration.java Fri Apr 25 11:34:00 2014
@@ -44,6 +44,7 @@ import java.rmi.MarshalledObject;
 import java.rmi.RemoteException;
 import java.util.ArrayList;
 import java.util.HashSet;
+import net.jini.io.MarshalledInstance;
 
 /**
  * This class is an implementation of the LookupDiscoveryRegistration
@@ -789,7 +790,8 @@ class FiddlerRegistration implements Loo
                  */
                 MarshalledObject marshalledObj
                                  = (MarshalledObject)(marshalledRegs.get(i));
-                ServiceRegistrar reg = (ServiceRegistrar)(marshalledObj.get());
+                ServiceRegistrar reg = (ServiceRegistrar)(
+                        new MarshalledInstance(marshalledObj).get(false));
                 /* Success: record the un-marshalled element
                  *          delete the corresponding un-marshalled element
                  */

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/lookup/entry/LookupAttributes.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/lookup/entry/LookupAttributes.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/lookup/entry/LookupAttributes.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/lookup/entry/LookupAttributes.java Fri Apr 25 11:34:00 2014
@@ -22,11 +22,11 @@ import net.jini.core.entry.Entry;
 import net.jini.lookup.entry.ServiceControlled;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.rmi.MarshalledObject;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Comparator;
+import net.jini.io.MarshalledInstance;
 
 /**
  * Some simple utilities for manipulating lookup service attributes.
@@ -73,7 +73,7 @@ public class LookupAttributes {
      * arrays are not modified.
      * <p>
      * Note that attribute equality is defined in terms of 
-     * <code>MarshalledObject.equals</code> on field values.  The 
+     * <code>MarshalledInstance.equals</code> on field values.  The 
      * parameter arrays are not modified.
      * <p>
      * If the <code>checkSC</code> parameter is <code>true</code>,
@@ -329,7 +329,7 @@ public class LookupAttributes {
 
     /** 
      * Returns <code>true</code> if the two input objects are the same in
-     * <code>MarshalledObject</code> form, <code>false</code> otherwise.
+     * <code>MarshalledInstance</code> form, <code>false</code> otherwise.
      */
     private static boolean equal(Object o1, Object o2) {
 	if (o1 == o2)
@@ -348,7 +348,7 @@ public class LookupAttributes {
 	    c == Short.class)
 	    return o1.equals(o2);
 	try {
-	    return new MarshalledObject(o1).equals(new MarshalledObject(o2));
+	    return new MarshalledInstance(o1).equals(new MarshalledInstance(o2));
 	} catch (IOException ex) {
 	    throw new IllegalArgumentException("unexpected IOException");
 	}

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/JoinStateManager.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/JoinStateManager.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/JoinStateManager.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/JoinStateManager.java Fri Apr 25 11:34:00 2014
@@ -51,6 +51,7 @@ import com.sun.jini.config.Config;
 import com.sun.jini.logging.Levels;
 import com.sun.jini.reliableLog.LogHandler;
 import com.sun.jini.reliableLog.ReliableLog;
+import net.jini.io.MarshalledInstance;
 
 /**
  * <code>JoinStateManager</code> provides a utility that manages
@@ -727,7 +728,8 @@ class JoinStateManager extends LogHandle
          
         out.writeInt(attributes.length);
         for (int i=0; i<attributes.length; i++) {
-            out.writeObject(new MarshalledObject(attributes[i]));
+            out.writeObject(
+                new MarshalledInstance(attributes[i]).convertToMarshalledObject());
 	}
     }
  
@@ -751,7 +753,7 @@ class JoinStateManager extends LogHandle
         for (int i=0; i<objectCount; i++) {
             try {
                 MarshalledObject mo = (MarshalledObject)in.readObject();
-                entries.add(mo.get());
+                entries.add(new MarshalledInstance(mo).get(false));
             } catch (IOException e) {
                 if(initlogger.isLoggable(Levels.HANDLED)) {
 	            initlogger.log(Levels.HANDLED, 

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/StorableObject.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/StorableObject.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/StorableObject.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/StorableObject.java Fri Apr 25 11:34:00 2014
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.rmi.MarshalledObject;
 import java.rmi.RemoteException;
+import net.jini.io.MarshalledInstance;
 
 
 /**
@@ -56,7 +57,7 @@ public class StorableObject implements j
     
     private static MarshalledObject toMO(Object obj) throws RemoteException{
 	try {
-            return new MarshalledObject(obj);
+            return new MarshalledInstance(obj).convertToMarshalledObject();
         } catch (RemoteException e){
 	    throw e;
         } catch (IOException e){
@@ -98,7 +99,7 @@ public class StorableObject implements j
     public Object get() throws RemoteException {
 	try {
 	    if (obj == null)
-		obj = bytes.get();
+		obj = new MarshalledInstance(bytes).get(false);
 	    return obj;
 	} catch (RemoteException e) {
 	    if (DEBUG)

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java Fri Apr 25 11:34:00 2014
@@ -104,6 +104,7 @@ import net.jini.export.Exporter;
 import net.jini.export.ProxyAccessor;
 import net.jini.id.Uuid;
 import net.jini.id.UuidFactory;
+import net.jini.io.MarshalledInstance;
 import net.jini.jeri.BasicILFactory;
 import net.jini.jeri.BasicJeriExporter;
 import net.jini.jeri.tcp.TcpServerEndpoint;
@@ -252,7 +253,7 @@ class TxnManagerImpl /*extends RemoteSer
         // data.get IOException and ClassNotFoundException are safe from 
         // finalizer attack, because it happens
         // before implicit call to super() Object.
-        this((String[])data.get(), activationID, true, new Object[] {activationID, data} );
+        this((String[]) new MarshalledInstance(data).get(false), activationID, true, new Object[] {activationID, data} );
     }
     
 

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventID.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventID.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventID.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventID.java Fri Apr 25 11:34:00 2014
@@ -24,6 +24,7 @@ import java.io.Serializable;
 import java.rmi.MarshalledObject;
 
 import net.jini.core.event.RemoteEvent;
+import net.jini.io.MarshalledInstance;
 
 /**
  * The <code>EventID</code> class is used to represent a unique event
@@ -137,7 +138,7 @@ class EventID implements Serializable {
         throws IOException
     {
         stream.defaultWriteObject();
-        stream.writeObject(new MarshalledObject(source));
+        stream.writeObject(new MarshalledInstance(source).convertToMarshalledObject());
     }
 
     /**
@@ -156,7 +157,7 @@ class EventID implements Serializable {
         MarshalledObject mo = (MarshalledObject)stream.readObject();
 
         try {
-            source = mo.get();
+            source = new MarshalledInstance(mo).get(false);
         } catch (Throwable e) {
             if (e instanceof Error &&
                 !(e instanceof LinkageError ||

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventReader.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventReader.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventReader.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventReader.java Fri Apr 25 11:34:00 2014
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.rmi.MarshalledObject;
 import net.jini.core.event.RemoteEvent;
+import net.jini.io.MarshalledInstance;
 
 /**
  * This class provides the methods for reading <tt>RemoteEvent</tt>s from 
@@ -152,7 +153,7 @@ class EventReader {
 	    // Retrieve next event which was stored as a 
 	    // MarshalledObject and return its contents.
 	    MarshalledObject mo = (MarshalledObject)ein.readObject();
-	    return (RemoteEvent) mo.get();
+	    return (RemoteEvent) new MarshalledInstance(mo).get(false);
 	} finally {
 	    // Reset target stream to null
 	    sin.setInputStream(null);

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventWriter.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventWriter.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventWriter.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventWriter.java Fri Apr 25 11:34:00 2014
@@ -23,6 +23,7 @@ import java.io.OutputStream;
 import java.io.SyncFailedException;
 import java.rmi.MarshalledObject;
 import net.jini.core.event.RemoteEvent;
+import net.jini.io.MarshalledInstance;
 
 /**
  * This class provides the interface for writing <tt>RemoteEvent</tt>s to 
@@ -158,7 +159,8 @@ class EventWriter {
 	    // should always be able to read MarshalledObject
 	    // but we might not be able to reconstruct a 
 	    // RemoteEvent object because of codebase problems).
-	    MarshalledObject mo = new MarshalledObject(ev);
+	    MarshalledObject mo = 
+                    new MarshalledInstance(ev).convertToMarshalledObject();
 	    eout.reset();
 	    eout.writeObject(mo);
 	    eout.flush();

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/MailboxImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/MailboxImpl.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/MailboxImpl.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/MailboxImpl.java Fri Apr 25 11:34:00 2014
@@ -124,6 +124,7 @@ import net.jini.event.MailboxPullRegistr
 import net.jini.lookup.entry.ServiceInfo;
 import net.jini.lookup.JoinManager;
 import net.jini.discovery.LookupDiscovery;
+import net.jini.io.MarshalledInstance;
 import org.apache.river.impl.thread.NamedThreadFactory;
 
 /**
@@ -481,7 +482,7 @@ class MailboxImpl implements MailboxBack
     MailboxImpl(ActivationID activationID, MarshalledObject data) 
 	throws Exception
     {
-        this((String[])data.get(), activationID, true, new Object[] {activationID, data} );
+        this((String[]) new MarshalledInstance(data).get(false), activationID, true, new Object[] {activationID, data} );
 //        if (operationsLogger.isLoggable(Level.FINER)) {
 //	    operationsLogger.entering(mailboxSourceClass, 
 //	        "MailboxImpl", 
@@ -3984,7 +3985,7 @@ class MailboxImpl implements MailboxBack
 	    throws IOException
 	{
 	    stream.defaultWriteObject();
-	    stream.writeObject(new MarshalledObject(target));
+	    stream.writeObject(new MarshalledInstance(target).convertToMarshalledObject());
 	}
 
 	/**
@@ -3996,7 +3997,7 @@ class MailboxImpl implements MailboxBack
 	    stream.defaultReadObject();
 	    MarshalledObject mo = (MarshalledObject)stream.readObject();
 	    try {
-		target = (RemoteEventListener)mo.get();
+		target = (RemoteEventListener) new MarshalledInstance(mo).get(false);
 	    } catch (Throwable e) {
 		if (e instanceof Error &&
 		    !(e instanceof LinkageError ||
@@ -4548,7 +4549,8 @@ class MailboxImpl implements MailboxBack
              * working, so just ignore them.
              */
             try {
-                marshalledAttrs.add(new MarshalledObject(attrs[i]));
+                marshalledAttrs.add(
+                    new MarshalledInstance(attrs[i]).convertToMarshalledObject());
             } catch(Throwable e) {
 	        if (recoveryLogger.isLoggable(Levels.HANDLED)) {
                     recoveryLogger.log(Levels.HANDLED, 
@@ -4587,7 +4589,7 @@ class MailboxImpl implements MailboxBack
              * working, so just ignore them.
              */
             try {
-                attrs.add( (Entry)( marshalledAttrs[i].get() ) );
+                attrs.add( (Entry)( new MarshalledInstance(marshalledAttrs[i]).get(false) ) );
             } catch(Throwable e) {
 	        if (recoveryLogger.isLoggable(Levels.HANDLED)) {
                     recoveryLogger.log(Levels.HANDLED, 

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/ServiceRegistration.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/ServiceRegistration.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/ServiceRegistration.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/ServiceRegistration.java Fri Apr 25 11:34:00 2014
@@ -37,6 +37,7 @@ import java.util.concurrent.ConcurrentHa
 import java.util.concurrent.locks.Condition;
 
 import net.jini.core.event.RemoteEventListener;
+import net.jini.io.MarshalledInstance;
 
 /**
  * The <tt>ServiceRegistration</tt> class serves as the server-side abstraction
@@ -189,7 +190,8 @@ class ServiceRegistration implements Lea
 	    marshalledEventTarget = null;
 	} else {
 	    preparedEventTarget = preparedTarget;
-	    marshalledEventTarget = new MarshalledObject(preparedTarget);
+	    marshalledEventTarget = 
+                new MarshalledInstance(preparedTarget).convertToMarshalledObject();
 	}
     }
     
@@ -229,7 +231,7 @@ class ServiceRegistration implements Lea
         synchronized (this){
             if (marshalledEventTarget != null) {
                 RemoteEventListener unprepared = 
-                    (RemoteEventListener)marshalledEventTarget.get();
+                    (RemoteEventListener) new MarshalledInstance(marshalledEventTarget).get(false);
                 preparedEventTarget = (RemoteEventListener)
                     targetPreparer.prepareProxy(unprepared);
             }

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/ActivatableNormServerImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/ActivatableNormServerImpl.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/ActivatableNormServerImpl.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/ActivatableNormServerImpl.java Fri Apr 25 11:34:00 2014
@@ -32,6 +32,7 @@ import net.jini.activation.ActivationExp
 import net.jini.config.Configuration;
 import net.jini.config.ConfigurationException;
 import net.jini.export.Exporter;
+import net.jini.io.MarshalledInstance;
 import net.jini.jeri.BasicILFactory;
 import net.jini.jeri.BasicJeriExporter;
 import net.jini.jeri.tcp.TcpServerEndpoint;
@@ -117,7 +118,7 @@ class ActivatableNormServerImpl extends 
 	    if (activationID == null) {
 		throw new NullPointerException("activationID is null");
 	    }
-	    return (String[]) data.get();
+	    return (String[]) new MarshalledInstance(data).get(false);
 	} catch (Throwable e) {
 	    initFailed(e);
 	}

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/NormServerBaseImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/NormServerBaseImpl.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/NormServerBaseImpl.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/NormServerBaseImpl.java Fri Apr 25 11:34:00 2014
@@ -26,14 +26,12 @@ import java.io.OutputStream;
 import java.rmi.MarshalledObject;
 import java.rmi.NoSuchObjectException;
 import java.rmi.RemoteException;
-import java.rmi.server.RMIClassLoader;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -44,12 +42,8 @@ import java.util.logging.Logger;
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 
-import net.jini.admin.Administrable;
-import net.jini.admin.JoinAdmin;
 import net.jini.config.Configuration;
-import net.jini.config.ConfigurationException;
 import net.jini.config.ConfigurationProvider;
-import net.jini.config.NoSuchEntryException;
 import net.jini.core.constraint.RemoteMethodControl;
 import net.jini.core.discovery.LookupLocator;
 import net.jini.core.entry.Entry;
@@ -65,30 +59,23 @@ import net.jini.export.ProxyAccessor;
 import net.jini.id.ReferentUuid;
 import net.jini.id.Uuid;
 import net.jini.id.UuidFactory;
-import net.jini.jeri.BasicILFactory;
-import net.jini.jeri.BasicJeriExporter;
-import net.jini.jeri.tcp.TcpServerEndpoint;
 import net.jini.lease.LeaseRenewalEvent;
 import net.jini.lease.LeaseRenewalManager;
 import net.jini.lease.LeaseRenewalService;
 import net.jini.lease.LeaseRenewalSet;
 import net.jini.lookup.entry.ServiceInfo;
-import net.jini.security.BasicProxyPreparer;
 import net.jini.security.ProxyPreparer;
 import net.jini.security.TrustVerifier;
 import net.jini.security.proxytrust.ServerProxyTrust;
 import net.jini.security.proxytrust.TrustEquivalence;
 
-import com.sun.jini.config.Config;
 import com.sun.jini.constants.ThrowableConstants;
 import com.sun.jini.constants.VersionConstants;
-import com.sun.jini.landlord.FixedLeasePeriodPolicy;
 import com.sun.jini.landlord.Landlord.RenewResults;
 import com.sun.jini.landlord.LandlordUtil;
 import com.sun.jini.landlord.LeaseFactory;
 import com.sun.jini.landlord.LeasePeriodPolicy;
 import com.sun.jini.landlord.LocalLandlord;
-import com.sun.jini.logging.Levels;
 import com.sun.jini.lookup.entry.BasicServiceType;
 import com.sun.jini.norm.event.EventType;
 import com.sun.jini.norm.event.EventTypeGenerator;
@@ -102,6 +89,7 @@ import org.apache.river.api.util.Startab
 import com.sun.jini.thread.InterruptedStatusThread;
 import java.security.AccessControlContext;
 import java.security.AccessController;
+import net.jini.loader.ClassLoading;
 
 /**
  * Base class for implementations of NormServer.  Provides a complete
@@ -307,7 +295,7 @@ abstract class NormServerBaseImpl
 		       "Adding lease of class {0} with annotation {1}",
 		       new Object[] {
 			   leaseToRenew.getClass(),
-			   RMIClassLoader.getClassAnnotation(lc) });
+			   ClassLoading.getClassAnnotation(lc) });
 	}
 
 	// Add the lease to the set

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/event/EventType.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/event/EventType.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/event/EventType.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/event/EventType.java Fri Apr 25 11:34:00 2014
@@ -34,6 +34,7 @@ import com.sun.jini.logging.Levels;
 import com.sun.jini.thread.RetryTask;
 import com.sun.jini.thread.WakeupManager;
 import java.util.concurrent.ExecutorService;
+import net.jini.io.MarshalledInstance;
 
 /**
  * Representation of an event type the supports a single registrant.
@@ -175,7 +176,8 @@ public class EventType implements Serial
 	if (listener == null) {
 	    clearListener();
 	} else {	    
-	    marshalledListener = new MarshalledObject(listener);
+	    marshalledListener = 
+                new MarshalledInstance(listener).convertToMarshalledObject();
 	    this.listener = listener;
 	    this.handback = handback;
 	}
@@ -206,7 +208,7 @@ public class EventType implements Serial
 	RemoteEventListener unpreparedListener = null;
 	try {
 	    unpreparedListener =
-		(RemoteEventListener) marshalledListener.get();
+		(RemoteEventListener) new MarshalledInstance(marshalledListener).get(false);
 	} catch (IOException e) {
 	    logger.log(Levels.HANDLED,
 		       "Problem unmarshalling listener -- will retry later",

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/lookup/JoinState.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/lookup/JoinState.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/lookup/JoinState.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/lookup/JoinState.java Fri Apr 25 11:34:00 2014
@@ -48,6 +48,7 @@ import com.sun.jini.config.Config;
 import com.sun.jini.logging.Levels;
 import com.sun.jini.reliableLog.LogHandler;
 import com.sun.jini.reliableLog.ReliableLog;
+import net.jini.io.MarshalledInstance;
 
 /**
  * Utility class that combines <code>JoinManager</code> with persistence.
@@ -412,7 +413,8 @@ public class JoinState extends LogHandle
 	
 	out.writeInt(attributes.length);
 	for (int i=0; i<attributes.length; i++) {
-	    out.writeObject(new MarshalledObject(attributes[i]));
+	    out.writeObject(
+                new MarshalledInstance(attributes[i]).convertToMarshalledObject());
 	}
     }
 
@@ -434,7 +436,7 @@ public class JoinState extends LogHandle
 	for (int i=0; i<objectCount; i++) {
 	    try {
 		MarshalledObject mo = (MarshalledObject) in.readObject();
-		entries.add(mo.get());
+		entries.add(new MarshalledInstance(mo).get(false));
 	    } catch (IOException e) {
 		logger.log(Level.INFO,
 			   "Problem recovering attribute -- discarding",

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/EntryRep.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/EntryRep.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/EntryRep.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/EntryRep.java Fri Apr 25 11:34:00 2014
@@ -34,7 +34,6 @@ import java.lang.reflect.Modifier;
 import java.net.MalformedURLException;
 import java.rmi.MarshalException;
 import java.rmi.UnmarshalException;
-import java.rmi.server.RMIClassLoader;
 import java.security.DigestOutputStream;
 import java.security.MessageDigest;
 import java.util.ArrayList;
@@ -238,7 +237,7 @@ class EntryRep implements StorableResour
 	if (validate)
 	    ensureValidClass(realClass);
 	className = realClass.getName();
-	codebase = RMIClassLoader.getClassAnnotation(realClass);
+	codebase = ClassLoading.getClassAnnotation(realClass);
 
 	/*
 	 * Build up the per-field and superclass information through

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/JoinStateManager.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/JoinStateManager.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/JoinStateManager.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/JoinStateManager.java Fri Apr 25 11:34:00 2014
@@ -41,6 +41,7 @@ import net.jini.security.ProxyPreparer;
 
 import com.sun.jini.config.Config;
 import com.sun.jini.logging.Levels;
+import net.jini.io.MarshalledInstance;
 
 /**
  * <code>JoinStateManager</code> provides a utility that manages
@@ -545,7 +546,8 @@ class JoinStateManager implements Storab
          
         out.writeInt(attributes.length);
         for (int i=0; i<attributes.length; i++) {
-            out.writeObject(new MarshalledObject(attributes[i]));
+            out.writeObject(
+                new MarshalledInstance(attributes[i]).convertToMarshalledObject());
 	}
     }
  
@@ -568,7 +570,7 @@ class JoinStateManager implements Storab
         for (int i=0; i<objectCount; i++) {
             try {
                 MarshalledObject mo = (MarshalledObject)in.readObject();
-                entries.add(mo.get());
+                entries.add( new MarshalledInstance(mo).get(false));
             } catch (IOException e) {
 		logger.log(Level.INFO, "Encountered IOException recovering " +
                     "attribute, dropping attribute", e);

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/PersistentOutriggerImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/PersistentOutriggerImpl.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/PersistentOutriggerImpl.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/PersistentOutriggerImpl.java Fri Apr 25 11:34:00 2014
@@ -25,6 +25,7 @@ import java.rmi.activation.ActivationExc
 import javax.security.auth.login.LoginException;
 import net.jini.config.ConfigurationException;
 import com.sun.jini.start.LifeCycle;
+import net.jini.io.MarshalledInstance;
 
 /**
  * <code>OutriggerServerWrapper</code> subclass for
@@ -61,7 +62,7 @@ class PersistentOutriggerImpl extends Ou
 	throws IOException, ConfigurationException, LoginException,
 	       ActivationException, ClassNotFoundException
     {
-	super(activationID, (String[])data.get());
+	super(activationID, (String[]) new MarshalledInstance(data).get(false));
 	allowCalls();
     }
 

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/StorableReference.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/StorableReference.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/StorableReference.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/StorableReference.java Fri Apr 25 11:34:00 2014
@@ -23,6 +23,7 @@ import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.rmi.MarshalledObject;
 import java.rmi.RemoteException;
+import net.jini.io.MarshalledInstance;
 import net.jini.security.ProxyPreparer;
 
 /**
@@ -99,7 +100,7 @@ class StorableReference implements Exter
 	 */
 
 	if (obj == null)
-	    obj = bytes.get();
+	    obj = new MarshalledInstance(bytes).get(false);
 
 	if (!prepared) {
 	    if (preparer != null)
@@ -117,7 +118,7 @@ class StorableReference implements Exter
     public void writeExternal(ObjectOutput out) throws IOException {
 	synchronized (this) {
 	    if (bytes == null)
-		bytes = new MarshalledObject(obj);
+		bytes = new MarshalledInstance(obj).convertToMarshalledObject();
             out.writeObject(bytes);
 	}
     }

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/AbstractActivationGroup.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/AbstractActivationGroup.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/AbstractActivationGroup.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/AbstractActivationGroup.java Fri Apr 25 11:34:00 2014
@@ -63,8 +63,10 @@ import net.jini.config.ConfigurationExce
 import net.jini.config.ConfigurationProvider;
 import net.jini.export.Exporter;
 import net.jini.export.ProxyAccessor;
+import net.jini.io.MarshalledInstance;
 import net.jini.jeri.BasicJeriExporter;
 import net.jini.jeri.tcp.TcpServerEndpoint;
+import net.jini.loader.ClassLoading;
 import net.jini.security.BasicProxyPreparer;
 import net.jini.security.ProxyPreparer;
 import net.jini.security.Security;
@@ -380,7 +382,8 @@ abstract class AbstractActivationGroup e
     private static Configuration getConfiguration(MarshalledObject mobj)
 	throws ConfigurationException, IOException, ClassNotFoundException
     {
-	ActivationGroupData data = (ActivationGroupData) mobj.get();
+	ActivationGroupData data = (ActivationGroupData) 
+                new MarshalledInstance(mobj).get(false);
 	ClassLoader cl = AbstractActivationGroup.class.getClassLoader();
 	ClassLoader ccl = Thread.currentThread().getContextClassLoader();
 	if (!covers(cl, ccl)) {
@@ -644,7 +647,7 @@ abstract class AbstractActivationGroup e
      * <p>Otherwise:
      *
      * <p>The class for the object is loaded by invoking {@link
-     * RMIClassLoader#loadClass(String,String) RMIClassLoader.loadClass}
+     * ClassLoading#loadClass}
      * passing the class location (obtained by invoking {@link
      * ActivationDesc#getLocation getLocation} on the activation
      * descriptor) and the class name (obtained by invoking {@link
@@ -720,8 +723,8 @@ abstract class AbstractActivationGroup e
 	    }
 
 	    String className = desc.getClassName();
-	    final Class cl = RMIClassLoader.loadClass(desc.getLocation(),
-						      className);
+	    final Class cl = ClassLoading.loadClass(desc.getLocation(),
+						      className, null, false, null);
 	    final Thread t = Thread.currentThread();
 	    final ClassLoader savedCcl = t.getContextClassLoader();
 	    final ClassLoader ccl =
@@ -1147,7 +1150,8 @@ abstract class AbstractActivationGroup e
 		} else {
 		    proxy = impl;
 		}
-		this.mobj = new MarshalledObject(proxy);
+		this.mobj = 
+                    new MarshalledInstance(proxy).convertToMarshalledObject();
 	    } catch (IOException e) {
 		throw new ActivationException(
 		    "failed to marshal remote object", e);

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/Activation.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/Activation.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/Activation.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/Activation.java Fri Apr 25 11:34:00 2014
@@ -184,9 +184,13 @@ class Activation implements Serializable
 	shutdownHook = new ShutdownHook();
 	Runtime.getRuntime().addShutdownHook(shutdownHook);
 	groupPreparer = getPreparer(config, "instantiatorPreparer");
-	groupData = new MarshalledObject(new ActivationGroupData((String[])
-	       config.getEntry(PHOENIX, "groupConfig",
-			       String[].class, configOptions)));
+	groupData = new MarshalledInstance(
+            new ActivationGroupData((String[]) config.getEntry(
+                    PHOENIX, 
+                    "groupConfig",
+                    String[].class,
+                    configOptions
+            ))).convertToMarshalledObject();
 	outputHandler = (GroupOutputHandler) config.getEntry(
 		PHOENIX, "groupOutputHandler", GroupOutputHandler.class,
 		new GroupOutputHandler() {

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java Fri Apr 25 11:34:00 2014
@@ -25,6 +25,7 @@ import java.rmi.activation.ActivationGro
 import java.rmi.server.RMIClassLoader;
 import java.util.Collections;
 import net.jini.io.MarshalInputStream;
+import net.jini.loader.ClassLoading;
 
 /**
  * This is the bootstrap code to start a virtual machine (VM) executing an
@@ -70,8 +71,8 @@ class ActivationGroupInit {
 	    ActivationGroupID id  = (ActivationGroupID)in.readObject();
 	    ActivationGroupDesc desc = (ActivationGroupDesc)in.readObject();
 	    long incarnation = in.readLong();
-	    Class cl = RMIClassLoader.loadClass(desc.getLocation(),
-						desc.getClassName());
+	    Class cl = ClassLoading.loadClass(desc.getLocation(),
+						desc.getClassName(), null, false, null);
 	    try {
 		Method create =
 		    cl.getMethod("createGroup",

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/EntryClassBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/EntryClassBase.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/EntryClassBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/EntryClassBase.java Fri Apr 25 11:34:00 2014
@@ -17,8 +17,8 @@
  */
 package com.sun.jini.reggie;
 
-import java.rmi.server.RMIClassLoader;
 import java.io.Serializable;
+import net.jini.loader.ClassLoading;
 
 /**
  * An EntryClass annotated with a codebase.
@@ -51,7 +51,7 @@ class EntryClassBase implements Serializ
 
     /** Sets the codebase to the codebase of the given class. */
     public void setCodebase(Class cls) {
-	codebase = RMIClassLoader.getClassAnnotation(cls);
+	codebase = ClassLoading.getClassAnnotation(cls);
     }
 
     /**

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/PersistentRegistrarImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/PersistentRegistrarImpl.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/PersistentRegistrarImpl.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/PersistentRegistrarImpl.java Fri Apr 25 11:34:00 2014
@@ -21,6 +21,7 @@ package com.sun.jini.reggie;
 import com.sun.jini.start.LifeCycle;
 import java.rmi.MarshalledObject;
 import java.rmi.activation.ActivationID;
+import net.jini.io.MarshalledInstance;
 
 /**
  * Class for starting activatable and non-activatable persistent lookup
@@ -49,6 +50,6 @@ public class PersistentRegistrarImpl ext
     PersistentRegistrarImpl(ActivationID activationID, MarshalledObject data)
 	throws Exception
     {
-	super((String[]) data.get(), activationID, true, null);
+	super((String[]) new MarshalledInstance(data).get(false), activationID, true, null);
     }
 }

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/ServiceTypeBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/ServiceTypeBase.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/ServiceTypeBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/ServiceTypeBase.java Fri Apr 25 11:34:00 2014
@@ -17,8 +17,8 @@
  */
 package com.sun.jini.reggie;
 
-import java.rmi.server.RMIClassLoader;
 import java.io.Serializable;
+import net.jini.loader.ClassLoading;
 
 /**
  * A ServiceType annotated with a codebase.
@@ -51,7 +51,7 @@ class ServiceTypeBase implements Seriali
 
     /** Sets the codebase to the codebase of the given class. */
     public void setCodebase(Class cls) {
-	codebase = RMIClassLoader.getClassAnnotation(cls);
+	codebase = ClassLoading.getClassAnnotation(cls);
     }
 
     /**

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/resource/Service.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/resource/Service.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/resource/Service.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/resource/Service.java Fri Apr 25 11:34:00 2014
@@ -31,6 +31,7 @@ import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.LinkedHashSet;
 import java.util.logging.Logger;
+import net.jini.loader.ClassLoading;
 
 
 /**
@@ -273,7 +274,7 @@ public final class Service {
 	    String cn = nextName;
 	    nextName = null;
 	    try {
-		Class c = Class.forName(cn, true, loader);
+		Class c = ClassLoading.forName(cn, true, loader);
 		if (!service.isAssignableFrom(c)) {
 			log.severe("service classloader is "
 					  + service.getClass().getClassLoader()

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/ActivateWrapper.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/ActivateWrapper.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/ActivateWrapper.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/ActivateWrapper.java Fri Apr 25 11:34:00 2014
@@ -54,6 +54,8 @@ import java.security.Security;
 import java.util.Arrays;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.jini.io.MarshalledInstance;
+import net.jini.loader.ClassLoading;
 
 /**
  * A wrapper for activatable objects, providing separation of the import
@@ -395,7 +397,8 @@ public class ActivateWrapper implements 
             logger.entering(ActivateWrapper.class.getName(), 
 	        "ActivateWrapper", new Object[] { id, data });
 
-	    ActivateDesc desc = (ActivateDesc)data.get();
+	    ActivateDesc desc = (ActivateDesc)
+                    new MarshalledInstance(data).get(false);
 	    logger.log(Level.FINEST, "ActivateDesc: {0}", desc);
 
 	    Thread t = Thread.currentThread();
@@ -455,7 +458,7 @@ public class ActivateWrapper implements 
 	    }
 	
 	    boolean initialize = false;
-	    Class ac = Class.forName(desc.className, initialize, cl);
+	    Class ac = ClassLoading.forName(desc.className, initialize, cl);
  	    logger.log(Level.FINEST, "Obtained implementation class: {0}", ac);
 
 	    t.setContextClassLoader(cl);
@@ -547,7 +550,7 @@ public class ActivateWrapper implements 
 
 	MarshalledObject data;
 	try {
-	    data = new MarshalledObject(desc);
+	    data = new MarshalledInstance(desc).convertToMarshalledObject();
 	} catch (Exception e) {
             MarshalException me = 
 	        new MarshalException("marshalling ActivateDesc", e);

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/NonActivatableServiceDescriptor.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/NonActivatableServiceDescriptor.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/NonActivatableServiceDescriptor.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/NonActivatableServiceDescriptor.java Fri Apr 25 11:34:00 2014
@@ -44,6 +44,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.jini.loader.ClassLoading;
 
 /**
  * Class used to launch shared, non-activatable, in-process 
@@ -652,7 +653,7 @@ public class NonActivatableServiceDescri
         logger.finest("Attempting to get implementation class");
         Class implClass = null;
         implClass = 	
-            Class.forName(getImplClassName(), false, newClassLoader);
+            ClassLoading.forName(getImplClassName(), false, newClassLoader);
         logger.finest("Setting context class loader");
         curThread.setContextClassLoader(newClassLoader);
 

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedActivatableServiceDescriptor.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedActivatableServiceDescriptor.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedActivatableServiceDescriptor.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedActivatableServiceDescriptor.java Fri Apr 25 11:34:00 2014
@@ -36,6 +36,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.jini.io.MarshalledInstance;
 
 /**
  * Class used to launch shared, activatable services. 
@@ -614,7 +615,7 @@ public class SharedActivatableServiceDes
         try {
             /* Create the ActivateWrapper descriptor for the desired service */
             MarshalledObject params = 
-	        new MarshalledObject(getServerConfigArgs());
+	        new MarshalledInstance(getServerConfigArgs()).convertToMarshalledObject();
             ActivateWrapper.ActivateDesc adesc =
                 new ActivateWrapper.ActivateDesc(
                     getImplClassName(),

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedActivationGroupDescriptor.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedActivationGroupDescriptor.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedActivationGroupDescriptor.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedActivationGroupDescriptor.java Fri Apr 25 11:34:00 2014
@@ -41,6 +41,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.logging.Logger;
 import java.util.Properties;
+import net.jini.io.MarshalledInstance;
 
 /**
  * Class used to create a shared activation group. 
@@ -402,7 +403,7 @@ public class SharedActivationGroupDescri
             oos = new ObjectOutputStream(
                 new BufferedOutputStream(
                     new FileOutputStream(cookieFile)));
-            oos.writeObject(new MarshalledObject(obj));
+            oos.writeObject(new MarshalledInstance(obj).convertToMarshalledObject());
             oos.flush();
 //TODO - file sync?
 	} catch (IOException e) {
@@ -436,7 +437,7 @@ public class SharedActivationGroupDescri
                       new BufferedInputStream(
                          new FileInputStream(cookieFile)));
             MarshalledObject mo = (MarshalledObject)ois.readObject();
-	    obj = (ActivationGroupID)mo.get();
+	    obj = (ActivationGroupID) new MarshalledInstance(mo).get(false);
         } finally {
             if (ois != null) ois.close();
         }

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedGroupImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedGroupImpl.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedGroupImpl.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedGroupImpl.java Fri Apr 25 11:34:00 2014
@@ -43,6 +43,7 @@ import net.jini.config.ConfigurationProv
 import net.jini.core.constraint.RemoteMethodControl;
 import net.jini.export.Exporter;
 import net.jini.export.ProxyAccessor;
+import net.jini.io.MarshalledInstance;
 import net.jini.jeri.BasicILFactory;
 import net.jini.jeri.BasicJeriExporter;
 import net.jini.jeri.tcp.TcpServerEndpoint;
@@ -235,7 +236,7 @@ public class SharedGroupImpl implements 
         try {
             logger.entering(SharedGroupImpl.class.getName(), "SharedGroupImpl", 
                 new Object[] { activationID, data}); 
-            String[] configArgs = (String[])data.get();	
+            String[] configArgs = (String[]) new MarshalledInstance(data).get(false);	
             Configuration config = ConfigurationProvider.getInstance(configArgs);
             loginContext = (LoginContext) config.getEntry(
                 START_PACKAGE, "loginContext", LoginContext.class, null);

Modified: river/jtsk/skunk/qa_refactor/trunk/src/manifest/jsk-resources/META-INF/services/java.rmi.server.RMIClassLoaderSpi
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/manifest/jsk-resources/META-INF/services/java.rmi.server.RMIClassLoaderSpi?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/manifest/jsk-resources/META-INF/services/java.rmi.server.RMIClassLoaderSpi (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/manifest/jsk-resources/META-INF/services/java.rmi.server.RMIClassLoaderSpi Fri Apr 25 11:34:00 2014
@@ -17,3 +17,4 @@
 #*/
 
 net.jini.loader.pref.PreferredClassProvider
+net.jini.loader.pref.RequireDlPermProvider

Modified: river/jtsk/skunk/qa_refactor/trunk/src/net/jini/activation/ActivationGroup.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/net/jini/activation/ActivationGroup.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/net/jini/activation/ActivationGroup.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/net/jini/activation/ActivationGroup.java Fri Apr 25 11:34:00 2014
@@ -27,6 +27,7 @@ import java.rmi.server.RMIClassLoader;
 import java.security.PrivilegedExceptionAction;
 import java.security.PrivilegedActionException;
 import net.jini.export.Exporter;
+import net.jini.loader.ClassLoading;
 import net.jini.security.Security;
 
 /**
@@ -129,7 +130,7 @@ public abstract class ActivationGroup
 	    Class cl = (Class) Security.doPrivileged(
 		new PrivilegedExceptionAction() {
 		    public Object run() throws Exception {
-			return RMIClassLoader.loadClass(location, className);
+			return ClassLoading.loadClass(location, className, null, false, null);
 		    }
 	    });
 	    return ActivationGroup.class.isAssignableFrom(cl);

Modified: river/jtsk/skunk/qa_refactor/trunk/src/net/jini/config/ConfigurationFile.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/net/jini/config/ConfigurationFile.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/net/jini/config/ConfigurationFile.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/net/jini/config/ConfigurationFile.java Fri Apr 25 11:34:00 2014
@@ -56,6 +56,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import net.jini.export.Exporter;
+import net.jini.loader.ClassLoading;
 import net.jini.security.ProxyPreparer;
 import net.jini.security.Security;
 
@@ -2333,7 +2334,7 @@ public class ConfigurationFile extends A
 	throws ConfigurationException
     {
 	try {
-	    Class result = Class.forName(name, false, cl);
+	    Class result = ClassLoading.forName(name, false, cl);
 	    Class c = result;
 	    do {
 		if (!Modifier.isPublic(c.getModifiers())) {



Mime
View raw message