You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2014/04/25 13:34:03 UTC
svn commit: r1590000 [2/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...
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpNoConnect.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpNoConnect.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/GetClassLoaderSecurityExceptionHttpNoConnect.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpNoConnect.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,6 @@ loader.isHttp=true
loader.httpPort=8087
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/preferredClassProvider/GetClassLoaderSecurityExceptionHttpNoConnectCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpNoConnectCann.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/GetClassLoaderSecurityExceptionHttpNoConnectCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpNoConnectCann.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/LoadClasses.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/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/preferredClassProvider/LoadClasses.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClasses.java Fri Apr 25 11:34:00 2014
@@ -52,6 +52,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;
/**
@@ -233,11 +234,13 @@ 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
* parent - ClassLoader.getSystemClassLoader()
+ * verifyCodebaseIntegrity - false
+ * verifierLoader - null
* - verify that returned classes are equals for non-preferred
* classes and are not equals for preferred classes.
*/
@@ -249,13 +252,13 @@ 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.
// Tests case with expected ClassNotFoundException
// is LoadClassesClassNotFoundException
- 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);
@@ -263,8 +266,8 @@ public class LoadClasses extends Abstrac
// Do not expect MalformedURLException.
// Tests case with expected MalformedURLException
// is LoadClassesMalformedURLException
- 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);
@@ -282,15 +285,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.FINE, msg);
@@ -307,6 +310,8 @@ public class LoadClasses extends Abstrac
* qa1-loader-pref.jar
* name - name of class
* parent - ClassLoader.getSystemClassLoader()
+ * verifyCodebaseIntegrity - false
+ * verifierLoader - null
* - verify that returned classes are equals for all classes
*/
for (int item = 0; item < Util.listLocalClasses.length; item++) {
@@ -316,13 +321,13 @@ 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.
// Tests case with expected ClassNotFoundException
// is LoadClassesClassNotFoundException
- 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);
@@ -330,8 +335,8 @@ public class LoadClasses extends Abstrac
// Do not expect MalformedURLException.
// Tests case with expected MalformedURLException
// is LoadClassesMalformedURLException
- 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);
@@ -348,15 +353,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.FINE, msg);
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundException.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/LoadClassesClassNotFoundException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundException.java Fri Apr 25 11:34:00 2014
@@ -52,6 +52,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;
/**
@@ -208,6 +209,8 @@ public class LoadClassesClassNotFoundExc
* codebase - string representation of url to qa1-loader-pref.jar
* name - name of non-existent class
* parent - ClassLoader.getSystemClassLoader()
+ * verifiyCodebaseIntegrity - false
+ * verifierLoader - null
* - verify that ClassNotFoundException is thrown
*/
for (int item = 0; item < 10; item++) {
@@ -215,11 +218,11 @@ public class LoadClassesClassNotFoundExc
Class classPreferred = null;
try {
- classPreferred = RMIClassLoader.loadClass(cb, name, parent);
+ classPreferred = ClassLoading.loadClass(cb, name, parent, false, null);
} catch (ClassNotFoundException e) {
String msg = ""
- + "RMIClassLoader.loadClass(" + cb + ", "
- + name + ", defaultLoader)\n"
+ + "ClassLoading.loadClass(" + cb + ", "
+ + name + ", defaultLoader, false, null)\n"
+ " throws " + e.toString()
+ " as expected";
logger.log(Level.FINE, msg);
@@ -228,8 +231,8 @@ public class LoadClassesClassNotFoundExc
// Do not expect MalformedURLException.
// Tests case with expected MalformedURLException
// is LoadClassesMalformedURLException
- message += "RMIClassLoader.loadClass(" + cb + ", "
- + name + ", defaultLoader)\n"
+ message += "ClassLoading.loadClass(" + cb + ", "
+ + name + ", defaultLoader, false, null)\n"
+ " throws: " + me.toString() + "\n"
+ " expected: ClassNotFoundException";
break;
@@ -237,14 +240,14 @@ public class LoadClassesClassNotFoundExc
// Do not expect SecurityException.
// Tests case with expected SecurityException
// is LoadClassesSecurityException
- message += "RMIClassLoader.loadClass(" + cb + ", "
- + name + ", defaultLoader)\n"
+ message += "ClassLoading.loadClass(" + cb + ", "
+ + name + ", defaultLoader, false, null)\n"
+ " throws: " + sex.toString() + "\n"
+ " expected: ClassNotFoundException";
break;
}
- message += "RMIClassLoader.loadClass(" + cb + ", "
- + name + ", defaultLoader)\n"
+ message += "ClassLoading.loadClass(" + cb + ", "
+ + name + ", defaultLoader, false, null)\n"
+ " returned: " + classPreferred.toString() + "\n"
+ " expected: ClassNotFoundException";
break;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundFile.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundFile.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/LoadClassesClassNotFoundFile.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundFile.td Fri Apr 25 11:34:00 2014
@@ -3,6 +3,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/preferredClassProvider/LoadClassesClassNotFoundFileCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundFileCann.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/LoadClassesClassNotFoundFileCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundFileCann.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ loader.isHttp=false
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/LoadClassesClassNotFoundFileDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundFileDlperm.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/LoadClassesClassNotFoundFileDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundFileDlperm.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ testPolicyfile=loader.policy
loader.isHttp=false
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/LoadClassesClassNotFoundFileDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundFileDlpermCann.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/LoadClassesClassNotFoundFileDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundFileDlpermCann.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,6 @@ loader.isHttp=false
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/LoadClassesClassNotFoundHttp.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundHttp.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/LoadClassesClassNotFoundHttp.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundHttp.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ loader.isHttp=true
loader.httpPort=8087
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/preferredClassProvider/LoadClassesClassNotFoundHttpCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundHttpCann.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/LoadClassesClassNotFoundHttpCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundHttpCann.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,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/LoadClassesClassNotFoundHttpDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundHttpDlperm.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/LoadClassesClassNotFoundHttpDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundHttpDlperm.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/LoadClassesClassNotFoundHttpDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundHttpDlpermCann.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/LoadClassesClassNotFoundHttpDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundHttpDlpermCann.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/LoadClassesFile.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/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/preferredClassProvider/LoadClassesFile.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesFile.td Fri Apr 25 11:34:00 2014
@@ -3,6 +3,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/preferredClassProvider/LoadClassesFileCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesFileCann.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/LoadClassesFileCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesFileCann.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ loader.isHttp=false
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/LoadClassesFileDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesFileDlperm.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/LoadClassesFileDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesFileDlperm.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ testPolicyfile=loader.policy
loader.isHttp=false
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/LoadClassesFileDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesFileDlpermCann.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/LoadClassesFileDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesFileDlpermCann.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,6 @@ loader.isHttp=false
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/LoadClassesHttp.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/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/preferredClassProvider/LoadClassesHttp.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesHttp.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ loader.isHttp=true
loader.httpPort=8087
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/preferredClassProvider/LoadClassesHttpCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesHttpCann.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/LoadClassesHttpCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesHttpCann.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,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/LoadClassesHttpDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesHttpDlperm.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/LoadClassesHttpDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesHttpDlperm.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/LoadClassesHttpDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesHttpDlpermCann.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/LoadClassesHttpDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesHttpDlpermCann.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/LoadClassesMalformedURL.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURL.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/LoadClassesMalformedURL.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURL.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,6 @@ loader.httpPort=8087
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/LoadClassesMalformedURLCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLCann.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/LoadClassesMalformedURLCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLCann.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/LoadClassesMalformedURLDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLDlperm.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/LoadClassesMalformedURLDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLDlperm.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,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/LoadClassesMalformedURLDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLDlpermCann.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/LoadClassesMalformedURLDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLDlpermCann.td Fri Apr 25 11:34:00 2014
@@ -6,6 +6,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/LoadClassesMalformedURLDlpermNullCodebase.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLDlpermNullCodebase.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/LoadClassesMalformedURLDlpermNullCodebase.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLDlpermNullCodebase.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/LoadClassesMalformedURLDlpermSimpleann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLDlpermSimpleann.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/LoadClassesMalformedURLDlpermSimpleann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLDlpermSimpleann.td Fri Apr 25 11:34:00 2014
@@ -7,6 +7,6 @@ loader.httpPort=8087
loader.requireDlPerm=true
loader.annotator=true
loader.classAnnotator=BadClassAnnotation
-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/LoadClassesMalformedURLException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLException.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/LoadClassesMalformedURLException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLException.java Fri Apr 25 11:34:00 2014
@@ -52,6 +52,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;
/**
@@ -190,7 +191,7 @@ import com.sun.jini.test.spec.loader.pre
* for each preferred/non-preferred class do the following:
* <ol>
* <li>invoke Class.forName method passing system class loader</li>
- * <li>invoke RMIClassLoader.loadClass method passing:</li>
+ * <li>invoke ClassLoading.loadClass method passing:</li>
* <ul>
* <li>codebase - null or string that is set via properties file</li>
* <li>name - name of preferred/non-preferred class</li>
@@ -235,10 +236,12 @@ public class LoadClassesMalformedURLExce
/*
* 2) for each preferred/non-preferred class do the following:
- * - invoke RMIClassLoader.loadClass method passing:
+ * - invoke ClassLoading.loadClass method passing:
* codebase - null or string that is set via properties file
* name - name of preferred/non-preferred class
* parent - ClassLoader.getSystemClassLoader()
+ * verifyCodebaseIntegrity - false
+ * verifierLoader - null
* - verify that MalformedURLException is thrown
*/
for (int item = 0; item < Util.listClasses.length; item++) {
@@ -246,20 +249,20 @@ public class LoadClassesMalformedURLExce
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.
// Tests case with expected ClassNotFoundException
// is LoadClassesClassNotFoundException
- message += "\nRMIClassLoader.loadClass(" + cb + ", "
- + name + ", defaultLoader)\n"
+ message += "\nClassLoading.loadClass(" + cb + ", "
+ + name + ", defaultLoader, false, null)\n"
+ " throws: " + e.toString() + "\n"
+ " expected: MalformedURLException";
throw new TestException(message);
} catch (MalformedURLException me) {
String msg = ""
- + "RMIClassLoader.loadClass(" + cb + ", "
- + name + ", defaultLoader)\n"
+ + "ClassLoading.loadClass(" + cb + ", "
+ + name + ", defaultLoader, false, null)\n"
+ " throws " + me.toString()
+ " as expected";
logger.log(Level.FINE, msg);
@@ -268,14 +271,14 @@ public class LoadClassesMalformedURLExce
// Do not expect SecurityException.
// Tests case with expected SecurityException
// is LoadClassesSecurityException
- message += "\nRMIClassLoader.loadClass(" + cb + ", "
- + name + ", defaultLoader)\n"
+ message += "\nClassLoading.loadClass(" + cb + ", "
+ + name + ", defaultLoader, false, null)\n"
+ " throws: " + sex.toString() + "\n"
+ " expected: MalformedURLException";
throw new TestException(message);
}
- message += "\nRMIClassLoader.loadClass(" + cb + ", "
- + name + ", defaultLoader)\n"
+ message += "\nClassLoading.loadClass(" + cb + ", "
+ + name + ", defaultLoader, false, null)\n"
+ " returned: " + classPreferred.toString() + "\n"
+ " expected: MalformedURLException";
throw new TestException(message);
@@ -294,20 +297,20 @@ public class LoadClassesMalformedURLExce
Class classPreferred = null;
try {
- classPreferred = RMIClassLoader.loadClass(cb, name, null);
+ classPreferred = ClassLoading.loadClass(cb, name, null, false, null);
} catch (ClassNotFoundException e) {
// Do not expect ClassNotFoundException.
// Tests case with expected ClassNotFoundException
// is LoadClassesClassNotFoundException
- message += "\nRMIClassLoader.loadClass(" + cb + ", "
- + name + ", null)\n"
+ message += "\nClassLoading.loadClass(" + cb + ", "
+ + name + ", null, false, null)\n"
+ " throws: " + e.toString() + "\n"
+ " expected: MalformedURLException";
throw new TestException(message);
} catch (MalformedURLException me) {
String msg = ""
- + "RMIClassLoader.loadClass(" + cb + ", "
- + name + ", null)\n"
+ + "ClassLoading.loadClass(" + cb + ", "
+ + name + ", null, false, null)\n"
+ " throws " + me.toString()
+ " as expected";
logger.log(Level.FINE, msg);
@@ -316,14 +319,14 @@ public class LoadClassesMalformedURLExce
// Do not expect SecurityException.
// Tests case with expected SecurityException
// is LoadClassesSecurityException
- message += "\nRMIClassLoader.loadClass(" + cb + ", "
- + name + ", null)\n"
+ message += "\nClassLoader.loadClass(" + cb + ", "
+ + name + ", null, false, null)\n"
+ " throws: " + se.toString() + "\n"
+ " expected: MalformedURLException";
throw new TestException(message);
}
- message += "\nRMIClassLoader.loadClass(" + cb + ", "
- + name + ", null)\n"
+ message += "\nClassLoader.loadClass(" + cb + ", "
+ + name + ", null, false, null)\n"
+ " returned: " + classPreferred.toString() + "\n"
+ " expected: MalformedURLException";
throw new TestException(message);
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLNullCodebase.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLNullCodebase.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/LoadClassesMalformedURLNullCodebase.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLNullCodebase.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,6 @@ loader.isHttp=true
loader.httpPort=8087
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/preferredClassProvider/LoadClassesMalformedURLSimpleann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLSimpleann.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/LoadClassesMalformedURLSimpleann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLSimpleann.td Fri Apr 25 11:34:00 2014
@@ -6,6 +6,6 @@ loader.httpPort=8087
loader.requireDlPerm=false
loader.annotator=true
loader.classAnnotator=BadClassAnnotation
-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/LoadClassesSecurityException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/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/preferredClassProvider/LoadClassesSecurityException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityException.java Fri Apr 25 11:34:00 2014
@@ -52,6 +52,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;
/**
@@ -93,7 +94,7 @@ import com.sun.jini.test.spec.loader.pre
* <br><br>
*
* {@link QATestPreferredClassProvider} should be configured as
- * java.rmi.server.RMIClassLoaderSpi, so that RMIClassLoader.loadClass
+ * java.rmi.server.RMIClassLoaderSpi, so that ClassLoading.loadClass
* calls QATestPreferredClassProvider.loadClass method.
* <br><br>
*
@@ -126,7 +127,7 @@ import com.sun.jini.test.spec.loader.pre
* <br><br>
*
* For each preferred/non-preferred class this test will try to execute
- * RMIClassLoader.loadClass(codebase, name, parent) passing:
+ * ClassLoading.loadClass(codebase, name, parent, verifyCodebaseIntegrity, verifierLoader) passing:
* <ul>
* <li>codebase - string representation of url to qa1-loader-pref.jar
* file</li>
@@ -210,7 +211,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()
@@ -227,13 +228,13 @@ 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.
// Tests case with expected ClassNotFoundException
// is LoadClassesClassNotFoundException
- 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;
@@ -241,8 +242,8 @@ public class LoadClassesSecurityExceptio
// Do not expect MalformedURLException.
// Tests case with expected MalformedURLException
// is LoadClassesMalformedURLException
- message += "RMIClassLoader.loadClass(" + cb + ", "
- + name + ", defaultLoader)\n"
+ message += "ClassLoadin.loadClass(" + cb + ", "
+ + name + ", defaultLoader, false, null)\n"
+ " throws: " + me.toString() + "\n"
+ " expected: " + (pref ? str3 : str2);
break;
@@ -250,14 +251,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 " + se.toString()
+ " as expected";
logger.log(Level.FINE, msg);
} else {
- message += "RMIClassLoader.loadClass(" + cb + ", "
- + name + ", defaultLoader)\n"
+ message += "ClassLoading.loadClass(" + cb + ", "
+ + name + ", defaultLoader, false, null)\n"
+ " returned: " + se.toString() + "\n"
+ " expected: " + str2;
break;
@@ -266,15 +267,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.FINE, msg);
@@ -307,8 +308,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/preferredClassProvider/LoadClassesSecurityExceptionFile.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/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/preferredClassProvider/LoadClassesSecurityExceptionFile.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityExceptionFile.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ testPolicyfile=loaderNoDlPerm.policy
loader.isHttp=false
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/LoadClassesSecurityExceptionFileCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityExceptionFileCann.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/LoadClassesSecurityExceptionFileCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityExceptionFileCann.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,6 @@ loader.isHttp=false
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/LoadClassesSecurityExceptionHttp.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/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/preferredClassProvider/LoadClassesSecurityExceptionHttp.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityExceptionHttp.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/LoadClassesSecurityExceptionHttpCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityExceptionHttpCann.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/LoadClassesSecurityExceptionHttpCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityExceptionHttpCann.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/LoadProxyClasses.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClasses.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/LoadProxyClasses.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClasses.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;
/**
@@ -220,7 +221,7 @@ public class LoadProxyClasses extends Ab
/*
* 2) for each interface do the following:
- * - invoke RMIClassLoader.loadClass method passing:
+ * - invoke ClassLoading.loadClass method passing:
* codebase - string representation of url to
* qa1-loader-pref.jar file
* name - name of interface
@@ -231,11 +232,11 @@ public class LoadProxyClasses extends Ab
* interfaces - string array of interface name (so that this
* array has one element)
* defaultLoader - ClassLoader.getSystemClassLoader()
- * - verify that RMIClassLoader.loadProxyClass returns proxy class
- * - verify that class returned by RMIClassLoader.loadClass
+ * - verify that ClassLoading.loadProxyClass returns proxy class
+ * - verify that class returned by ClassLoading.loadClass
* method is assignable from class returned by
- * RMIClassLoader.loadProxyClass method
- * - verify that class returned by RMIClassLoader.loadProxyClass
+ * ClassLoading.loadProxyClass method
+ * - verify that class returned by ClassLoading.loadProxyClass
* has a PreferredClassLoader as class loader.
*/
for (int item = 0; item < Util.listInterfaces.length; item++) {
@@ -245,38 +246,38 @@ public class LoadProxyClasses extends Ab
String[] in = { name };
try {
- classDefault = RMIClassLoader.loadClass(cb, name, parent);
+ classDefault = ClassLoading.loadClass(cb, name, parent, false, null);
} catch (ClassNotFoundException e) {
// Do not expect ClassNotFoundException.
- message += "\nRMIClassLoader.loadClass(" + cb + ", "
- + name + ", defaultLoader)\n"
+ message += "\nClassLoading.loadClass(" + cb + ", "
+ + name + ", defaultLoader, false, null)\n"
+ " throws: " + e.toString() + "\n"
+ " expected: " + name + " interface";
break;
} catch (MalformedURLException me) {
// Do not expect MalformedURLException.
- message += "\nRMIClassLoader.loadClass(" + cb + ", "
- + name + ", defaultLoader)\n"
+ message += "\nClassLoading.loadClass(" + cb + ", "
+ + name + ", defaultLoader, false, null)\n"
+ " throws: " + me.toString() + "\n"
+ " expected: " + name + " interface";
break;
} catch (SecurityException se) {
// Do not expect SecurityException.
- message += "\nRMIClassLoader.loadClass(" + cb + ", "
- + name + ", defaultLoader)\n"
+ message += "\nClassLoading.loadClass(" + cb + ", "
+ + name + ", defaultLoader, false, null)\n"
+ " throws: " + se.toString() + "\n"
+ " expected: " + name + " interface";
break;
}
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 + ", "
- + in[0] + ", defaultLoader)\n"
+ message += "\nClassLoading.loadProxyClass(" + cb + ", "
+ + in[0] + ", defaultLoader, false, null)\n"
+ " throws: " + e.toString() + "\n"
+ " expected: proxy class";
break;
@@ -284,15 +285,15 @@ public class LoadProxyClasses extends Ab
// Do not expect MalformedURLException.
// Tests case with expected MalformedURLException
// is LoadProxyClassesMalformedURLException
- message += "\nRMIClassLoader.loadProxyClass(" + cb + ", "
- + in[0] + ", defaultLoader)\n"
+ message += "\nClassLoading.loadProxyClass(" + cb + ", "
+ + in[0] + ", defaultLoader, false, null)\n"
+ " throws: " + me.toString() + "\n"
+ " expected: proxy class";
break;
} catch (SecurityException se) {
// Do not expect SecurityException.
- message += "\nRMIClassLoader.loadProxyClass(" + cb + ", "
- + in[0] + ", defaultLoader)\n"
+ message += "\nClassLoading.loadProxyClass(" + cb + ", "
+ + in[0] + ", defaultLoader, false, null)\n"
+ " throws: " + se.toString() + "\n"
+ " expected: proxy class";
break;
@@ -300,26 +301,26 @@ public class LoadProxyClasses extends Ab
ClassLoader proxyLoader = classLoaded.getClassLoader();
if (!Proxy.isProxyClass(classLoaded)) {
- message += "\nRMIClassLoader.loadProxyClass(" + cb + ", "
- + in[0] + ", defaultLoader)\n"
+ message += "\nClassLoading.loadProxyClass(" + cb + ", "
+ + in[0] + ", defaultLoader, false, null)\n"
+ " returned non-proxy class";
break;
} else if (!classDefault.isAssignableFrom(classLoaded)) {
- message += "\nRMIClassLoader.loadProxyClass(" + cb + ", "
- + in[0] + ", defaultLoader)\n"
+ message += "\nClassLoading.loadProxyClass(" + cb + ", "
+ + in[0] + ", defaultLoader, false, null)\n"
+ " returned non-assignable class";
break;
} else if (!(proxyLoader instanceof PreferredClassLoader)) {
- message += "\nRMIClassLoader.loadProxyClass(" + cb + ", "
- + in[0] + ", defaultLoader)\n"
+ message += "\nClassLoading.loadProxyClass(" + cb + ", "
+ + in[0] + ", defaultLoader, false, null)\n"
+ " has incorrect class loader: "
+ proxyLoader.toString();
break;
} else {
// classDefault is assignable from classLoaded
String msg = ""
- + "RMIClassLoader.loadProxyClass(" + cb + ", "
- + in[0] + ", defaultLoader)\n returned"
+ + "ClassLoading.loadProxyClass(" + cb + ", "
+ + in[0] + ", defaultLoader, false, null)\n returned"
+ " assignable proxy class as expected\n";
logger.log(Level.FINE, msg);
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundException.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/LoadProxyClassesClassNotFoundException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundException.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;
/**
@@ -204,7 +205,7 @@ public class LoadProxyClassesClassNotFou
* 2) ten times do the following:
* - get name of non-existent interface via
* Util.getRandomInterface()
- * - invoke RMIClassLoader.loadProxyClass method passing:
+ * - invoke ClassLoading.loadProxyClass method passing:
* codebase - string representation of url to qa1-loader-pref.jar
* file
* interfaces - string array of non-existent interface name (so
@@ -218,12 +219,12 @@ public class LoadProxyClassesClassNotFou
String[] in = { name };
try {
- classLoaded = RMIClassLoader.loadProxyClass(cb, in, parent);
+ classLoaded = ClassLoading.loadProxyClass(cb, in, parent, false, null);
} catch (ClassNotFoundException e) {
// Expect ClassNotFoundException
String msg = ""
- + "\nRMIClassLoader.loadProxyClass(" + cb + ", "
- + in[0] + ", defaultLoader)\n"
+ + "\nClassLoading.loadProxyClass(" + cb + ", "
+ + in[0] + ", defaultLoader, false, null)\n"
+ " throws " + e.toString() + " as expected";
logger.log(Level.FINE, msg);
continue;
@@ -231,14 +232,14 @@ public class LoadProxyClassesClassNotFou
// Do not expect MalformedURLException.
// Tests case with expected MalformedURLException
// is LoadProxyClassesMalformedURLException
- message += "\nRMIClassLoader.loadProxyClass(" + cb + ", "
- + in[0] + ", defaultLoader)\n"
+ message += "\nClassLoading.loadProxyClass(" + cb + ", "
+ + in[0] + ", defaultLoader, false, null)\n"
+ " throws: " + me.toString() + "\n"
+ " expected: ClassNotFoundException";
break;
}
- message += "\nRMIClassLoader.loadProxyClass(" + cb + ", "
- + in[0] + ", defaultLoader)\n"
+ message += "\nClassLoader.loadProxyClass(" + cb + ", "
+ + in[0] + ", defaultLoader, false, null)\n"
+ " returns: " + classLoaded.toString() + "\n"
+ " expected: ClassNotFoundException";
break;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundFile.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundFile.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/LoadProxyClassesClassNotFoundFile.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundFile.td Fri Apr 25 11:34:00 2014
@@ -3,6 +3,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/preferredClassProvider/LoadProxyClassesClassNotFoundFileCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundFileCann.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/LoadProxyClassesClassNotFoundFileCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundFileCann.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ loader.isHttp=false
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/LoadProxyClassesClassNotFoundFileDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundFileDlperm.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/LoadProxyClassesClassNotFoundFileDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundFileDlperm.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ testPolicyfile=loader.policy
loader.isHttp=false
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/LoadProxyClassesClassNotFoundFileDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundFileDlpermCann.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/LoadProxyClassesClassNotFoundFileDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundFileDlpermCann.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,6 @@ loader.isHttp=false
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/LoadProxyClassesClassNotFoundHttp.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundHttp.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/LoadProxyClassesClassNotFoundHttp.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundHttp.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ loader.isHttp=true
loader.httpPort=8087
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/preferredClassProvider/LoadProxyClassesClassNotFoundHttpCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundHttpCann.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/LoadProxyClassesClassNotFoundHttpCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundHttpCann.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,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/LoadProxyClassesClassNotFoundHttpDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundHttpDlperm.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/LoadProxyClassesClassNotFoundHttpDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundHttpDlperm.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/LoadProxyClassesClassNotFoundHttpDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundHttpDlpermCann.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/LoadProxyClassesClassNotFoundHttpDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundHttpDlpermCann.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/LoadProxyClassesFile.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesFile.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/LoadProxyClassesFile.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesFile.td Fri Apr 25 11:34:00 2014
@@ -3,6 +3,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/preferredClassProvider/LoadProxyClassesFileCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesFileCann.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/LoadProxyClassesFileCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesFileCann.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ loader.isHttp=false
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/LoadProxyClassesFileDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesFileDlperm.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/LoadProxyClassesFileDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesFileDlperm.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ testPolicyfile=loader.policy
loader.isHttp=false
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/LoadProxyClassesFileDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesFileDlpermCann.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/LoadProxyClassesFileDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesFileDlpermCann.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,6 @@ loader.isHttp=false
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/LoadProxyClassesHttp.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttp.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/LoadProxyClassesHttp.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttp.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ loader.isHttp=true
loader.httpPort=8087
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/preferredClassProvider/LoadProxyClassesHttpCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttpCann.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/LoadProxyClassesHttpCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttpCann.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,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