[jboss-cvs] JBossAS SVN: r100561 - in projects/jboss-classpool/trunk/classpool/src: main/java/org/jboss/classpool/spi and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 5 12:58:17 EST 2010
Author: flavia.rainone at jboss.com
Date: 2010-02-05 12:58:17 -0500 (Fri, 05 Feb 2010)
New Revision: 100561
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/spi/AbstractClassPoolFactory.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
Log:
[JBREFLECT-94] Replaced all references to ClassPool.getDefaultClassPool() by AbstractClassPoolFactory.getDefaultClassPool()
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-05 17:53:14 UTC (rev 100560)
+++ projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/domain/ClassPoolToClassPoolDomainAdapter.java 2010-02-05 17:58:17 UTC (rev 100561)
@@ -23,6 +23,7 @@
import org.jboss.classpool.plugins.DelegatingClassPool;
+import org.jboss.classpool.spi.AbstractClassPoolFactory;
import javassist.ClassPool;
import javassist.CtClass;
@@ -63,7 +64,7 @@
// TODO JBREFLECT-65 FIXME this shouldn't be return the default classpool always
protected ClassPool initialiseParentClassLoader()
{
- return ClassPool.getDefault();
+ return AbstractClassPoolFactory.getDefaultClassPool();
}
public void addClassPool(DelegatingClassPool pool)
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-05 17:53:14 UTC (rev 100560)
+++ projects/jboss-classpool/trunk/classpool/src/main/java/org/jboss/classpool/spi/AbstractClassPoolFactory.java 2010-02-05 17:58:17 UTC (rev 100561)
@@ -34,7 +34,7 @@
*/
public class AbstractClassPoolFactory implements ScopedClassPoolFactory
{
- protected static ClassPool defaultClassPool = ClassPool.getDefault();
+ protected static ClassPool defaultClassPool = SystemClassPool.getInstance();
/**
* Determines the ClassPool that will be used to map null class loaders
@@ -46,6 +46,23 @@
defaultClassPool = defaultCP;
}
+ /**
+ * Returns the ClassPool that will be used to map null class loaders.
+ * If this ClassPool has not been {@link #setDefaultClassPool(ClassPool) defined},
+ * its value is {@link SystemClassPool#getInstance()}.
+ *
+ * @return the ClassPool that will be used to map null class loaders
+ */
+ public static ClassPool getDefaultClassPool()
+ {
+ return defaultClassPool;
+ }
+
+ /**
+ * Creates the pool corresponding to cl.
+ * @param the ClassLoader whose corresponding ClassPool will be created. Should not be null.
+ * @throws NullPointerException if {@code cl} is null
+ */
public AbstractClassPool create(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
{
return new AbstractClassPool(cl, src, repository);
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-05 17:53:14 UTC (rev 100560)
+++ projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/support/ClassPoolTestScenario.java 2010-02-05 17:58:17 UTC (rev 100561)
@@ -31,6 +31,8 @@
import javassist.ClassPool;
import javassist.CtClass;
import javassist.NotFoundException;
+
+import org.jboss.classpool.spi.AbstractClassPoolFactory;
import org.jboss.classpool.spi.ClassPoolRepository;
/**
@@ -121,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(ClassPool.getDefault(), classPool, classes);
+ assertSameClassPool(AbstractClassPoolFactory.getDefaultClassPool(), classPool, classes);
}
@@ -139,7 +141,7 @@
e.printStackTrace();
Assert.fail(e.getMessage());
}
- Assert.assertSame("Class " + clazz.getName() + " loaded by unexpected class pool ",
+ Assert.assertEquals("Class " + clazz.getName() + " loaded by unexpected class pool ",
expectedClassPool, ctClass.getClassPool());
}
}
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-05 17:53:14 UTC (rev 100560)
+++ projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/ClassPoolTest.java 2010-02-05 17:58:17 UTC (rev 100561)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.classpool.test;
import static org.jboss.test.classpool.support.SupportArchives.JAR_A_URL;
@@ -29,12 +29,11 @@
import java.util.ArrayList;
import java.util.List;
-import javassist.ClassPool;
-
import org.jboss.classpool.base.BaseClassPoolDomain;
import org.jboss.classpool.domain.AbstractClassPoolDomain;
import org.jboss.classpool.domain.ClassPoolDomain;
import org.jboss.classpool.plugins.DelegatingClassPool;
+import org.jboss.classpool.spi.AbstractClassPoolFactory;
import org.jboss.classpool.spi.ClassPoolRepository;
import org.jboss.test.AbstractTestCaseWithSetup;
import org.jboss.test.AbstractTestDelegate;
@@ -73,7 +72,7 @@
protected static DelegatingClassPool createDelegatingClassPool(ClassPoolDomain domain, URL...urls) throws ClassNotFoundException
{
ClassLoader loader = createLoader(domain, urls);
- return new DelegatingClassPool(domain, loader, ClassPool.getDefault(), ClassPoolRepository.getInstance());
+ return new DelegatingClassPool(domain, loader, AbstractClassPoolFactory.getDefaultClassPool(), 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-05 17:53:14 UTC (rev 100560)
+++ projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/IsLocalResourcePluginFactoryTestCase.java 2010-02-05 17:58:17 UTC (rev 100561)
@@ -27,7 +27,6 @@
import java.util.Collection;
import java.util.HashSet;
-import javassist.ClassPool;
import junit.framework.TestCase;
import org.jboss.classpool.base.BaseClassPoolDomain;
@@ -42,6 +41,7 @@
import org.jboss.classpool.base.URLClassLoaderIsLocalResourcePluginFactory;
import org.jboss.classpool.domain.ClassPoolDomain;
import org.jboss.classpool.plugins.DelegatingClassPool;
+import org.jboss.classpool.spi.AbstractClassPoolFactory;
import org.jboss.classpool.spi.ClassPoolRepository;
import org.jboss.util.loading.Translatable;
@@ -136,7 +136,7 @@
private void assertFactoryAndPlugin(ClassLoader classLoader, Class<?> factoryClass, Class<?> pluginClass)
{
createdClassLoaders.add(classLoader);
- DelegatingClassPool pool = new DelegatingClassPool(DOMAIN, classLoader, ClassPool.getDefault(), ClassPoolRepository.getInstance());
+ DelegatingClassPool pool = new DelegatingClassPool(DOMAIN, classLoader, AbstractClassPoolFactory.getDefaultClassPool(), 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-05 17:53:14 UTC (rev 100560)
+++ projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/ParentFirstDelegatingClassPoolTestCase.java 2010-02-05 17:58:17 UTC (rev 100561)
@@ -30,6 +30,7 @@
import javassist.NotFoundException;
import org.jboss.classpool.domain.ClassPoolDomain;
+import org.jboss.classpool.spi.AbstractClassPoolFactory;
import org.jboss.test.classpool.support.ClassFactory;
/**
@@ -79,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(ClassPool.getDefault(), string.getClassPool());
+ assertEquals(AbstractClassPoolFactory.getDefaultClassPool(), 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-05 17:53:14 UTC (rev 100560)
+++ projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/SimpleCtCacheTestCase.java 2010-02-05 17:58:17 UTC (rev 100561)
@@ -25,14 +25,14 @@
import javassist.ClassPool;
import javassist.CtClass;
+import junit.framework.TestCase;
import org.jboss.classpool.base.CtClassCache;
import org.jboss.classpool.base.CtClassCacheFactory;
+import org.jboss.classpool.spi.AbstractClassPoolFactory;
import org.jboss.util.LRUCachePolicy;
import org.jboss.util.TimedCachePolicy;
-import junit.framework.TestCase;
-
/**
* Don't add this test to DelegatingClassPoolTestSuite, it needs a fresh JVM to run properly
*
@@ -114,7 +114,7 @@
CtClassCache cache = factory.createCache();
assertNotNull(cache);
- ClassPool defPool = ClassPool.getDefault();
+ ClassPool defPool = AbstractClassPoolFactory.getDefaultClassPool();
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 = ClassPool.getDefault();
+ ClassPool defPool = AbstractClassPoolFactory.getDefaultClassPool();
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-05 17:53:14 UTC (rev 100560)
+++ projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/test/SimpleDelegatingClassPoolTestCase.java 2010-02-05 17:58:17 UTC (rev 100561)
@@ -32,6 +32,7 @@
import javassist.CtClass;
import org.jboss.classpool.domain.ClassPoolDomain;
+import org.jboss.classpool.spi.AbstractClassPoolFactory;
import org.jboss.classpool.spi.ClassPoolRepository;
import org.jboss.classpool.spi.ClassPoolRepositoryCallback;
import org.jboss.test.classpool.support.TestCallback;
@@ -70,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(ClassPool.getDefault(), string.getClassPool());
+ assertEquals(AbstractClassPoolFactory.getDefaultClassPool(), string.getClassPool());
}
public void testOnePoolPerClassLoadedByA() throws Exception
More information about the jboss-cvs-commits
mailing list