User: d_jencks
  Date: 02/04/14 19:48:54

  Modified:    src/main/org/jboss/test/jbossmx/implementation/server
                        ContextCLTestCase.java
  Log:
  Changed to use UnifiedLoaderRepository and UnifiedClassLoader from jbossmx.  Removed 
ServiceLibraries, UnifiedClassLoader, and MBeanClassLoader from jboss-system
  
  Revision  Changes    Path
  1.4       +29 -22    
jbosstest/src/main/org/jboss/test/jbossmx/implementation/server/ContextCLTestCase.java
  
  Index: ContextCLTestCase.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jbosstest/src/main/org/jboss/test/jbossmx/implementation/server/ContextCLTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ContextCLTestCase.java    19 Feb 2002 20:00:17 -0000      1.3
  +++ ContextCLTestCase.java    15 Apr 2002 02:48:54 -0000      1.4
  @@ -19,7 +19,6 @@
   import javax.management.ObjectName;
   import javax.management.RuntimeErrorException;
   
  -import junit.extensions.TestSetup;
   import junit.framework.Test;
   import junit.framework.TestSuite;
   
  @@ -27,10 +26,11 @@
   import org.apache.log4j.PatternLayout;
   import org.apache.log4j.WriterAppender;
   
  -import org.jboss.system.MBeanClassLoader;
  -import org.jboss.system.ServiceLibraries;
  -import org.jboss.system.UnifiedClassLoader;
  -import org.jboss.test.JBossTestSetup;
  +//import org.jboss.system.MBeanClassLoader;
  +//import org.jboss.system.ServiceLibraries;
  +//import org.jboss.system.UnifiedClassLoader;
  +import org.jboss.mx.loading.UnifiedLoaderRepository;
  +import org.jboss.mx.loading.UnifiedClassLoader;
   import org.jboss.test.jbossmx.implementation.TestCase;
   import org.jboss.test.jbossmx.implementation.server.support.ContextCL;
   
  @@ -42,17 +42,20 @@
    *occur when reloading a sar that contains an ejb-jar.
    *
    * @author  [EMAIL PROTECTED]
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public class ContextCLTestCase extends TestCase 
   {
      private static URL dataClassURL;
      private static File dataJar;
  -   private static MBeanClassLoader mainLoader;
  -   private static ObjectName mainLoaderName;
  +   //private static MBeanClassLoader mainLoader;
  +   //private static ObjectName mainLoaderName;
  +   private static UnifiedLoaderRepository repo;
      private static UnifiedClassLoader deployLoader;
  -   private static ObjectName deployLoaderName;
  +   private static UnifiedClassLoader noLoader;
  +   //private static ObjectName deployLoaderName;
      static Object data0;
  +   private static URL jarUrl;
   
      public ContextCLTestCase(String name)
      {
  @@ -65,16 +68,17 @@
         /* Install the mainLoader to simulate how the MBeanServer would be
          *running under JBoss
         */
  -      Thread.currentThread().setContextClassLoader(mainLoader);
  +      Thread.currentThread().setContextClassLoader(deployLoader);
         MBeanServer server = MBeanServerFactory.createMBeanServer();
   
         // Create the ContextCL MBean using the TestClassLoader
         try
         {
  -         if( server.isRegistered(deployLoaderName) == false )
  -            server.registerMBean(deployLoader, deployLoaderName);
  +         //if( server.isRegistered(deployLoaderName) == false )
  +         // server.registerMBean(deployLoader, deployLoaderName);
  +         new UnifiedClassLoader(jarUrl, server, new 
ObjectName("JMImplementation:service=LoaderRepository,name=Default"));
            ObjectName beanName = new 
ObjectName("org.jboss.test.jbossmx.implementation.server.support:test=ContextCLTestCase");
  -         
server.createMBean("org.jboss.test.jbossmx.implementation.server.support.ContextCL", 
beanName, deployLoaderName);
  +         
server.createMBean("org.jboss.test.jbossmx.implementation.server.support.ContextCL", 
beanName);
            getLog().info("Created ContextCL MBean");
   
            // Invoke the useTestData op to test the thread context class loader
  @@ -102,6 +106,7 @@
       */
      public void createTestDataJar() throws Exception
      {
  +      repo = new UnifiedLoaderRepository();
         dataJar = new File("testdata.jar");
         // Find the TestData class
         dataClassURL = 
getClass().getResource("/org/jboss/test/jbossmx/implementation/server/support/TestData.class");
  @@ -166,22 +171,24 @@
         fos.close();
   
         // Initialize the ServiceLibraries
  -      ServiceLibraries libs = ServiceLibraries.getLibraries();
  -      libs.preRegister(null, null);
  +      //ServiceLibraries libs = ServiceLibraries.getLibraries();
  +      //libs.preRegister(null, null);
         // Simulator the initial deploy of the mbean service
  -      mainLoaderName = new 
ObjectName("org.jboss.test.jbossmx.implementation.server.support:id=main");
  -      mainLoader = new MBeanClassLoader(mainLoaderName);
  -      deployLoader = new UnifiedClassLoader(dataJar.toURL());
  +      //mainLoaderName = new 
ObjectName("org.jboss.test.jbossmx.implementation.server.support:id=main");
  +      //mainLoader = new MBeanClassLoader(mainLoaderName);
  +      noLoader = new UnifiedClassLoader(null, repo);
  +      deployLoader = new UnifiedClassLoader(dataJar.toURL(), repo);
         Class c0 = 
deployLoader.loadClass("org.jboss.test.jbossmx.implementation.server.support.TestData");
         getLog().info("TestData #0 ProtectionDomain: "+c0.getProtectionDomain());
         Class c1 = 
Class.forName("org.jboss.test.jbossmx.implementation.server.support.TestData",
  -         false, mainLoader);
  +         false, noLoader);
         getLog().info("TestData #1 ProtectionDomain: "+c1.getProtectionDomain());
  -      libs.removeClassLoader(deployLoader);
  +      repo.removeClassLoader(deployLoader);
         // Simulate a redeploy
         File data1Jar = new File("testdata1.jar");
  -      deployLoaderName = new 
ObjectName("org.jboss.test.jbossmx.implementation.server.support:key="+data1Jar.getName());
  -      deployLoader = new UnifiedClassLoader(data1Jar.toURL());
  +      jarUrl = data1Jar.toURL();
  +      //deployLoaderName = new 
ObjectName("org.jboss.test.jbossmx.implementation.server.support:key="+data1Jar.getName());
  +      deployLoader = new UnifiedClassLoader(jarUrl, repo);
         c0 = 
deployLoader.loadClass("org.jboss.test.jbossmx.implementation.server.support.TestData");
         getLog().info("Reloaded TestData #0 ProtectionDomain: 
"+c0.getProtectionDomain());
         data0 = c0.newInstance();
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to