[jboss-cvs] JBossAS SVN: r92350 - in projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src: test/java/org/jboss/test/aop/classpool/ucl/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 14 07:56:34 EDT 2009
Author: flavia.rainone at jboss.com
Date: 2009-08-14 07:56:33 -0400 (Fri, 14 Aug 2009)
New Revision: 92350
Modified:
projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java
projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java
projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclDelegatingClassPoolTestCase.java
Log:
[JBAOP-742] JBoss4Integration now uses the new AOPClassPoolFactory for creating classpools. Plus, the tests are using assertEquals instead of assertSame to compare classpools, given that an AOPClassPool can be considered equal to the delegate class pool.
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java 2009-08-14 11:52:21 UTC (rev 92349)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java 2009-08-14 11:56:33 UTC (rev 92350)
@@ -40,9 +40,10 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.asintegration.JBossIntegration;
+import org.jboss.aop.domain.ScopedRepositoryClassLoaderDomain;
import org.jboss.aop.newclasspool.AOPClassLoaderScopingPolicy;
import org.jboss.aop.newclasspool.AOPClassPoolFactory;
-import org.jboss.aop.domain.ScopedRepositoryClassLoaderDomain;
+import org.jboss.classpool.AbstractClassPoolFactory;
import org.jboss.classpool.jboss4.JBossClassPool;
import org.jboss.classpool.jboss4.JBossClassPoolFactory;
import org.jboss.classpool.jboss4.LoaderRepositoryUrlUtil;
@@ -130,14 +131,14 @@
public ScopedClassPoolFactory createScopedClassPoolFactory(File tmpDir) throws Exception
{
String classname = getClassPoolFactoryClassName();
+ AbstractClassPoolFactory abstractClassPoolFactory = null;
if (classname.equals(JBossClassPoolFactory.class.getName()))
{
- delegateClassPoolFactory = new JBossClassPoolFactory(tmpDir);
- AOPClassPoolFactory.setDelegateClassPoolFactory(delegateClassPoolFactory);
+ abstractClassPoolFactory = new JBossClassPoolFactory(tmpDir);
}
else if (classname.equals(JBossUclDelegatingClassPoolFactory.class.getName()))
{
- delegateClassPoolFactory = new JBossUclDelegatingClassPoolFactory(tmpDir);
+ abstractClassPoolFactory = new JBossUclDelegatingClassPoolFactory(tmpDir);
}
else
{
@@ -146,16 +147,18 @@
{
Class<?> clazz = Class.forName(classname);
Constructor<?> ctor = clazz.getConstructor(File.class);
- delegateClassPoolFactory = (ScopedClassPoolFactory)ctor.newInstance(tmpDir);
+ abstractClassPoolFactory = (AbstractClassPoolFactory)ctor.newInstance(tmpDir);
}
catch(Exception e)
{
logger.warn("Error instantiating " + classname + " defaulting to " + JBossClassPoolFactory.class.getName());
classPoolFactoryClassName = classname;
createScopedClassPoolFactory(tmpDir);
+ return this;
}
}
-
+ AOPClassPoolFactory.setDelegateClassPoolFactory(abstractClassPoolFactory);
+ delegateClassPoolFactory = new AOPClassPoolFactory();
return this;
}
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java 2009-08-14 11:52:21 UTC (rev 92349)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java 2009-08-14 11:56:33 UTC (rev 92350)
@@ -36,6 +36,7 @@
import javax.management.ObjectName;
import org.jboss.aop.AspectManager;
+import org.jboss.aop.newclasspool.AOPClassPoolFactory;
import org.jboss.classpool.ucl.JBossUclDelegatingClassPoolFactory;
import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
import org.jboss.mx.loading.LoaderRepository;
@@ -80,7 +81,7 @@
try
{
MAIN_LOADER_REPOSITORY_OBJECT_NAME = new ObjectName("JMImplementation:name=Default,service=LoaderRepository");
- AspectManager.setClassPoolFactory(new JBossUclDelegatingClassPoolFactory(new File(".")));
+ AOPClassPoolFactory.setDelegateClassPoolFactory(new JBossUclDelegatingClassPoolFactory(new File(".")));
}
catch (Exception e)
{
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclDelegatingClassPoolTestCase.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclDelegatingClassPoolTestCase.java 2009-08-14 11:52:21 UTC (rev 92349)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclDelegatingClassPoolTestCase.java 2009-08-14 11:56:33 UTC (rev 92350)
@@ -23,16 +23,17 @@
import java.util.ArrayList;
+import javassist.ClassPool;
+import javassist.CtClass;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.aop.newclasspool.AOPClassPool;
import org.jboss.aop.proxy.container.AOPProxyFactoryParameters;
import org.jboss.aop.proxy.container.AspectManaged;
import org.jboss.aop.proxy.container.ContainerProxyFactory;
import org.jboss.aop.proxy.container.GeneratedAOPProxyFactory;
-import javassist.ClassPool;
-import javassist.CtClass;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
@@ -134,9 +135,9 @@
assertSame(aFromA, aFromC);
assertSame(bFromB, bFromC);
- assertSame(poolA, aFromA.getClassPool());
- assertSame(poolB, bFromB.getClassPool());
- assertSame(poolC, cFromC.getClassPool());
+ assertEquals(poolA, aFromA.getClassPool());
+ assertEquals(poolB, bFromB.getClassPool());
+ assertEquals(poolC, cFromC.getClassPool());
assertCannotLoadCtClass(poolA, CLASS_C);
assertCannotLoadCtClass(poolB, CLASS_C);
@@ -161,9 +162,9 @@
private void accessSiblingDomains(ClassPool poolA, ClassPool poolB) throws Exception
{
CtClass clazzA = poolA.get(CLASS_A);
- assertSame(poolA, clazzA.getClassPool());
+ assertEquals(poolA, clazzA.getClassPool());
CtClass clazzB = poolB.get(CLASS_B);
- assertSame(poolB, clazzB.getClassPool());
+ assertEquals(poolB, clazzB.getClassPool());
assertCannotLoadCtClass(poolA, CLASS_B);
assertCannotLoadCtClass(poolB, CLASS_A);
}
@@ -183,7 +184,7 @@
CtClass aFromParent = globalPool.get(CLASS_A);
assertNotNull(aFromParent);
assertSame(aFromChild, aFromParent);
- assertSame(globalPool, aFromParent.getClassPool());
+ assertEquals(globalPool, aFromParent.getClassPool());
CtClass aFromChild2 = scopedPool.get(CLASS_A);
assertSame(aFromChild, aFromChild2);
@@ -208,7 +209,7 @@
CtClass aFromChild = scopedPool.get(CLASS_A);
assertNotNull(aFromChild);
assertSame(aFromParent, aFromChild);
- assertSame(globalPool, aFromParent.getClassPool());
+ assertEquals(globalPool, aFromParent.getClassPool());
}
finally
{
@@ -230,8 +231,8 @@
CtClass aFromChild = scopedPool.get(CLASS_A);
assertNotNull(aFromChild);
assertNotSame(aFromParent, aFromChild);
- assertSame(globalPool, aFromParent.getClassPool());
- assertSame(scopedPool, aFromChild.getClassPool());
+ assertEquals(globalPool, aFromParent.getClassPool());
+ assertEquals(scopedPool, aFromChild.getClassPool());
}
finally
{
@@ -252,7 +253,7 @@
//Try loading A from child first
CtClass aFromA = childA.get(CLASS_A);
- assertSame(globalPool, aFromA.getClassPool());
+ assertEquals(globalPool, aFromA.getClassPool());
//Try loading A from global
CtClass aFromGlobal = globalPool.get(CLASS_A);
@@ -260,12 +261,12 @@
//Try loading B from A
CtClass bFromA = childA.get(CLASS_B);
- assertSame(childA, bFromA.getClassPool());
+ assertEquals(childA, bFromA.getClassPool());
//Should get the cached copy from the parent
childB = createChildURLClassPool(globalPool, JAR_A_2);
CtClass aFromB = childB.get(CLASS_A);
- assertSame(globalPool, aFromB.getClassPool());
+ assertEquals(globalPool, aFromB.getClassPool());
}
finally
{
@@ -288,7 +289,7 @@
//Try loading A from child first
CtClass aFromA = childA.get(CLASS_A);
- assertSame(globalPool, aFromA.getClassPool());
+ assertEquals(globalPool, aFromA.getClassPool());
//Try loading A from global
CtClass aFromGlobal = globalPool.get(CLASS_A);
@@ -296,12 +297,12 @@
//Try loading B from A
CtClass bFromA = childA.get(CLASS_B);
- assertSame(childA, bFromA.getClassPool());
+ assertEquals(childA, bFromA.getClassPool());
//Should get the child copy
childB = createChildURLClassPoolParentLast(globalPool, JAR_A_2);
CtClass aFromB = childB.get(CLASS_A);
- assertSame(childB, aFromB.getClassPool());
+ assertEquals(childB, aFromB.getClassPool());
}
finally
{
@@ -325,7 +326,7 @@
//Try loading A from child first
CtClass bFromC = childC.get(CLASS_B);
- assertSame(globalPoolB, bFromC.getClassPool());
+ assertEquals(globalPoolB, bFromC.getClassPool());
//Try loading A from global
CtClass bFromGlobalA = globalPoolA.get(CLASS_B);
@@ -333,12 +334,12 @@
//Try loading B from A
CtClass cFromC = childC.get(CLASS_C);
- assertSame(childC, cFromC.getClassPool());
+ assertEquals(childC, cFromC.getClassPool());
//Should get the cached copy from the parent
childB = createChildURLClassPool(globalPoolA, JAR_B_2);
CtClass bFromB = childB.get(CLASS_B);
- assertSame(globalPoolB, bFromB.getClassPool());
+ assertEquals(globalPoolB, bFromB.getClassPool());
}
finally
{
@@ -362,7 +363,7 @@
poolB = createGlobalClassPool(JAR_B_1);
CtClass bFromA = poolA.get(CLASS_B);
- assertSame(poolB, bFromA.getClassPool());
+ assertEquals(poolB, bFromA.getClassPool());
}
finally
{
@@ -421,17 +422,17 @@
global = createGlobalClassPoolWithParent(JAR_A_1, parent);
CtClass aFromGlobal = global.get(CLASS_A);
- assertSame(global, aFromGlobal.getClassPool());
+ assertEquals(global, aFromGlobal.getClassPool());
CtClass aFromGlobal2 = global.get(CLASS_A);
assertSame(aFromGlobal, aFromGlobal2);
CtClass bFromGlobal = global.get(CLASS_B);
- assertSame(parent, bFromGlobal.getClassPool());
+ assertEquals(parent, bFromGlobal.getClassPool());
CtClass bFromGlobal2 = global.get(CLASS_B);
assertSame(bFromGlobal, bFromGlobal2);
CtClass bFromParent = parent.get(CLASS_B);
- assertSame(parent, bFromParent.getClassPool());
+ assertEquals(parent, bFromParent.getClassPool());
assertSame(bFromGlobal, bFromParent);
CtClass bFromParent2 = parent.get(CLASS_B);
assertSame(bFromParent, bFromParent2);
@@ -454,19 +455,19 @@
globalA = createGlobalClassPoolWithParent(JAR_A_1, parent);
CtClass aFromGlobal = globalA.get(CLASS_A);
- assertSame(globalA, aFromGlobal.getClassPool());
+ assertEquals(globalA, aFromGlobal.getClassPool());
CtClass aFromGlobal2 = globalA.get(CLASS_A);
assertSame(aFromGlobal, aFromGlobal2);
globalB = createGlobalClassPool(JAR_B_2);
CtClass bFromGlobalA = globalA.get(CLASS_B);
- assertSame(globalB, bFromGlobalA.getClassPool());
+ assertEquals(globalB, bFromGlobalA.getClassPool());
CtClass bFromGlobalA2 = globalA.get(CLASS_B);
assertSame(bFromGlobalA, bFromGlobalA2);
CtClass bFromParent = parent.get(CLASS_B);
- assertSame(parent, bFromParent.getClassPool());
+ assertEquals(parent, bFromParent.getClassPool());
assertNotSame(bFromGlobalA, bFromParent);
CtClass bFromParent2 = parent.get(CLASS_B);
assertSame(bFromParent, bFromParent2);
@@ -503,11 +504,11 @@
childClass.setSuperclass(parentClass);
CtClass parentFromParent = parent.get(PARENT);
- assertSame(parent, parentFromParent.getClassPool());
+ assertEquals(parent, parentFromParent.getClassPool());
assertSame(parentClass, parentFromParent);
CtClass childFromChild = child.get(CHILD);
- assertSame(child, childFromChild.getClassPool());
+ assertEquals(child, childFromChild.getClassPool());
assertSame(childClass, childFromChild);
assertCannotLoadCtClass(global, CHILD);
@@ -570,12 +571,12 @@
CtClass aFromA = globalA.get(A_CLASS);
assertSame(a, aFromA);
- assertSame(globalA, aFromA.getClassPool());
+ assertEquals(globalA, aFromA.getClassPool());
CtClass aFromB = globalB.get(A_CLASS);
assertSame(a, aFromB);
CtClass bFromA = globalA.get(B_CLASS);
assertSame(b, bFromA);
- assertSame(globalB, bFromA.getClassPool());
+ assertEquals(globalB, bFromA.getClassPool());
CtClass bFromB = globalB.get(B_CLASS);
assertSame(b, bFromB);
CtClass aFromChild = child.get(A_CLASS);
@@ -627,7 +628,7 @@
CtClass aFromC = globalC.get(CLASS_A);
assertSame(aFromA, aFromB);
assertSame(aFromA, aFromC);
- assertSame(globalA, aFromA.getClassPool());
+ assertEquals(globalA, aFromA.getClassPool());
}
finally
{
More information about the jboss-cvs-commits
mailing list