[jboss-cvs] JBossAS SVN: r100779 - in projects/jboss-classpool/trunk: jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/test and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: flavia.rainone at jboss.com
Date: 2010-02-09 17:18:49 -0500 (Tue, 09 Feb 2010)
New Revision: 100779

Modified:
   projects/jboss-classpool/trunk/jbosscl/src/main/java/org/jboss/classpool/plugins/jbosscl/JBossClClassPoolDomain.java
   projects/jboss-classpool/trunk/jbosscl/src/main/java/org/jboss/classpool/plugins/jbosscl/JBossClDelegatingClassPoolFactory.java
   projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java
   projects/jboss-classpool/trunk/ucl/src/main/java/org/jboss/classpool/plugins/ucl/ScopedJBossClassPool.java
   projects/jboss-classpool/trunk/ucl/src/main/java/org/jboss/classpool/plugins/ucl/UclDelegatingClassPoolFactory.java
Log:
[JBREFLECT-94] More references to ClassPool.getDefaultClassPool() that must be replaced by AbstractClassPoolFactory.getDefaultClassPool() 

Modified: projects/jboss-classpool/trunk/jbosscl/src/main/java/org/jboss/classpool/plugins/jbosscl/JBossClClassPoolDomain.java
===================================================================
--- projects/jboss-classpool/trunk/jbosscl/src/main/java/org/jboss/classpool/plugins/jbosscl/JBossClClassPoolDomain.java	2010-02-09 22:08:51 UTC (rev 100778)
+++ projects/jboss-classpool/trunk/jbosscl/src/main/java/org/jboss/classpool/plugins/jbosscl/JBossClClassPoolDomain.java	2010-02-09 22:18:49 UTC (rev 100779)
@@ -43,6 +43,7 @@
 import org.jboss.classpool.domain.ClassPoolDomain;
 import org.jboss.classpool.helpers.ClassLoaderUtils;
 import org.jboss.classpool.plugins.DelegatingClassPool;
+import org.jboss.classpool.spi.AbstractClassPoolFactory;
 import org.jboss.classpool.spi.ClassPoolRepository;
 
 /**
@@ -209,7 +210,7 @@
       {
          try
          {
-            return ClassPool.getDefault().get(classname);
+            return AbstractClassPoolFactory.getDefaultClassPool().get(classname);
          }
          catch(NotFoundException e)
          {

Modified: projects/jboss-classpool/trunk/jbosscl/src/main/java/org/jboss/classpool/plugins/jbosscl/JBossClDelegatingClassPoolFactory.java
===================================================================
--- projects/jboss-classpool/trunk/jbosscl/src/main/java/org/jboss/classpool/plugins/jbosscl/JBossClDelegatingClassPoolFactory.java	2010-02-09 22:08:51 UTC (rev 100778)
+++ projects/jboss-classpool/trunk/jbosscl/src/main/java/org/jboss/classpool/plugins/jbosscl/JBossClDelegatingClassPoolFactory.java	2010-02-09 22:18:49 UTC (rev 100779)
@@ -93,7 +93,7 @@
          }
          if (parent == null)
          {
-            parent = ClassPool.getDefault();
+            parent = AbstractClassPoolFactory.getDefaultClassPool();
          }
          return new NonDelegatingClassPool(cl, parent, repository, true);
       }

Modified: projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java
===================================================================
--- projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java	2010-02-09 22:08:51 UTC (rev 100778)
+++ projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java	2010-02-09 22:18:49 UTC (rev 100779)
@@ -36,6 +36,7 @@
 import org.jboss.classloading.spi.metadata.ClassLoadingMetaData10;
 import org.jboss.classloading.spi.vfs.metadata.VFSClassLoaderFactory10;
 import org.jboss.classpool.spi.AbstractClassPoolFactory;
+import org.jboss.classpool.spi.ClassPoolRepository;
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.deployers.plugins.main.MainDeployerImpl;
 import org.jboss.test.classpool.jbosscl.support.FilteredClassPool;
@@ -96,8 +97,7 @@
       };
       
       parentPolicy = new ParentPolicy(classFilter, ClassFilter.NOTHING, "BEFORE");
-      
-      defaultClassPool = new FilteredClassPool(ClassPool.getDefault(), classFilter);
+      defaultClassPool = new FilteredClassPool(AbstractClassPoolFactory.getDefaultClassPool(), classFilter);
    }
    
    public JBossClClassPoolTestDelegate(Class<?> clazz) throws Exception

Modified: projects/jboss-classpool/trunk/ucl/src/main/java/org/jboss/classpool/plugins/ucl/ScopedJBossClassPool.java
===================================================================
--- projects/jboss-classpool/trunk/ucl/src/main/java/org/jboss/classpool/plugins/ucl/ScopedJBossClassPool.java	2010-02-09 22:08:51 UTC (rev 100778)
+++ projects/jboss-classpool/trunk/ucl/src/main/java/org/jboss/classpool/plugins/ucl/ScopedJBossClassPool.java	2010-02-09 22:18:49 UTC (rev 100779)
@@ -32,6 +32,7 @@
 
 import org.jboss.classpool.plugins.ucl.LoaderRepositoryUrlUtil.UrlInfo;
 import org.jboss.classpool.spi.AbstractClassPool;
+import org.jboss.classpool.spi.AbstractClassPoolFactory;
 import org.jboss.classpool.spi.ClassPoolRepository;
 import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
 import org.jboss.mx.loading.LoaderRepository;
@@ -251,7 +252,7 @@
          }
       }
       return ClassPoolRepository.getInstance().getClassPoolFactory().
-      create(ClassPool.getDefault(), ClassPoolRepository.getInstance());
+      create(AbstractClassPoolFactory.getDefaultClassPool(), ClassPoolRepository.getInstance());
    }
    
    /**

Modified: projects/jboss-classpool/trunk/ucl/src/main/java/org/jboss/classpool/plugins/ucl/UclDelegatingClassPoolFactory.java
===================================================================
--- projects/jboss-classpool/trunk/ucl/src/main/java/org/jboss/classpool/plugins/ucl/UclDelegatingClassPoolFactory.java	2010-02-09 22:08:51 UTC (rev 100778)
+++ projects/jboss-classpool/trunk/ucl/src/main/java/org/jboss/classpool/plugins/ucl/UclDelegatingClassPoolFactory.java	2010-02-09 22:18:49 UTC (rev 100779)
@@ -34,6 +34,7 @@
 import org.jboss.classpool.plugins.NonDelegatingClassPool;
 import org.jboss.classpool.plugins.temp.TempClassPoolFactory;
 import org.jboss.classpool.spi.AbstractClassPool;
+import org.jboss.classpool.spi.AbstractClassPoolFactory;
 import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
 import org.jboss.mx.loading.LoaderRepository;
 import org.jboss.mx.loading.RepositoryClassLoader;
@@ -71,7 +72,7 @@
       
       if (parent == null)
       {
-         parent = ClassPool.getDefault();
+         parent = AbstractClassPoolFactory.getDefaultClassPool();
       }
       return new NonDelegatingClassPool(cl, parent, repository, true);
    }