[jboss-cvs] JBossAS SVN: r101397 - in projects/jboss-classpool/trunk: classpool/src/main/java/org/jboss/classpool/plugins and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 24 09:29:08 EST 2010
Author: flavia.rainone at jboss.com
Date: 2010-02-24 09:29:05 -0500 (Wed, 24 Feb 2010)
New Revision: 101397
Modified:
projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/domain/ClassPoolToClassPoolDomainAdapter.java
projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/plugins/AbstractJBossClassPoolFactory.java
projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/spi/AbstractClassPoolFactory.java
projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/spi/ClassPoolRepository.java
projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/spi/SystemClassPool.java
projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/support/ClassPoolTestScenario.java
projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/ClassPoolTest.java
projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/IsLocalResourcePluginFactoryTestCase.java
projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/ParentFirstDelegatingClassPoolTestCase.java
projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/SimpleCtCacheTestCase.java
projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/SimpleDelegatingClassPoolTestCase.java
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] Renamed AbstractClassPoolFactory.defaultClassPool to systemClassPool, to avoid confusion with the meaning of default classpool in Javassist
Modified: projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/domain/ClassPoolToClassPoolDomainAdapter.java
===================================================================
--- projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/domain/ClassPoolToClassPoolDomainAdapter.java 2010-02-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/domain/ClassPoolToClassPoolDomainAdapter.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -64,7 +64,7 @@
// TODO JBREFLECT-65 FIXME this shouldn't be return the default classpool always
protected ClassPool initialiseParentClassLoader()
{
- return AbstractClassPoolFactory.getDefaultClassPool();
+ return AbstractClassPoolFactory.getSystemClassPool();
}
public void addClassPool(DelegatingClassPool pool)
Modified: projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/plugins/AbstractJBossClassPoolFactory.java
===================================================================
--- projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/plugins/AbstractJBossClassPoolFactory.java 2010-02-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/plugins/AbstractJBossClassPoolFactory.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -58,7 +58,7 @@
}
else
{
- return defaultClassPool;
+ return systemClassPool;
}
}
Modified: projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/spi/AbstractClassPoolFactory.java
===================================================================
--- projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/spi/AbstractClassPoolFactory.java 2010-02-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/spi/AbstractClassPoolFactory.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -34,28 +34,28 @@
*/
public class AbstractClassPoolFactory implements ScopedClassPoolFactory
{
- protected static ClassPool defaultClassPool = SystemClassPool.getInstance();
+ protected static ClassPool systemClassPool = SystemClassPool.getInstance();
/**
* Determines the ClassPool that will be used to map null class loaders
*
- * @param defaultCP maps null class loaders
+ * @param systemCP maps null class loaders
*/
- public static void setDefaultClassPool(ClassPool defaultCP)
+ public static void setSystemClassPool(ClassPool systemCP)
{
- defaultClassPool = defaultCP;
+ systemClassPool = systemCP;
}
/**
* Returns the ClassPool that will be used to map null class loaders.
- * If this ClassPool has not been {@link #setDefaultClassPool(ClassPool) defined},
+ * If this ClassPool has not been {@link #setSystemClassPool(ClassPool) defined},
* its value is {@link SystemClassPool#getInstance()}.
*
* @return the ClassPool that will be used to map null class loaders
*/
- public static ClassPool getDefaultClassPool()
+ public static ClassPool getSystemClassPool()
{
- return defaultClassPool;
+ return systemClassPool;
}
/**
Modified: projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/spi/ClassPoolRepository.java
===================================================================
--- projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/spi/ClassPoolRepository.java 2010-02-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/spi/ClassPoolRepository.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -69,7 +69,7 @@
protected ClassPoolRepository()
{
this.delegate = ScopedClassPoolRepositoryImpl.getInstance();
- ClassPool classPool = AbstractClassPoolFactory.getDefaultClassPool();
+ ClassPool classPool = AbstractClassPoolFactory.getSystemClassPool();
// FIXME we need a way to define the classpool field of ScopedClassPoolRepository
Field cpField = null;
try
Modified: projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/spi/SystemClassPool.java
===================================================================
--- projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/spi/SystemClassPool.java 2010-02-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/spi/SystemClassPool.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -27,7 +27,7 @@
* This is the default SystemClassPool. It will be used by
* {@code AbstractClassPoolFactory} to represent null parent class loaders,
* unless the factory has been configured to {@link
- * AbstractClassPoolFactory#setDefaultClassPool(ClassPool)
+ * AbstractClassPoolFactory#setSystemClassPool(ClassPool)
* use a different class pool} for that purpose.
*
* @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
Modified: projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/support/ClassPoolTestScenario.java
===================================================================
--- projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/support/ClassPoolTestScenario.java 2010-02-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/support/ClassPoolTestScenario.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -123,7 +123,7 @@
{
assertSameClassPool(null, classPool, int.class, boolean.class, byte.class, short.class,
long.class, float.class, double.class, char.class, void.class);
- assertSameClassPool(AbstractClassPoolFactory.getDefaultClassPool(), classPool, classes);
+ assertSameClassPool(AbstractClassPoolFactory.getSystemClassPool(), classPool, classes);
}
Modified: projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/ClassPoolTest.java
===================================================================
--- projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/ClassPoolTest.java 2010-02-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/ClassPoolTest.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -72,7 +72,7 @@
protected static DelegatingClassPool createDelegatingClassPool(ClassPoolDomain domain, URL...urls) throws ClassNotFoundException
{
ClassLoader loader = createLoader(domain, urls);
- return new DelegatingClassPool(domain, loader, AbstractClassPoolFactory.getDefaultClassPool(), ClassPoolRepository.getInstance());
+ return new DelegatingClassPool(domain, loader, AbstractClassPoolFactory.getSystemClassPool(), ClassPoolRepository.getInstance());
}
protected static ClassLoader createLoader(ClassPoolDomain domain, URL...urls) throws ClassNotFoundException
Modified: projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/IsLocalResourcePluginFactoryTestCase.java
===================================================================
--- projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/IsLocalResourcePluginFactoryTestCase.java 2010-02-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/IsLocalResourcePluginFactoryTestCase.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -136,7 +136,7 @@
private void assertFactoryAndPlugin(ClassLoader classLoader, Class<?> factoryClass, Class<?> pluginClass)
{
createdClassLoaders.add(classLoader);
- DelegatingClassPool pool = new DelegatingClassPool(DOMAIN, classLoader, AbstractClassPoolFactory.getDefaultClassPool(), ClassPoolRepository.getInstance());
+ DelegatingClassPool pool = new DelegatingClassPool(DOMAIN, classLoader, AbstractClassPoolFactory.getSystemClassPool(), ClassPoolRepository.getInstance());
IsLocalResourcePluginFactory factory = IsLocalResourcePluginFactoryRegistry.getPluginFactory(pool.getClassLoader());
assertNotNull(factory);
assertEquals(factoryClass, factory.getClass());
Modified: projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/ParentFirstDelegatingClassPoolTestCase.java
===================================================================
--- projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/ParentFirstDelegatingClassPoolTestCase.java 2010-02-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/ParentFirstDelegatingClassPoolTestCase.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -80,7 +80,7 @@
CtClass string = childPool.get(String.class.getName());
assertNotSame("java.lang.String should be loaded by the parent pool", childPool, string.getClassPool());
- assertEquals(AbstractClassPoolFactory.getDefaultClassPool(), string.getClassPool());
+ assertEquals(AbstractClassPoolFactory.getSystemClassPool(), string.getClassPool());
}
public void testClassInGrandParentOnly() throws Exception
Modified: projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/SimpleCtCacheTestCase.java
===================================================================
--- projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/SimpleCtCacheTestCase.java 2010-02-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/SimpleCtCacheTestCase.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -114,7 +114,7 @@
CtClassCache cache = factory.createCache();
assertNotNull(cache);
- ClassPool defPool = AbstractClassPoolFactory.getDefaultClassPool();
+ ClassPool defPool = AbstractClassPoolFactory.getSystemClassPool();
CtClass clazz = defPool.get(String.class.getName());
assertNull(cache.get(clazz.getName(), 0));
@@ -140,7 +140,7 @@
CtClassCache cache = factory.createCache();
assertNotNull(cache);
- ClassPool defPool = AbstractClassPoolFactory.getDefaultClassPool();
+ ClassPool defPool = AbstractClassPoolFactory.getSystemClassPool();
CtClass clazz = defPool.get(String.class.getName());
assertNull(cache.get(clazz.getName(), 0));
Modified: projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/SimpleDelegatingClassPoolTestCase.java
===================================================================
--- projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/SimpleDelegatingClassPoolTestCase.java 2010-02-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/SimpleDelegatingClassPoolTestCase.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -71,7 +71,7 @@
CtClass string = pool.get(String.class.getName());
assertNotSame("java.lang.String should be loaded by the parent pool", pool, string.getClassPool());
- assertEquals(AbstractClassPoolFactory.getDefaultClassPool(), string.getClassPool());
+ assertEquals(AbstractClassPoolFactory.getSystemClassPool(), string.getClassPool());
}
public void testOnePoolPerClassLoadedByA() throws Exception
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-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/jbosscl/src/main/java/org/jboss/classpool/plugins/jbosscl/JBossClClassPoolDomain.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -210,7 +210,7 @@
{
try
{
- return AbstractClassPoolFactory.getDefaultClassPool().get(classname);
+ return AbstractClassPoolFactory.getSystemClassPool().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-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/jbosscl/src/main/java/org/jboss/classpool/plugins/jbosscl/JBossClDelegatingClassPoolFactory.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -93,7 +93,7 @@
}
if (parent == null)
{
- parent = AbstractClassPoolFactory.getDefaultClassPool();
+ parent = AbstractClassPoolFactory.getSystemClassPool();
}
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-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -97,7 +97,7 @@
};
parentPolicy = new ParentPolicy(classFilter, ClassFilter.NOTHING, "BEFORE");
- defaultClassPool = new FilteredClassPool(AbstractClassPoolFactory.getDefaultClassPool(), classFilter);
+ defaultClassPool = new FilteredClassPool(AbstractClassPoolFactory.getSystemClassPool(), classFilter);
}
public JBossClClassPoolTestDelegate(Class<?> clazz) throws Exception
@@ -125,7 +125,7 @@
ClassLoaderSystem system = getBean("ClassLoaderSystem", ControllerState.INSTALLED, ClassLoaderSystem.class);
ClassLoaderDomain domain = system.getDefaultDomain();
domain.setParentPolicy(parentPolicy);
- AbstractClassPoolFactory.setDefaultClassPool(defaultClassPool);
+ AbstractClassPoolFactory.setSystemClassPool(defaultClassPool);
super.deploy();
}
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-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/ucl/src/main/java/org/jboss/classpool/plugins/ucl/ScopedJBossClassPool.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -252,7 +252,7 @@
}
}
return ClassPoolRepository.getInstance().getClassPoolFactory().
- create(AbstractClassPoolFactory.getDefaultClassPool(), ClassPoolRepository.getInstance());
+ create(AbstractClassPoolFactory.getSystemClassPool(), 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-24 14:05:02 UTC (rev 101396)
+++ projects/jboss-classpool/trunk/ucl/src/main/java/org/jboss/classpool/plugins/ucl/UclDelegatingClassPoolFactory.java 2010-02-24 14:29:05 UTC (rev 101397)
@@ -72,7 +72,7 @@
if (parent == null)
{
- parent = AbstractClassPoolFactory.getDefaultClassPool();
+ parent = AbstractClassPoolFactory.getSystemClassPool();
}
return new NonDelegatingClassPool(cl, parent, repository, true);
}
More information about the jboss-cvs-commits
mailing list