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 [1/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
Author: peter_firmstone
Date: Fri Apr 25 11:34:00 2014
New Revision: 1590000

URL: http://svn.apache.org/r1590000
Log:
RIVER-336 Refactoring of work done by Sim & Gregg.  Updated all River code in the main src distribution to utilize ClassLoading, instead of RMIClassLoader, including marshaling and unmarshaling of MarshalledObject's using MarshalledInstance, this ensures that the replacement service provider mechanism is fully utilized, instead of using RMIClassLoader.  Since both replacement provider classes for RMIClassLoader, proposed to date, have identical methods to RMIClassLoaderSpi, RMIClassLoaderSpi has been retained, to ensure that existing providers can be utilized without requiring recompilation.  ServiceLoader is used to load RMIClassLoaderSpi, however this is done directly by ClassLoading, not RMIClassLoader and clients may specify which instance they want from a list of available providers by setting the system property "net.jini.loader.ClassLoading.provider". 

ClassLoading was chosen to delegate to the provider, since it already contained two methods compatible with and delegated to RMIClassLoader and it only required two more static methods to replace RMIClassLoader functionality and delegate directly to an RMIClassLoaderSpi provider.

Tests that test PreferredClassProvider have been converted to utilize ClassLoading instead of RMIClassLoader.

ClassLoading also has a third method that delegates to the three argument version of Class.forName, this new method fixes a hotspot and source of lock contention in mahalo's RandomStressTest, by thread confining calls for each ClassLoader when loading classes, as a result the Class.forName hot spot has been reduced from 50% cpu to under 3% cpu.

In addition debug mode has been set back to false for transaction testing.

Added:
    river/jtsk/skunk/qa_refactor/trunk/qa/src/manifest/qa1/META-INF/services/java.rmi.server.RMIClassLoaderSpi
Modified:
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/TestDescription.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/CodebaseTest.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/TxnTestUtils.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicjeritrustverifier/IsTrustedObjectTest.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotation.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationFile.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationFileCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationFileDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationFileDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationHttp.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationHttpCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationHttpDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationHttpDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoader.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderFile.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderFileCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderFileDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderFileDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderHttp.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderHttpCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderHttpDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderHttpDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURL.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLDlpermNullCodebase.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLException.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLNullCodebase.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityException.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionFile.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionFileCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionFileDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionFileDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttp.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpDlpermNoConnect.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpDlpermNoConnectCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpNoConnect.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpNoConnectCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClasses.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundException.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundFile.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundFileCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundFileDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundFileDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundHttp.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundHttpCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundHttpDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundHttpDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesFile.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesFileCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesFileDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesFileDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesHttp.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesHttpCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesHttpDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesHttpDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURL.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLDlpermNullCodebase.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLDlpermSimpleann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLException.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLNullCodebase.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLSimpleann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityException.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityExceptionFile.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityExceptionFileCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityExceptionHttp.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityExceptionHttpCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClasses.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundException.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundFile.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundFileCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundFileDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundFileDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundHttp.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundHttpCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundHttpDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundHttpDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesFile.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesFileCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesFileDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesFileDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttp.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttpCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttpDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesHttpDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURL.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLCannNullCodebase.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlperm.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermCann.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermCannNullCodebase.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLDlpermNullCodebase.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLException.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLNullCodebase.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClasses.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesFile.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesHttp.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityException.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityExceptionFile.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityExceptionHttp.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/fiddler/FiddlerImpl.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/fiddler/FiddlerRegistration.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/lookup/entry/LookupAttributes.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/JoinStateManager.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/StorableObject.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventID.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventReader.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/EventWriter.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/MailboxImpl.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mercury/ServiceRegistration.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/ActivatableNormServerImpl.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/NormServerBaseImpl.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/event/EventType.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/norm/lookup/JoinState.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/EntryRep.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/JoinStateManager.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/PersistentOutriggerImpl.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/StorableReference.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/AbstractActivationGroup.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/Activation.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/EntryClassBase.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/PersistentRegistrarImpl.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/ServiceTypeBase.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/resource/Service.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/ActivateWrapper.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/NonActivatableServiceDescriptor.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedActivatableServiceDescriptor.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedActivationGroupDescriptor.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedGroupImpl.java
    river/jtsk/skunk/qa_refactor/trunk/src/manifest/jsk-resources/META-INF/services/java.rmi.server.RMIClassLoaderSpi
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/activation/ActivationGroup.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/config/ConfigurationFile.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/config/ConfigurationProvider.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/core/discovery/LookupLocator.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/discovery/IncomingUnicastResponse.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/discovery/OutgoingUnicastResponse.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/discovery/RemoteDiscoveryEvent.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/io/MarshalInputStream.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/io/MarshalOutputStream.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/ClassLoading.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/pref/PreferredClassProvider.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/lookup/entry/UIDescriptor.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/security/proxytrust/ProxyTrustVerifier.java
    river/jtsk/skunk/qa_refactor/trunk/test/src/net/jini/core/event/RemoteEventTest.java

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/TestDescription.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/TestDescription.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/TestDescription.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/TestDescription.java Fri Apr 25 11:34:00 2014
@@ -29,6 +29,7 @@ import java.util.logging.Logger;
 import java.util.logging.Level;
 import java.util.Properties;
 import java.util.StringTokenizer;
+import net.jini.loader.ClassLoading;
 
 /**
  * The <code>TestDescription</code> is an object which describes a test;
@@ -439,7 +440,7 @@ public class TestDescription implements 
     String getCodebase() throws TestException {
         String codebase = config.getStringConfigVal("testCodebase", null);
 	if (codebase == null) {
-	    codebase = RMIClassLoader.getClassAnnotation(getClass());
+	    codebase = ClassLoading.getClassAnnotation(getClass());
 	}
 	return config.genIntegrityCodebase(codebase, null);
     }

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/CodebaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/CodebaseTest.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/CodebaseTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/CodebaseTest.java Fri Apr 25 11:34:00 2014
@@ -27,6 +27,7 @@ import com.sun.jini.qa.harness.QAConfig;
 // java.rmi
 import java.rmi.RemoteException;
 import java.rmi.server.RMIClassLoader;
+import net.jini.loader.ClassLoading;
 
 /**
  * This test ensures that different service instances in the same VM properly
@@ -72,9 +73,9 @@ public class CodebaseTest extends Abstra
         String expected_codebase2 = admin2.getCodebase();
 
         String proxy_codebase1 =
-            RMIClassLoader.getClassAnnotation(service1.getClass());
+            ClassLoading.getClassAnnotation(service1.getClass());
         String proxy_codebase2 =
-            RMIClassLoader.getClassAnnotation(service2.getClass());
+            ClassLoading.getClassAnnotation(service2.getClass());
 
         logger.log(Level.FINE, "expected codebase for test "
             + "service 1 proxy: " + expected_codebase1);
@@ -115,9 +116,9 @@ public class CodebaseTest extends Abstra
 
         // check codebases of loaded classes
         String loadClass_codebase1 =
-                RMIClassLoader.getClassAnnotation(object1.getClass());
+                ClassLoading.getClassAnnotation(object1.getClass());
         String loadClass_codebase2 =
-                RMIClassLoader.getClassAnnotation(object2.getClass());
+                ClassLoading.getClassAnnotation(object2.getClass());
 
         logger.log(Level.FINE, "expected codebase for test "
                 + "service 1 loaded class: " + expected_codebase1);

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/TxnTestUtils.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/TxnTestUtils.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/TxnTestUtils.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/TxnTestUtils.java Fri Apr 25 11:34:00 2014
@@ -18,17 +18,13 @@
 
 package com.sun.jini.test.share;
 
-import com.sun.jini.mahalo.*;
-import net.jini.core.lease.*;
-import net.jini.core.transaction.*;
-import net.jini.core.transaction.server.*;
- 
-import java.io.*;
-import java.rmi.*;
-import java.util.*;
+import java.rmi.RemoteException;
+import java.util.Random;
+import net.jini.core.transaction.Transaction;
+import net.jini.core.transaction.TransactionException;
 
 public class TxnTestUtils {
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     public static TestParticipant[] createParticipants(int howMany)
 	throws RemoteException
@@ -56,7 +52,8 @@ public class TxnTestUtils {
     public static void setBulkBehavior(int how, TestParticipant[] parts)
 	throws RemoteException
     {
-	for (int i = 0; i < parts.length; i++) {
+        int l = parts.length;
+	for (int i = 0; i < l; i++) {
 	    parts[i].setBehavior(how);
 	}
     }
@@ -65,7 +62,8 @@ public class TxnTestUtils {
 					TestParticipant[] parts)
 	throws RemoteException, TransactionException
     {
-	for (int i = 0; i < parts.length; i++) {
+        int l = parts.length;
+	for (int i = 0; i < l; i++) {
 	    if (DEBUG) {
 		System.out.println("TxnTestUtils: doBulkBehavior: instructing" +
 				    "Participant(" + (i+1) + ")" );

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.java Fri Apr 25 11:34:00 2014
@@ -105,11 +105,11 @@ public class LoadClass_VerifyCodebaseInt
             "com.sun.jini.test.spec.io.util.fakeArgumentJar","Error");
 
         // loadClass values
-        Class fakeArg = RMIClassLoader.loadClass(codebase,
-            "com.sun.jini.test.spec.io.util.FakeArgument");
+        Class fakeArg = ClassLoading.loadClass(codebase,
+            "com.sun.jini.test.spec.io.util.FakeArgument", null, false, null);
         Class proxy = Proxy.getProxyClass(
-            RMIClassLoader.getClassLoader(codebase),
-            new Class[] {RMIClassLoader.loadClass(codebase,interfaceName)});
+            ClassLoading.getClassLoader(codebase),
+            new Class[] {ClassLoading.loadClass(codebase,interfaceName, null, false, null)});
 
         // providesIntegrity
         Boolean f = Boolean.FALSE;

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.java Fri Apr 25 11:34:00 2014
@@ -44,6 +44,7 @@ import java.util.ArrayList;
 import java.util.logging.Level;
 import java.lang.reflect.Proxy;
 import java.net.MalformedURLException;
+import net.jini.loader.ClassLoading;
 
 /**
  * <pre>
@@ -127,9 +128,9 @@ public class Resolve_LoadClassExceptionT
         // transferObject field values
         File file = new File("test case");
         Object proxy = Proxy.newProxyInstance(
-                    RMIClassLoader.getClassLoader(codebase),
-                    new Class[] {RMIClassLoader.loadClass(
-                        codebase,interfaceName)},
+                    ClassLoading.getClassLoader(codebase),
+                    new Class[] {ClassLoading.loadClass(
+                        codebase,interfaceName, null, false, null)},
                     new BasicInvocationHandler(new FakeObjectEndpoint(),null));
 
         // callUseCodebaseAnnotations

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.java Fri Apr 25 11:34:00 2014
@@ -40,6 +40,7 @@ import java.io.ByteArrayInputStream;
 import java.util.ArrayList;
 import java.util.logging.Level;
 import java.lang.reflect.Proxy;
+import net.jini.loader.ClassLoading;
 
 /**
  * <pre>
@@ -121,12 +122,12 @@ public class Resolve_VerifyCodebaseInteg
 
         // transferObject field values
         String string = "transfer string";
-        Object fakeArg = RMIClassLoader.loadClass(codebase,
-            "com.sun.jini.test.spec.io.util.FakeArgument").newInstance();
+        Object fakeArg = ClassLoading.loadClass(codebase,
+            "com.sun.jini.test.spec.io.util.FakeArgument", null, false, null).newInstance();
         Object proxy = Proxy.newProxyInstance(
-                    RMIClassLoader.getClassLoader(codebase),
-                    new Class[] {RMIClassLoader.loadClass(
-                        codebase,interfaceName)},
+                    ClassLoading.getClassLoader(codebase),
+                    new Class[] {ClassLoading.loadClass(
+                        codebase,interfaceName, null, false, null)},
                     new BasicInvocationHandler(new FakeObjectEndpoint(),
                         new FakeMethodConstraints(null)));
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.java Fri Apr 25 11:34:00 2014
@@ -36,6 +36,7 @@ import java.rmi.RemoteException;
 import java.rmi.MarshalException;
 import java.rmi.UnmarshalException;
 import java.lang.reflect.UndeclaredThrowableException;
+import net.jini.loader.ClassLoading;
 
 /**
  * <pre>
@@ -151,8 +152,8 @@ public class Get_ExceptionTest extends Q
 
         String codebase = config.getStringConfigVal(
             "com.sun.jini.test.spec.io.util.fakeArgumentJar","Error");
-        Object fakeArg = RMIClassLoader.loadClass(codebase,
-            "com.sun.jini.test.spec.io.util.FakeArgument").newInstance();
+        Object fakeArg = ClassLoading.loadClass(codebase,
+            "com.sun.jini.test.spec.io.util.FakeArgument", null, false, null).newInstance();
         mi = new MarshalledInstance(fakeArg);
         try {
             mi.get(true);

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.java Fri Apr 25 11:34:00 2014
@@ -35,6 +35,7 @@ import java.io.File;
 import java.rmi.server.RMIClassLoader;
 import java.util.logging.Level;
 import java.lang.reflect.Proxy;
+import net.jini.loader.ClassLoading;
 
 /**
  * <pre>
@@ -98,12 +99,12 @@ public class Get_NormalTest extends QATe
 
         // storeObject field values
         File fakeFile = new File("fakeFile");
-        Object fakeArg = RMIClassLoader.loadClass(codebase,
-            "com.sun.jini.test.spec.io.util.FakeArgument").newInstance();
+        Object fakeArg = ClassLoading.loadClass(codebase,
+            "com.sun.jini.test.spec.io.util.FakeArgument", null, false, null).newInstance();
         Object proxy = Proxy.newProxyInstance(
-                    RMIClassLoader.getClassLoader(codebase),
-                    new Class[] {RMIClassLoader.loadClass(
-                        codebase,interfaceName)},
+                    ClassLoading.getClassLoader(codebase),
+                    new Class[] {ClassLoading.loadClass(
+                        codebase,interfaceName, null, false, null)},
                     new BasicInvocationHandler(new FakeObjectEndpoint(),null));
 
         // requestIntegrity

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicjeritrustverifier/IsTrustedObjectTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicjeritrustverifier/IsTrustedObjectTest.java?rev=1590000&r1=1589999&r2=1590000&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicjeritrustverifier/IsTrustedObjectTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicjeritrustverifier/IsTrustedObjectTest.java Fri Apr 25 11:34:00 2014
@@ -82,6 +82,7 @@ import java.lang.reflect.InvocationHandl
 //java.net
 import java.net.URL;
 import java.net.URLClassLoader;
+import net.jini.loader.ClassLoading;
 
 public class IsTrustedObjectTest extends AbstractTrustVerifierTest {
 
@@ -165,7 +166,7 @@ public class IsTrustedObjectTest extends
                 + " context was not propagated");
         }
         Object proxy3 = Proxy.newProxyInstance(
-	    RMIClassLoader.getClassLoader(jarURL),
+	    ClassLoading.getClassLoader(jarURL),
 	    stub.getClass().getInterfaces(),
 	    Proxy.getInvocationHandler(stub));
         if (verifier.isTrustedObject(proxy3,ctx)){

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotation.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotation.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/GetClassAnnotation.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotation.java Fri Apr 25 11:34:00 2014
@@ -56,6 +56,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;
 
 
 /**
@@ -217,17 +218,19 @@ public class GetClassAnnotation extends 
 
         /*
          * 3) 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()
-         *  - call RMIClassLoader.getClassAnnotation() passing returned
+         *    verifyCodebaseIntegrity - false
+         *    verifierLoader - null
+         *  - call ClassLoading.getClassAnnotation() passing returned
          *    class
          *  - for non-preferred classes obtain expected annotation string
          *    from java.rmi.server.codebase property;
          *    for preferred classes obtain expected annotation string
          *    from default RMIClassLoader provider.
-         *  - verify that RMIClassLoader.getClassAnnotation() returned
+         *  - verify that ClassLoading.getClassAnnotation() returned
          *    expected string.
          */
         for (int item = 0; item < Util.listClasses.length; item++) {
@@ -236,13 +239,13 @@ public class GetClassAnnotation extends 
             Class cl = null;
 
             try {
-                cl = RMIClassLoader.loadClass(cb, name, parent);
+                cl = 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);
                 break;
@@ -250,8 +253,8 @@ public class GetClassAnnotation extends 
                 // 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);
                 break;
@@ -259,13 +262,13 @@ public class GetClassAnnotation extends 
                 // Do not expect SecurityException.
                 // Tests case with expected SecurityException
                 // is LoadClassesSecurityException
-                message += "RMIClassLoader.loadClass(" + cb + ", "
-                         + name + ", false, defaultLoader)\n"
+                message += "ClassLoading.loadClass(" + cb + ", "
+                         + name + ", false, defaultLoader, false, null)\n"
                          + "  throws: " + sex.toString() + "\n"
                          + "  expected: " + (pref ? str1 : str2);
                 break;
             }
-            String returned = RMIClassLoader.getClassAnnotation(cl);
+            String returned = ClassLoading.getClassAnnotation(cl);
             String expected = null;
 
             if (!pref) {
@@ -283,14 +286,14 @@ public class GetClassAnnotation extends 
             if ((returned != null && expected == null) || (returned == null
                     && expected != null) || (returned != null
                     && !returned.equals(expected))) {
-                message += "RMIClassLoader.getClassAnnotation("
+                message += "ClassLoading.getClassAnnotation("
                          + cl.toString() + ")\n"
                          + "  returned: " + returned + "\n"
                          + "  expected: " + expected + "\n";
                 break;
             } else {
                 String msg = ""
-                           + "RMIClassLoader.getClassAnnotation("
+                           + "ClassLoading.getClassAnnotation("
                            + cl.toString() + ")\n"
                            + "  returned: " + returned
                            + "  as expected";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationFile.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationFile.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/GetClassAnnotationFile.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationFile.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ testPolicyfile=loaderNoDlPerm.policy
 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/GetClassAnnotationFileCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationFileCann.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/GetClassAnnotationFileCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationFileCann.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,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/GetClassAnnotationFileDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationFileDlperm.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/GetClassAnnotationFileDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationFileDlperm.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/GetClassAnnotationFileDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationFileDlpermCann.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/GetClassAnnotationFileDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationFileDlpermCann.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/GetClassAnnotationHttp.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationHttp.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/GetClassAnnotationHttp.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationHttp.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/GetClassAnnotationHttpCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationHttpCann.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/GetClassAnnotationHttpCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationHttpCann.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/GetClassAnnotationHttpDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationHttpDlperm.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/GetClassAnnotationHttpDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationHttpDlperm.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/GetClassAnnotationHttpDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationHttpDlpermCann.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/GetClassAnnotationHttpDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotationHttpDlpermCann.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/GetClassLoader.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoader.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/GetClassLoader.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoader.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;
 
 
 /**
@@ -81,7 +82,7 @@ import com.sun.jini.test.spec.loader.pre
  *  <br><br>
  *
  *  {@link QATestPreferredClassProvider} should be configured as
- *  java.rmi.server.RMIClassLoaderSpi, so that RMIClassLoader.getClassLoader
+ *  java.rmi.server.RMIClassLoaderSpi, so that ClassLoading.getClassLoader
  *  calls QATestPreferredClassProvider.getClassLoader method.
  *  <br><br>
  *
@@ -172,7 +173,7 @@ import com.sun.jini.test.spec.loader.pre
  *   java.rmi.server.RMIClassLoaderSpi
  *  </li>
  *  <li>
- *   call RMIClassLoader.getClassLoader method passing codebase to
+ *   call ClassLoading.getClassLoader method passing codebase to
  *   qa1-loader-pref.jar file. The test should get PreferredClassLoader.
  *  </li>
  *  <li>
@@ -224,16 +225,16 @@ public class GetClassLoader extends Abst
         cb = Util.getUrlAddr(isHttp, config, port) + Util.PREFERREDJarFile;
 
         /*
-         * 2) call RMIClassLoader.getClassLoader method passing codebase to
+         * 2) call ClassLoading.getClassLoader method passing codebase to
          *    qa1-loader-pref.jar file.
          */
         try {
-            classLoader = RMIClassLoader.getClassLoader(cb);
+            classLoader = ClassLoading.getClassLoader(cb);
         } catch (MalformedURLException me) {
             // Do not expect MalformedURLException.
             // Tests case with expected MalformedURLException
             // is GetClassLoaderMalformedURLException
-            message += "RMIClassLoader.getClassLoader("
+            message += "ClassLoading.getClassLoader("
                      + cb + ")\n"
                      + "  throws: " + me.toString() + "\n"
                      + "  expected: PreferredClassLoader";
@@ -242,7 +243,7 @@ public class GetClassLoader extends Abst
             // Do not expect SecurityException.
             // Tests case with expected SecurityException
             // is GetClassLoaderSecurityException
-            message += "RMIClassLoader.getClassLoader("
+            message += "ClassLoading.getClassLoader("
                      + cb + ")\n"
                      + "  throws: " + sex.toString() + "\n"
                      + "  expected: PreferredClassLoader";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderFile.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderFile.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/GetClassLoaderFile.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderFile.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/GetClassLoaderFileCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderFileCann.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/GetClassLoaderFileCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderFileCann.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/GetClassLoaderFileDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderFileDlperm.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/GetClassLoaderFileDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderFileDlperm.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/GetClassLoaderFileDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderFileDlpermCann.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/GetClassLoaderFileDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderFileDlpermCann.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/GetClassLoaderHttp.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderHttp.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/GetClassLoaderHttp.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderHttp.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/GetClassLoaderHttpCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderHttpCann.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/GetClassLoaderHttpCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderHttpCann.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/GetClassLoaderHttpDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderHttpDlperm.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/GetClassLoaderHttpDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderHttpDlperm.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/GetClassLoaderHttpDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderHttpDlpermCann.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/GetClassLoaderHttpDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderHttpDlpermCann.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/GetClassLoaderMalformedURL.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURL.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/GetClassLoaderMalformedURL.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURL.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/GetClassLoaderMalformedURLCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLCann.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/GetClassLoaderMalformedURLCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLCann.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/GetClassLoaderMalformedURLDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLDlperm.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/GetClassLoaderMalformedURLDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLDlperm.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/GetClassLoaderMalformedURLDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLDlpermCann.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/GetClassLoaderMalformedURLDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLDlpermCann.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/GetClassLoaderMalformedURLDlpermNullCodebase.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLDlpermNullCodebase.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/GetClassLoaderMalformedURLDlpermNullCodebase.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLDlpermNullCodebase.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/GetClassLoaderMalformedURLException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLException.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/GetClassLoaderMalformedURLException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLException.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;
 
 
 /**
@@ -178,14 +179,14 @@ public class GetClassLoaderMalformedURLE
         cb = obtainMalformedCodebase();
 
         /*
-         * 3) call RMIClassLoader.getClassLoader method and verify that
+         * 3) call ClassLoading.getClassLoader method and verify that
          *    MalformedURLException is thrown.
          */
         try {
-            classLoader = RMIClassLoader.getClassLoader(cb);
+            classLoader = ClassLoading.getClassLoader(cb);
         } catch (MalformedURLException me) {
             // Expect MalformedURLException
-            String msg = "RMIClassLoader.getClassLoader(" + cb + ")\n"
+            String msg = "ClassLoading.getClassLoader(" + cb + ")\n"
                        + "  throws " + me.toString() + " as expected";
             logger.log(Level.FINEST, msg);
             pass = true;
@@ -193,7 +194,7 @@ public class GetClassLoaderMalformedURLE
             // Do not expect SecurityException.
             // Tests case with expected SecurityException
             // is GetClassLoaderSecurityException
-            message += "RMIClassLoader.getClassLoader("
+            message += "ClassLoading.getClassLoader("
                      + cb + ")\n"
                      + "  throws: " + se.toString() + "\n"
                      + "  expected: MalformedURLException";
@@ -201,7 +202,7 @@ public class GetClassLoaderMalformedURLE
         }
 
         if (!pass) {
-            message += "RMIClassLoader.getClassLoader("
+            message += "ClassLoading.getClassLoader("
                      + cb + ")\n"
                      + "  returned: " + classLoader.toString() + "\n"
                      + "  expected: MalformedURLException";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLNullCodebase.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLNullCodebase.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/GetClassLoaderMalformedURLNullCodebase.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLNullCodebase.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/GetClassLoaderSecurityException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityException.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/GetClassLoaderSecurityException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityException.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;
 
 
 /**
@@ -90,7 +91,7 @@ import com.sun.jini.test.spec.loader.pre
  *  <br><br>
  *
  *  {@link QATestPreferredClassProvider} should be configured as
- *  java.rmi.server.RMIClassLoaderSpi, so that RMIClassLoader.getClassLoader
+ *  java.rmi.server.RMIClassLoaderSpi, so that ClassLoading.getClassLoader
  *  calls QATestPreferredClassProvider.getClassLoader method.
  *  <br><br>
  *
@@ -145,7 +146,7 @@ import com.sun.jini.test.spec.loader.pre
  *   java.rmi.server.RMIClassLoaderSpi
  *  </li>
  *  <li>
- *   call RMIClassLoader.getClassLoader method passing codebase to
+ *   call ClassLoading.getClassLoader method passing codebase to
  *   qa1-loader-pref.jar file and verify that SecurityException is thrown.
  *  </li>
  * </ol>
@@ -170,30 +171,30 @@ public class GetClassLoaderSecurityExcep
         cb = Util.getUrlAddr(isHttp, config, port) + Util.PREFERREDJarFile;
 
         /*
-         * 2) call RMIClassLoader.getClassLoader method passing codebase to
+         * 2) call ClassLoading.getClassLoader method passing codebase to
          *    qa1-loader-pref.jar file  and verify that SecurityException is
          *    thrown.
          */
         try {
-            classLoader = RMIClassLoader.getClassLoader(cb);
+            classLoader = ClassLoading.getClassLoader(cb);
         } catch (MalformedURLException me) {
             // Do not expect MalformedURLException.
             // Tests case with expected MalformedURLException
             // is GetClassLoaderMalformedURLException
-            message += "RMIClassLoader.getClassLoader("
+            message += "ClassLoading.getClassLoader("
                      + cb + ")\n"
                      + "  throws: " + me.toString() + "\n"
                      + "  expected: SecurityException";
         } catch (SecurityException se) {
             // Expect SecurityException
-            String msg = "RMIClassLoader.getClassLoader(" + cb + ")\n"
+            String msg = "ClassLoading.getClassLoader(" + cb + ")\n"
                        + " throws " + se.toString() + " as expected";
             logger.log(Level.FINEST, msg);
             pass = true;
         }
 
         if (!pass) {
-            message += "RMIClassLoader.getClassLoader("
+            message += "ClassLoading.getClassLoader("
                      + cb + ")\n"
                      + "  returned: " + classLoader.toString() + "\n"
                      + "  expected: SecurityException";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionFile.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionFile.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/GetClassLoaderSecurityExceptionFile.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionFile.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ testPolicyfile=loaderNoGetClassLoader.po
 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/GetClassLoaderSecurityExceptionFileCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionFileCann.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/GetClassLoaderSecurityExceptionFileCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionFileCann.td Fri Apr 25 11:34:00 2014
@@ -5,6 +5,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/GetClassLoaderSecurityExceptionFileDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionFileDlperm.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/GetClassLoaderSecurityExceptionFileDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionFileDlperm.td Fri Apr 25 11:34:00 2014
@@ -4,6 +4,6 @@ testPolicyfile=loaderNoGetClassLoader.po
 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/GetClassLoaderSecurityExceptionFileDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionFileDlpermCann.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/GetClassLoaderSecurityExceptionFileDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionFileDlpermCann.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/GetClassLoaderSecurityExceptionHttp.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttp.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/GetClassLoaderSecurityExceptionHttp.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttp.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/GetClassLoaderSecurityExceptionHttpCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpCann.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/GetClassLoaderSecurityExceptionHttpCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpCann.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/GetClassLoaderSecurityExceptionHttpDlperm.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpDlperm.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/GetClassLoaderSecurityExceptionHttpDlperm.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpDlperm.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/GetClassLoaderSecurityExceptionHttpDlpermCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpDlpermCann.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/GetClassLoaderSecurityExceptionHttpDlpermCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpDlpermCann.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/GetClassLoaderSecurityExceptionHttpDlpermNoConnect.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpDlpermNoConnect.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/GetClassLoaderSecurityExceptionHttpDlpermNoConnect.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpDlpermNoConnect.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/GetClassLoaderSecurityExceptionHttpDlpermNoConnectCann.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpDlpermNoConnectCann.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/GetClassLoaderSecurityExceptionHttpDlpermNoConnectCann.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityExceptionHttpDlpermNoConnectCann.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



Mime
View raw message