[jboss-cvs] JBossAS SVN: r64518 - in projects/aop/trunk: asintegration/src/resources/tests/org/jboss/test/aop/integration/complex/test and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 9 05:10:15 EDT 2007
Author: adrian at jboss.org
Date: 2007-08-09 05:10:14 -0400 (Thu, 09 Aug 2007)
New Revision: 64518
Added:
projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersions-1-aop.xml
projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersions-2-aop.xml
projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimplePrivate-a-aop.xml
projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentFirst-a-aop.xml
projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentLast-a-aop.xml
Removed:
projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersions-aop.xml
projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimplePrivate-aop.xml
projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentFirst-aop.xml
projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentLast-aop.xml
Modified:
projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java
projects/aop/trunk/asintegration/src/tests/org/jboss/aop/integration/junit/AOPIntegrationTest.java
projects/aop/trunk/asintegration/src/tests/org/jboss/aop/integration/junit/AOPIntegrationTestDelegate.java
projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersionsUnitTestCase.java
projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/simple/test/SimplePrivateUnitTestCase.java
projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentFirstUnitTestCase.java
projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentLastUnitTestCase.java
Log:
Revert the pushClassLoader change and change the tests to show the real problem
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java 2007-08-09 07:30:17 UTC (rev 64517)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java 2007-08-09 09:10:14 UTC (rev 64518)
@@ -678,16 +678,7 @@
public Object getPerVMAspect(AspectDefinition def)
{
- AspectFactoryWithClassLoaderSupport pushed = pushClassLoader(def);
- try
- {
- return getManager().getPerVMAspect(def);
- }
- finally
- {
- if (pushed != null)
- popClassLoader(pushed);
- }
+ return getManager().getPerVMAspect(def);
}
public void addPerInstanceAspect(AspectDefinition def)
@@ -758,18 +749,9 @@
public void addPerClassAspect(AspectDefinition def)
{
if (aspects.containsKey(def.getName())) return;
- AspectFactoryWithClassLoaderSupport pushed = pushClassLoader(def);
- try
- {
- Object aspect = def.getFactory().createPerClass(this);
- aspects.put(def.getName(), aspect);
- def.registerAdvisor(this);
- }
- finally
- {
- if (pushed != null)
- popClassLoader(pushed);
- }
+ Object aspect = def.getFactory().createPerClass(this);
+ aspects.put(def.getName(), aspect);
+ def.registerAdvisor(this);
}
public void removePerClassAspect(AspectDefinition def)
@@ -1337,23 +1319,4 @@
}
}
}
-
- private AspectFactoryWithClassLoaderSupport pushClassLoader(AspectDefinition def)
- {
- if (getManager().isPushClassLoader() == false)
- return null;
-
- AspectFactory factory = def.getFactory();
- if (factory instanceof AspectFactoryWithClassLoaderSupport)
- {
- AspectFactoryWithClassLoaderSupport result = (AspectFactoryWithClassLoaderSupport) factory;
- result.pushScopedClassLoader(getClazz().getClassLoader());
- }
- return null;
- }
-
- private void popClassLoader(AspectFactoryWithClassLoaderSupport factory)
- {
- factory.popScopedClassLoader();
- }
}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java 2007-08-09 07:30:17 UTC (rev 64517)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java 2007-08-09 09:10:14 UTC (rev 64518)
@@ -179,9 +179,6 @@
protected DynamicAOPStrategy dynamicStrategy = new LoadInterceptedClassesStrategy();
// indicates that the transformation process has begun
protected boolean transformationStarted = false;
-
- /** Whether to push the classloader of the advised class when generating aspects */
- protected boolean pushClassLoader = false;
@Deprecated // replaced by the temporary AOPClassLoaderScopingPolicy - no longer referenced
protected static AOPScopedClassLoaderHelper scopedCLHelper;
@@ -371,26 +368,6 @@
AspectManager.classLoaderScopingPolicy = classLoaderScopingPolicy;
}
- /**
- * Get the pushClassLoader.
- *
- * @return the pushClassLoader.
- */
- public boolean isPushClassLoader()
- {
- return pushClassLoader;
- }
-
- /**
- * Set the pushClassLoader.
- *
- * @param pushClassLoader the pushClassLoader.
- */
- public void setPushClassLoader(boolean pushClassLoader)
- {
- this.pushClassLoader = pushClassLoader;
- }
-
public InterceptionMarkers getInterceptionMarkers()
{
return interceptionMarkers;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java 2007-08-09 07:30:17 UTC (rev 64517)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java 2007-08-09 09:10:14 UTC (rev 64518)
@@ -1031,9 +1031,4 @@
{
return parent.isSet();
}
-
- public boolean isPushClassLoader()
- {
- return parent.isPushClassLoader();
- }
}
Copied: projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersions-1-aop.xml (from rev 64493, projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersions-aop.xml)
===================================================================
--- projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersions-1-aop.xml (rev 0)
+++ projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersions-1-aop.xml 2007-08-09 09:10:14 UTC (rev 64518)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<aop>
+
+ <interceptor class="org.jboss.test.aop.integration.complex.support.TestInterceptor"/>
+
+ <bind pointcut="execution(* org.jboss.test.aop.integration.complex.support.TestIntercepted->*(..))">
+ <interceptor-ref name="org.jboss.test.aop.integration.complex.support.TestInterceptor"/>
+ </bind>
+
+</aop>
\ No newline at end of file
Added: projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersions-2-aop.xml
===================================================================
--- projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersions-2-aop.xml (rev 0)
+++ projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersions-2-aop.xml 2007-08-09 09:10:14 UTC (rev 64518)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<aop>
+
+ <interceptor class="org.jboss.test.aop.integration.complex.support.TestInterceptor"/>
+
+ <bind pointcut="execution(* org.jboss.test.aop.integration.complex.support.TestIntercepted->*(..))">
+ <interceptor-ref name="org.jboss.test.aop.integration.complex.support.TestInterceptor"/>
+ </bind>
+
+</aop>
\ No newline at end of file
Deleted: projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersions-aop.xml
===================================================================
--- projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersions-aop.xml 2007-08-09 07:30:17 UTC (rev 64517)
+++ projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersions-aop.xml 2007-08-09 09:10:14 UTC (rev 64518)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<aop>
-
- <interceptor class="org.jboss.test.aop.integration.complex.support.TestInterceptor" scope="PER_CLASS"/>
-
- <bind pointcut="execution(* org.jboss.test.aop.integration.complex.support.TestIntercepted->*(..))">
- <interceptor-ref name="org.jboss.test.aop.integration.complex.support.TestInterceptor"/>
- </bind>
-
-</aop>
\ No newline at end of file
Copied: projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimplePrivate-a-aop.xml (from rev 64304, projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimplePrivate-aop.xml)
===================================================================
--- projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimplePrivate-a-aop.xml (rev 0)
+++ projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimplePrivate-a-aop.xml 2007-08-09 09:10:14 UTC (rev 64518)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<aop>
+
+ <interceptor class="org.jboss.test.aop.integration.simple.support.TestInterceptor"/>
+
+ <bind pointcut="execution(* org.jboss.test.aop.integration.simple.support.TestIntercepted->*(..))">
+ <interceptor-ref name="org.jboss.test.aop.integration.simple.support.TestInterceptor"/>
+ </bind>
+
+</aop>
\ No newline at end of file
Deleted: projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimplePrivate-aop.xml
===================================================================
--- projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimplePrivate-aop.xml 2007-08-09 07:30:17 UTC (rev 64517)
+++ projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimplePrivate-aop.xml 2007-08-09 09:10:14 UTC (rev 64518)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<aop>
-
- <interceptor class="org.jboss.test.aop.integration.simple.support.TestInterceptor"/>
-
- <bind pointcut="execution(* org.jboss.test.aop.integration.simple.support.TestIntercepted->*(..))">
- <interceptor-ref name="org.jboss.test.aop.integration.simple.support.TestInterceptor"/>
- </bind>
-
-</aop>
\ No newline at end of file
Copied: projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentFirst-a-aop.xml (from rev 64304, projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentFirst-aop.xml)
===================================================================
--- projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentFirst-a-aop.xml (rev 0)
+++ projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentFirst-a-aop.xml 2007-08-09 09:10:14 UTC (rev 64518)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<aop>
+
+ <interceptor class="org.jboss.test.aop.integration.simple.support.TestInterceptor"/>
+
+ <bind pointcut="execution(* org.jboss.test.aop.integration.simple.support.TestIntercepted->*(..))">
+ <interceptor-ref name="org.jboss.test.aop.integration.simple.support.TestInterceptor"/>
+ </bind>
+
+</aop>
\ No newline at end of file
Deleted: projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentFirst-aop.xml
===================================================================
--- projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentFirst-aop.xml 2007-08-09 07:30:17 UTC (rev 64517)
+++ projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentFirst-aop.xml 2007-08-09 09:10:14 UTC (rev 64518)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<aop>
-
- <interceptor class="org.jboss.test.aop.integration.simple.support.TestInterceptor"/>
-
- <bind pointcut="execution(* org.jboss.test.aop.integration.simple.support.TestIntercepted->*(..))">
- <interceptor-ref name="org.jboss.test.aop.integration.simple.support.TestInterceptor"/>
- </bind>
-
-</aop>
\ No newline at end of file
Copied: projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentLast-a-aop.xml (from rev 64304, projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentLast-aop.xml)
===================================================================
--- projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentLast-a-aop.xml (rev 0)
+++ projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentLast-a-aop.xml 2007-08-09 09:10:14 UTC (rev 64518)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<aop>
+
+ <interceptor class="org.jboss.test.aop.integration.simple.support.TestInterceptor"/>
+
+ <bind pointcut="execution(* org.jboss.test.aop.integration.simple.support.TestIntercepted->*(..))">
+ <interceptor-ref name="org.jboss.test.aop.integration.simple.support.TestInterceptor"/>
+ </bind>
+
+</aop>
\ No newline at end of file
Deleted: projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentLast-aop.xml
===================================================================
--- projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentLast-aop.xml 2007-08-09 07:30:17 UTC (rev 64517)
+++ projects/aop/trunk/asintegration/src/resources/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentLast-aop.xml 2007-08-09 09:10:14 UTC (rev 64518)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<aop>
-
- <interceptor class="org.jboss.test.aop.integration.simple.support.TestInterceptor"/>
-
- <bind pointcut="execution(* org.jboss.test.aop.integration.simple.support.TestIntercepted->*(..))">
- <interceptor-ref name="org.jboss.test.aop.integration.simple.support.TestInterceptor"/>
- </bind>
-
-</aop>
\ No newline at end of file
Modified: projects/aop/trunk/asintegration/src/tests/org/jboss/aop/integration/junit/AOPIntegrationTest.java
===================================================================
--- projects/aop/trunk/asintegration/src/tests/org/jboss/aop/integration/junit/AOPIntegrationTest.java 2007-08-09 07:30:17 UTC (rev 64517)
+++ projects/aop/trunk/asintegration/src/tests/org/jboss/aop/integration/junit/AOPIntegrationTest.java 2007-08-09 09:10:14 UTC (rev 64518)
@@ -21,6 +21,7 @@
*/
package org.jboss.aop.integration.junit;
+import java.net.URL;
import java.util.List;
import junit.framework.Test;
@@ -96,12 +97,35 @@
*
* @return the delegate
*/
- protected AOPIntegrationTestDelegate getMCDelegate()
+ protected AOPIntegrationTestDelegate getAOPDelegate()
{
return (AOPIntegrationTestDelegate) getDelegate();
}
/**
+ * Deploy the aop config
+ *
+ * @param suffix the suffix
+ * @param classLoader the classloader
+ * @return the url
+ * @throws Exception for any error
+ */
+ protected URL deploy(String suffix, ClassLoader classLoader) throws Exception
+ {
+ return getAOPDelegate().deploy(suffix, classLoader);
+ }
+
+ /**
+ * Undeploy the aop config
+ *
+ * @param url the url
+ */
+ protected void undeploy(URL url)
+ {
+ getAOPDelegate().undeploy(url);
+ }
+
+ /**
* Create a classloader
*
* It exports everything
Modified: projects/aop/trunk/asintegration/src/tests/org/jboss/aop/integration/junit/AOPIntegrationTestDelegate.java
===================================================================
--- projects/aop/trunk/asintegration/src/tests/org/jboss/aop/integration/junit/AOPIntegrationTestDelegate.java 2007-08-09 07:30:17 UTC (rev 64517)
+++ projects/aop/trunk/asintegration/src/tests/org/jboss/aop/integration/junit/AOPIntegrationTestDelegate.java 2007-08-09 09:10:14 UTC (rev 64518)
@@ -61,12 +61,11 @@
super.setUp();
AspectManager manager = AspectManager.instance();
- manager.setPushClassLoader(true);
system.setTranslator(manager);
try
{
- deploy();
+ deploy(clazz.getClassLoader());
}
catch (RuntimeException e)
{
@@ -97,9 +96,10 @@
/**
* Deploy the aop config
*
+ * @param classLoader
* @throws Exception for any error
*/
- protected void deploy() throws Exception
+ protected void deploy(ClassLoader classLoader) throws Exception
{
String testName = clazz.getName();
int index = testName.indexOf("UnitTestCase");
@@ -108,11 +108,34 @@
testName = testName.replace('.', '/') + "-aop.xml";
URL url = clazz.getClassLoader().getResource(testName);
if (url != null)
- deploy(url);
+ deploy(url, classLoader);
else
log.debug("No test specific deployment " + testName);
}
+ /**
+ * Deploy the aop config
+ *
+ * @param suffix the suffix
+ * @param classLoader the classloader
+ * @return the url
+ * @throws Exception for any error
+ */
+ protected URL deploy(String suffix, ClassLoader classLoader) throws Exception
+ {
+ String testName = clazz.getName();
+ int index = testName.indexOf("UnitTestCase");
+ if (index != -1)
+ testName = testName.substring(0, index);
+ testName = testName.replace('.', '/') + "-" + suffix + "-aop.xml";
+ URL url = clazz.getClassLoader().getResource(testName);
+ if (url != null)
+ deploy(url, classLoader);
+ else
+ throw new RuntimeException(testName + " not found");
+ return url;
+ }
+
protected void undeploy()
{
for (Iterator i = urls.iterator(); i.hasNext();)
@@ -126,13 +149,14 @@
* Deploy the aop config
*
* @param url the url
+ * @param classLoader
* @throws Exception for any error
*/
- protected void deploy(URL url) throws Exception
+ protected void deploy(URL url, ClassLoader classLoader) throws Exception
{
log.debug("Deploying " + url);
urls.add(url);
- AspectXmlLoader.deployXML(url);
+ AspectXmlLoader.deployXML(url, classLoader);
}
/**
Modified: projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersionsUnitTestCase.java
===================================================================
--- projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersionsUnitTestCase.java 2007-08-09 07:30:17 UTC (rev 64517)
+++ projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersionsUnitTestCase.java 2007-08-09 09:10:14 UTC (rev 64518)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.aop.integration.complex.test;
+import java.net.URL;
+
import junit.framework.Test;
import org.jboss.aop.integration.junit.AOPIntegrationTest;
@@ -69,32 +71,48 @@
ClassLoader a1 = createClassLoader(a1Policy);
try
{
- MockClassLoaderPolicy support2Policy = MockClassLoaderHelper.createMockClassLoaderPolicy("Support2");
- support2Policy.setPathsAndPackageNames(PACKAGE_SUPPORT);
- ClassLoader support2 = createClassLoader(support2Policy);
+ URL url1 = deploy("1", a1);
try
{
- MockClassLoaderPolicy a2Policy = MockClassLoaderHelper.createMockClassLoaderPolicy("A2");
- a2Policy.setPathsAndPackageNames(PACKAGE_A);
- a2Policy.setDelegates(createDelegates(support2Policy));
- ClassLoader a2 = createClassLoader(a2Policy);
+ MockClassLoaderPolicy support2Policy = MockClassLoaderHelper.createMockClassLoaderPolicy("Support2");
+ support2Policy.setPathsAndPackageNames(PACKAGE_SUPPORT);
+ ClassLoader support2 = createClassLoader(support2Policy);
try
{
- Class<?> classA1 = a1.loadClass(CLASS_A);
- classA1.newInstance();
+ MockClassLoaderPolicy a2Policy = MockClassLoaderHelper.createMockClassLoaderPolicy("A2");
+ a2Policy.setPathsAndPackageNames(PACKAGE_A);
+ a2Policy.setDelegates(createDelegates(support2Policy));
+ ClassLoader a2 = createClassLoader(a2Policy);
+ try
+ {
+ URL url2 = deploy("2", a2);
+ try
+ {
+ Class<?> classA1 = a1.loadClass(CLASS_A);
+ classA1.newInstance();
- Class<?> classA2 = a2.loadClass(CLASS_A);
- assertNotSame(classA2, classA1);
- classA2.newInstance();
+ Class<?> classA2 = a2.loadClass(CLASS_A);
+ assertNotSame(classA2, classA1);
+ classA2.newInstance();
+ }
+ finally
+ {
+ undeploy(url2);
+ }
+ }
+ finally
+ {
+ unregisterClassLoader(a2);
+ }
}
finally
{
- unregisterClassLoader(a2);
+ unregisterClassLoader(support2);
}
}
finally
{
- unregisterClassLoader(support2);
+ undeploy(url1);
}
}
finally
Modified: projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/simple/test/SimplePrivateUnitTestCase.java
===================================================================
--- projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/simple/test/SimplePrivateUnitTestCase.java 2007-08-09 07:30:17 UTC (rev 64517)
+++ projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/simple/test/SimplePrivateUnitTestCase.java 2007-08-09 09:10:14 UTC (rev 64518)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.aop.integration.simple.test;
+import java.net.URL;
+
import junit.framework.Test;
import org.jboss.aop.integration.junit.AOPIntegrationTest;
@@ -64,8 +66,16 @@
ClassLoader classLoader = createClassLoader(policy);
try
{
- Class<?> classA = classLoader.loadClass(CLASS_A);
- classA.newInstance();
+ URL url = deploy("a", classLoader);
+ try
+ {
+ Class<?> classA = classLoader.loadClass(CLASS_A);
+ classA.newInstance();
+ }
+ finally
+ {
+ undeploy(url);
+ }
}
finally
{
Modified: projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentFirstUnitTestCase.java
===================================================================
--- projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentFirstUnitTestCase.java 2007-08-09 07:30:17 UTC (rev 64517)
+++ projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentFirstUnitTestCase.java 2007-08-09 09:10:14 UTC (rev 64518)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.aop.integration.simple.test;
+import java.net.URL;
+
import junit.framework.Test;
import org.jboss.aop.integration.junit.AOPIntegrationTest;
@@ -64,9 +66,16 @@
MockClassLoaderPolicy policy = MockClassLoaderHelper.createMockClassLoaderPolicy("A");
policy.setPathsAndPackageNames(PACKAGE_A, PACKAGE_SUPPORT);
ClassLoader classLoader = createClassLoader(domain, policy);
-
- Class<?> classA = classLoader.loadClass(CLASS_A);
- classA.newInstance();
+ URL url = deploy("a", classLoader);
+ try
+ {
+ Class<?> classA = classLoader.loadClass(CLASS_A);
+ classA.newInstance();
+ }
+ finally
+ {
+ undeploy(url);
+ }
}
finally
{
Modified: projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentLastUnitTestCase.java
===================================================================
--- projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentLastUnitTestCase.java 2007-08-09 07:30:17 UTC (rev 64517)
+++ projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/simple/test/SimpleScopedParentLastUnitTestCase.java 2007-08-09 09:10:14 UTC (rev 64518)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.aop.integration.simple.test;
+import java.net.URL;
+
import junit.framework.Test;
import org.jboss.aop.integration.junit.AOPIntegrationTest;
@@ -64,9 +66,16 @@
MockClassLoaderPolicy policy = MockClassLoaderHelper.createMockClassLoaderPolicy("A");
policy.setPathsAndPackageNames(PACKAGE_A, PACKAGE_SUPPORT);
ClassLoader classLoader = createClassLoader(domain, policy);
-
- Class<?> classA = classLoader.loadClass(CLASS_A);
- classA.newInstance();
+ URL url = deploy("a", classLoader);
+ try
+ {
+ Class<?> classA = classLoader.loadClass(CLASS_A);
+ classA.newInstance();
+ }
+ finally
+ {
+ undeploy(url);
+ }
}
finally
{
More information about the jboss-cvs-commits
mailing list