[jboss-cvs] JBossAS SVN: r102544 - in projects/aop/trunk/asintegration-mc: src/test/java/org/jboss/aop/integration/junit and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 18 01:01:35 EDT 2010
Author: flavia.rainone at jboss.com
Date: 2010-03-18 01:01:32 -0400 (Thu, 18 Mar 2010)
New Revision: 102544
Removed:
projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/aop/integration/junit/NotWovenAOPIntegrationTest.java
projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/
Modified:
projects/aop/trunk/asintegration-mc/pom.xml
projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/aop/integration/junit/AOPIntegrationTest.java
projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/weaving/test/WeavingTest.java
projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
Log:
[JBAOP-772] Removed unused code.
Modified: projects/aop/trunk/asintegration-mc/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/pom.xml 2010-03-18 04:59:37 UTC (rev 102543)
+++ projects/aop/trunk/asintegration-mc/pom.xml 2010-03-18 05:01:32 UTC (rev 102544)
@@ -87,38 +87,6 @@
<configuration>
<tasks>
<property name="test.jar.suffix" value="-test-classpool-"/>
- <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}a1.jar"
- basedir="${project.build.testOutputDirectory}"
- includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/a/*.class"/>
- <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}a2.jar"
- basedir="${project.build.testOutputDirectory}"
- includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/a/*.class"/>
- <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}b1.jar"
- basedir="${project.build.testOutputDirectory}"
- includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/b/*.class"/>
- <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}b2.jar"
- basedir="${project.build.testOutputDirectory}"
- includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/b/*.class"/>
- <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}c1.jar"
- basedir="${project.build.testOutputDirectory}"
- includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/c/*.class"/>
- <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}c2.jar"
- basedir="${project.build.testOutputDirectory}"
- includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/c/*.class"/>
- <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}replacereferences-parent.jar">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/**"/>
- <exclude name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/child/*.class"/>
- </fileset>
- </jar>
- <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}replacereferences-child.jar">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/**"/>
- <exclude name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/parent/ParentCaller.class"/>
- </fileset>
- </jar>
- <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/jbosscl/support/excluded"/>
-
<jar destfile="${project.build.directory}/${project.artifactId}-test-weaving-target.jar"
basedir="${project.build.testOutputDirectory}"
includes="org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded/target/*.class"/>
Modified: projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/aop/integration/junit/AOPIntegrationTest.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/aop/integration/junit/AOPIntegrationTest.java 2010-03-18 04:59:37 UTC (rev 102543)
+++ projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/aop/integration/junit/AOPIntegrationTest.java 2010-03-18 05:01:32 UTC (rev 102544)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.aop.integration.junit;
import java.net.URL;
@@ -26,7 +26,6 @@
import junit.framework.Test;
-import org.jboss.aop.AspectManager;
import org.jboss.classloader.plugins.filter.PatternClassFilter;
import org.jboss.classloader.spi.ClassLoaderDomain;
import org.jboss.classloader.spi.ClassLoaderPolicy;
@@ -111,20 +110,6 @@
}
/**
- * Deploy the aop config
- *
- * @param suffix the suffix
- * @param classLoader the classloader
- * @param manager the AspectManager/Domain to deploy into
- * @return the url
- * @throws Exception for any error
- */
- protected URL deploy(String suffix, ClassLoader classLoader, AspectManager manager) throws Exception
- {
- return getAOPDelegate().deploy(suffix, classLoader, manager);
- }
-
- /**
* Undeploy the aop config
*
* @param url the url
@@ -133,19 +118,8 @@
{
getAOPDelegate().undeploy(url);
}
-
+
/**
- * Undeploy the aop config
- *
- * @param url the url
- * @param manager the AspectManager/Domain to undeploy from
- */
- protected void undeploy(URL url, AspectManager manager)
- {
- getAOPDelegate().undeploy(url, manager);
- }
-
- /**
* Create a classloader
*
* It exports everything
Deleted: projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/aop/integration/junit/NotWovenAOPIntegrationTest.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/aop/integration/junit/NotWovenAOPIntegrationTest.java 2010-03-18 04:59:37 UTC (rev 102543)
+++ projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/aop/integration/junit/NotWovenAOPIntegrationTest.java 2010-03-18 05:01:32 UTC (rev 102544)
@@ -1,49 +0,0 @@
-/*
-* 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.aop.integration.junit;
-
-import org.jboss.test.AbstractTestDelegate;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class NotWovenAOPIntegrationTest extends AOPIntegrationTest
-{
- public NotWovenAOPIntegrationTest(String name)
- {
- // FIXME NotWovenAOPIntegrationTestCase constructor
- super(name);
- }
-
- /**
- * Get the test delegate
- *
- * @param clazz the test class
- * @return the delegate
- */
- public static AbstractTestDelegate getDelegate(Class<?> clazz)
- {
- return new AOPIntegrationTestDelegate(clazz, false, helper.getSystem());
- }
-}
Modified: projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/weaving/test/WeavingTest.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/weaving/test/WeavingTest.java 2010-03-18 04:59:37 UTC (rev 102543)
+++ projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/weaving/test/WeavingTest.java 2010-03-18 05:01:32 UTC (rev 102544)
@@ -21,8 +21,14 @@
*/
package org.jboss.test.aop.classpool.jbosscl.weaving.test;
+import java.io.Closeable;
+import java.io.IOException;
import java.lang.reflect.Method;
+import java.net.URISyntaxException;
import java.net.URL;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.Executors;
import javassist.ClassPool;
@@ -31,6 +37,10 @@
import org.jboss.test.aop.classpool.jbosscl.weaving.support.TestTranslator;
import org.jboss.test.classpool.jbosscl.test.JBossClClassPoolTest;
import org.jboss.test.classpool.support.BundleInfoBuilder;
+import org.jboss.vfs.TempFileProvider;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VFSUtils;
+import org.jboss.vfs.VirtualFile;
/**
*
@@ -55,6 +65,8 @@
public final static String AOP_XML = "org/jboss/test/aop/classpool/jbosscl/weaving/test/WeavingTestCase-aop.xml";
+ private final List<Closeable> mountHandles = new LinkedList<Closeable>();
+
public WeavingTest(String name)
{
super(name);
@@ -69,6 +81,23 @@
mountJars(JAR_TARGET, JAR_ASPECTS, JAR_INTERCEPTIONS);
}
+ private void mountJars(URL... jarUrls) throws IOException, URISyntaxException
+ {
+ TempFileProvider tempFileProvider = TempFileProvider.create("test", Executors.newScheduledThreadPool(2));
+ for(URL jarUrl : jarUrls)
+ {
+ VirtualFile jarFile = VFS.getChild(jarUrl);
+ mountHandles.add(VFS.mountZip(jarFile, jarFile, tempFileProvider));
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ VFSUtils.safeClose(mountHandles);
+ super.tearDown();
+ }
+
public void testImportAllWovenAspects() throws Exception
{
runTest(CLASS_FOUND_INVOKER, new ImportAllSetup(), new WovenInvokerSetup());
Modified: projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java 2010-03-18 04:59:37 UTC (rev 102543)
+++ projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java 2010-03-18 05:01:32 UTC (rev 102544)
@@ -21,24 +21,21 @@
*/
package org.jboss.test.classpool.jbosscl.test;
-import java.io.Closeable;
-import java.io.IOException;
+import static org.jboss.test.classpool.support.SupportClasses.CLASS_A;
+import static org.jboss.test.classpool.support.SupportClasses.CLASS_B;
+import static org.jboss.test.classpool.support.SupportClasses.CLASS_C;
+
import java.net.MalformedURLException;
-import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
-import java.util.concurrent.Executors;
import javassist.ClassPool;
-import javassist.CtClass;
import junit.framework.Test;
import org.jboss.aop.asintegration.jboss5.AOPVFSClassLoaderDomainRegistry;
@@ -63,14 +60,9 @@
import org.jboss.test.aop.scopeddomain.test.ScopedVFSClassLoaderDomainTestCase.ScopedVFSClassLoaderDomainSetup;
import org.jboss.test.classpool.support.BundleInfoBuilder;
import org.jboss.test.classpool.support.Result;
-import org.jboss.test.classpool.support.SupportClasses;
import org.jboss.test.classpool.support.TestVFSClassLoaderFactory;
import org.jboss.test.classpool.support.TestVFSClassLoaderFactoryFactory;
import org.jboss.test.kernel.junit.MicrocontainerTest;
-import org.jboss.vfs.TempFileProvider;
-import org.jboss.vfs.VFS;
-import org.jboss.vfs.VFSUtils;
-import org.jboss.vfs.VirtualFile;
/**
* Base class for testing the new JBoss classloaders
@@ -80,13 +72,6 @@
*/
public class JBossClClassPoolTest extends MicrocontainerTest
{
- public final static URL JAR_A_1 = getURLRelativeToProjectRoot(SupportClasses.JAR_A_1);
- public final static URL JAR_A_2 = getURLRelativeToProjectRoot(SupportClasses.JAR_A_2);
- public final static URL JAR_B_1 = getURLRelativeToProjectRoot(SupportClasses.JAR_B_1);
- public final static URL JAR_B_2 = getURLRelativeToProjectRoot(SupportClasses.JAR_B_2);
- public final static URL JAR_C_1 = getURLRelativeToProjectRoot(SupportClasses.JAR_C_1);
- public final static URL JAR_C_2 = getURLRelativeToProjectRoot(SupportClasses.JAR_C_2);
-
//Keep a strong reference to the URL classloaders so that they are not garbage collected
final static Set<URLClassLoader> registeredURLClassLoaders = new HashSet<URLClassLoader>();
@@ -94,7 +79,6 @@
private LoaderNameDeploymentRegistry loaderNameDeploymentRegistry = new LoaderNameDeploymentRegistry();
- private final List<Closeable> mountHandles = new LinkedList<Closeable>();
/** The classloader helper */
protected static final ClassLoaderSystem system = ClassLoaderSystem.getInstance();
@@ -191,24 +175,11 @@
//enableTrace("org.jboss.aop.classpool");
//enableTrace("org.jboss.classpool.jbosscl");
deploy("/org/jboss/test/classpool/jbosscl/Common.xml");
-
- mountJars(JAR_A_1, JAR_A_2, JAR_B_1, JAR_B_2, JAR_C_1, JAR_C_2);
}
-
- protected void mountJars(URL... jarUrls) throws IOException, URISyntaxException
- {
- TempFileProvider tempFileProvider = TempFileProvider.create("test", Executors.newScheduledThreadPool(2));
- for(URL jarUrl : jarUrls)
- {
- VirtualFile jarFile = VFS.getChild(jarUrl);
- mountHandles.add(VFS.mountZip(jarFile, jarFile, tempFileProvider));
- }
- }
@Override
protected void tearDown() throws Exception
{
- VFSUtils.safeClose(mountHandles);
undeploy("/org/jboss/test/classpool/jbosscl/Common.xml");
super.tearDown();
}
@@ -218,103 +189,31 @@
return name + "[]";
}
- protected ClassLoader createClassLoader(String name, boolean importAll, URL... urls) throws Exception
- {
- return createClassLoader(null, name, importAll, urls);
- }
-
- protected ClassLoader createClassLoader(Result result, String name, boolean importAll, URL... urls) throws Exception
- {
- TestVFSClassLoaderFactory factory = TestVFSClassLoaderFactoryFactory.createClassLoaderFactory(name, importAll, urls);
- return createClassLoader(result, factory);
- }
-
- protected ClassLoader createClassLoader(String name, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- return createClassLoader(null, name, builder, urls);
- }
-
- protected ClassLoader createClassLoader(Result result, String name, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- return createClassLoader(result, name, false, builder, urls);
- }
-
- protected ClassLoader createClassLoader(String name, boolean importAll, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- return createClassLoader(null, name, importAll, builder, urls);
- }
-
- protected ClassLoader createClassLoader(Result result, String name, boolean importAll, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- TestVFSClassLoaderFactory factory = TestVFSClassLoaderFactoryFactory.createClassLoaderFactory(name, importAll, builder, urls);
- return createClassLoader(result, factory);
- }
-
- protected ClassLoader createChildDomainParentFirstClassLoader(String name, String domainName, boolean importAll, URL... urls) throws Exception
- {
- return createChildDomainParentFirstClassLoader((Result)null, name, domainName, importAll, urls);
- }
-
protected ClassLoader createChildDomainParentFirstClassLoader(Result result, String name, String domainName, boolean importAll, URL... urls) throws Exception
{
return createChildDomainParentFirstClassLoader(result, name, domainName, importAll, null, urls);
}
- protected ClassLoader createChildDomainParentFirstClassLoader(String name, String domainName, boolean importAll, ClassLoader parent, URL... urls) throws Exception
- {
- return createChildDomainParentFirstClassLoader(null, name, domainName, importAll, parent, urls);
- }
-
protected ClassLoader createChildDomainParentFirstClassLoader(Result result, String name, String domainName, boolean importAll, ClassLoader parent, URL... urls) throws Exception
{
return createChildDomainClassLoader(result, name, domainName, null, true, importAll, parent, urls);
}
- protected ClassLoader createChildDomainParentFirstClassLoader(String name, String domainName, String parentDomainName, boolean importAll, URL... urls) throws Exception
- {
- return createChildDomainParentFirstClassLoader(null, name, domainName, parentDomainName, importAll, urls);
- }
-
- protected ClassLoader createChildDomainParentFirstClassLoader(Result result, String name, String domainName, String parentDomainName, boolean importAll, URL... urls) throws Exception
- {
- return createChildDomainClassLoader(result, name, domainName, parentDomainName, true, importAll, null, urls);
- }
-
- protected ClassLoader createChildDomainParentLastClassLoader(String name, String domainName, boolean importAll, URL... urls) throws Exception
- {
- return createChildDomainParentLastClassLoader((Result)null, name, domainName, importAll, urls);
- }
-
protected ClassLoader createChildDomainParentLastClassLoader(Result result, String name, String domainName, boolean importAll, URL... urls) throws Exception
{
return createChildDomainParentLastClassLoader(result, name, domainName, importAll, null, urls);
}
- protected ClassLoader createChildDomainParentLastClassLoader(String name, String domainName, boolean importAll, ClassLoader parent, URL... urls) throws Exception
- {
- return createChildDomainParentLastClassLoader(null, name, domainName, importAll, parent, urls);
- }
-
protected ClassLoader createChildDomainParentLastClassLoader(Result result, String name, String domainName, boolean importAll, ClassLoader parent, URL... urls) throws Exception
{
return createChildDomainClassLoader(result, name, domainName, null, false, importAll, parent, urls);
}
- protected ClassLoader createChildDomainParentLastClassLoader(String name, String domainName, String parentDomainName, boolean importAll, URL... urls) throws Exception
- {
- return createChildDomainParentLastClassLoader(null, name, domainName, parentDomainName, importAll, urls);
- }
-
protected ClassLoader createChildDomainParentLastClassLoader(Result result, String name, String domainName, String parentDomainName, boolean importAll, URL... urls) throws Exception
{
return createChildDomainClassLoader(result, name, domainName, parentDomainName, false, importAll, null, urls);
}
- protected ClassLoader createChildDomainClassLoader(String name, String domainName, String parentDomainName, boolean parentFirst, boolean importAll, ClassLoader parent, URL... urls) throws Exception
- {
- return createChildDomainClassLoader(null, name, domainName, parentDomainName, parentFirst, importAll, parent, urls);
- }
-
protected ClassLoader createChildDomainClassLoader(Result result, String name, String domainName, String parentDomainName, boolean parentFirst, boolean importAll, ClassLoader parent, URL... urls) throws Exception
{
TestVFSClassLoaderFactory factory = TestVFSClassLoaderFactoryFactory.createClassLoaderFactory(name, importAll, domainName, parentDomainName, parentFirst, urls);
@@ -325,51 +224,16 @@
return classLoader;
}
- protected ClassLoader createChildDomainParentFirstClassLoader(String name, String domainName, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- return createChildDomainParentFirstClassLoader((Result)null, name, domainName, builder, urls);
- }
-
- protected ClassLoader createChildDomainParentFirstClassLoader(Result result, String name, String domainName, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- return createChildDomainParentFirstClassLoader(result, name, domainName, null, builder, urls);
- }
-
- protected ClassLoader createChildDomainParentFirstClassLoader(String name, String domainName, String parentDomainName, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- return createChildDomainParentFirstClassLoader(null, name, domainName, parentDomainName, builder, urls);
- }
-
- protected ClassLoader createChildDomainParentFirstClassLoader(Result result, String name, String domainName, String parentDomainName, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- return createChildDomainClassLoader(result, name, domainName, parentDomainName, builder, true, urls);
- }
-
- protected ClassLoader createChildDomainParentLastClassLoader(String name, String domainName, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- return createChildDomainParentLastClassLoader((Result)null, name, domainName, builder, urls);
- }
-
protected ClassLoader createChildDomainParentLastClassLoader(Result result, String name, String domainName, BundleInfoBuilder builder, URL... urls) throws Exception
{
return createChildDomainParentLastClassLoader(result, name, domainName, null, builder, urls);
}
- protected ClassLoader createChildDomainParentLastClassLoader(String name, String domainName, String parentDomainName, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- return createChildDomainParentLastClassLoader(null, name, domainName, parentDomainName, builder, urls);
- }
-
protected ClassLoader createChildDomainParentLastClassLoader(Result result, String name, String domainName, String parentDomainName, BundleInfoBuilder builder, URL... urls) throws Exception
{
return createChildDomainClassLoader(result, name, domainName, parentDomainName, builder, false, urls);
}
- protected ClassLoader createChildDomainClassLoader(String name, String domainName, String parentDomainName, BundleInfoBuilder builder, boolean parentFirst, URL... urls) throws Exception
- {
- return createChildDomainClassLoader(null, name, domainName, parentDomainName, builder, parentFirst, urls);
- }
-
protected ClassLoader createChildDomainClassLoader(Result result, String name, String domainName, String parentDomainName, BundleInfoBuilder builder, boolean parentFirst, URL... urls) throws Exception
{
TestVFSClassLoaderFactory factory = TestVFSClassLoaderFactoryFactory.createClassLoaderFactory(name, domainName, parentDomainName, builder, parentFirst, urls);
@@ -386,13 +250,6 @@
scopedChildDomainsByLoader.put(classLoader, domain);
}
- protected ClassLoader createChildURLClassLoader(ClassLoader parent, URL url)
- {
- URLClassLoader cl = new URLClassLoader(new URL[] {url}, parent);
- registeredURLClassLoaders.add(cl);
- return cl;
- }
-
private ClassLoader createClassLoader(Result result, TestVFSClassLoaderFactory factory) throws Exception
{
return createClassLoader(result, factory, null);
@@ -442,15 +299,6 @@
}
}
- protected void unregisterDomain(ClassLoader loader)
- {
- if (loader != null)
- {
- ClassLoaderDomain domain = getChildDomainForLoader(loader);
- unregisterDomain(domain);
- }
- }
-
protected void unregisterDomain(ClassPool pool)
{
if (pool != null)
@@ -472,76 +320,6 @@
}
}
- protected void assertCannotLoadClass(String className, ClassLoader cl)
- {
- assertCannotLoadClass(cl, className);
- }
-
- protected void assertCannotLoadCtClass(ClassPool pool, String className)
- {
- try
- {
- pool.get(className);
- }
- catch(Exception e)
- {
- }
- }
-
- protected void assertCannotLoadCtClass(String className, ClassPool pool)
- {
- assertCannotLoadCtClass(pool, className);
- }
-
- protected void assertCannotLoadClass(ClassLoaderDomain domain, String className)
- {
- try
- {
- Class<?> clazz = domain.loadClass(className);
- if (clazz == null)
- {
- return;
- }
- fail("Should not have been able to load " + className);
- }
- catch(Exception expected)
- {
- }
- }
-
- protected ClassPool createClassPool(String name, boolean importAll, URL... urls) throws Exception
- {
- return createClassPool(null, name, importAll, urls);
- }
-
- protected ClassPool createClassPool(Result result, String name, boolean importAll, URL... urls) throws Exception
- {
- ClassLoader loader = createClassLoader(result, name, importAll, urls);
- return ClassPoolRepository.getInstance().registerClassLoader(loader);
- }
-
- protected ClassPool createClassPool(String name, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- return createClassPool(null, name, builder, urls);
- }
-
- protected ClassPool createClassPool(Result result, String name, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- return createClassPool(result, name, false, builder, urls);
- }
-
- protected ClassPool createClassPool(String name, boolean importAll, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- return createClassPool(null, name, importAll, builder, urls);
- }
-
- protected ClassPool createClassPool(Result result, String name, boolean importAll, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- TestVFSClassLoaderFactory factory = TestVFSClassLoaderFactoryFactory.createClassLoaderFactory(name, importAll, builder, urls);
- ClassLoader loader = createClassLoader(result, factory);
- return ClassPoolRepository.getInstance().registerClassLoader(loader);
- }
-
protected ClassPool createChildDomainParentFirstClassPool(String name, String domainName, boolean importAll, URL... urls) throws Exception
{
return createChildDomainParentFirstClassPool((Result)null, name, domainName, importAll, urls);
@@ -553,28 +331,6 @@
return ClassPoolRepository.getInstance().registerClassLoader(loader);
}
- protected ClassPool createChildDomainParentFirstClassPool(String name, String domainName, boolean importAll, ClassPool parent, URL... urls) throws Exception
- {
- return createChildDomainParentFirstClassPool(null, name, domainName, importAll, parent, urls);
- }
-
- protected ClassPool createChildDomainParentFirstClassPool(Result result, String name, String domainName, boolean importAll, ClassPool parent, URL... urls) throws Exception
- {
- ClassLoader loader = createChildDomainParentFirstClassLoader(result, name, domainName, importAll, parent.getClassLoader(), urls);
- return ClassPoolRepository.getInstance().registerClassLoader(loader);
- }
-
- protected ClassPool createChildDomainParentFirstClassPool(String name, String domainName, String parentDomainName, boolean importAll, URL... urls) throws Exception
- {
- return createChildDomainParentFirstClassPool(null, name, domainName, parentDomainName, importAll, urls);
- }
-
- protected ClassPool createChildDomainParentFirstClassPool(Result result, String name, String domainName, String parentDomainName, boolean importAll, URL... urls) throws Exception
- {
- ClassLoader loader = createChildDomainParentFirstClassLoader(result, name, domainName, parentDomainName, importAll, urls);
- return ClassPoolRepository.getInstance().registerClassLoader(loader);
- }
-
protected ClassPool createChildDomainParentLastClassPool(String name, String domainName, boolean importAll, URL... urls) throws Exception
{
return createChildDomainParentLastClassPool((Result)null, name, domainName, importAll, urls);
@@ -586,17 +342,6 @@
return ClassPoolRepository.getInstance().registerClassLoader(loader);
}
- protected ClassPool createChildDomainParentLastClassPool(String name, String domainName, boolean importAll, ClassPool parent, URL... urls) throws Exception
- {
- return createChildDomainParentLastClassPool(null, name, domainName, importAll, parent, urls);
- }
-
- protected ClassPool createChildDomainParentLastClassPool(Result result, String name, String domainName, boolean importAll, ClassPool parent, URL... urls) throws Exception
- {
- ClassLoader loader = createChildDomainParentLastClassLoader(result, name, domainName, importAll, parent.getClassLoader(), urls);
- return ClassPoolRepository.getInstance().registerClassLoader(loader);
- }
-
protected ClassPool createChildDomainParentLastClassPool(String name, String domainName, String parentDomainName, boolean importAll, URL... urls) throws Exception
{
return createChildDomainParentLastClassPool(null, name, domainName, parentDomainName, importAll, urls);
@@ -608,28 +353,6 @@
return ClassPoolRepository.getInstance().registerClassLoader(loader);
}
- protected ClassPool createChildDomainParentFirstClassPool(String name, String domainName, String parentDomainName, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- return createChildDomainParentFirstClassPool(null, name, domainName, parentDomainName, builder, urls);
- }
-
- protected ClassPool createChildDomainParentFirstClassPool(Result result, String name, String domainName, String parentDomainName, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- ClassLoader loader = createChildDomainParentFirstClassLoader(result, name, domainName, parentDomainName, builder, urls);
- return ClassPoolRepository.getInstance().registerClassLoader(loader);
- }
-
- protected ClassPool createChildDomainParentFirstClassPool(String name, String domainName, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- return createChildDomainParentFirstClassPool((Result)null, name, domainName, builder, urls);
- }
-
- protected ClassPool createChildDomainParentFirstClassPool(Result result, String name, String domainName, BundleInfoBuilder builder, URL... urls) throws Exception
- {
- ClassLoader loader = createChildDomainParentFirstClassLoader(result, name, domainName, builder, urls);
- return ClassPoolRepository.getInstance().registerClassLoader(loader);
- }
-
protected ClassPool createChildDomainParentLastClassPool(String name, String domainName, BundleInfoBuilder builder, URL... urls) throws Exception
{
return createChildDomainParentLastClassPool(null, name, domainName, builder, urls);
@@ -641,22 +364,6 @@
return ClassPoolRepository.getInstance().registerClassLoader(loader);
}
- protected ClassPool createChildURLClassPool(ClassPool parent, URL url)
- {
- ClassLoader parentLoader = null;
- if (parent != null)
- {
- parentLoader = parent.getClassLoader();
- }
- ClassLoader loader = createChildURLClassLoader(parentLoader, url);
- return ClassPoolRepository.getInstance().registerClassLoader(loader);
- }
-
- protected void registerModule(ClassLoader loader, Module module)
- {
- registerModule(loader, module, null);
- }
-
protected void registerModule(ClassLoader loader, Module module, ClassLoader parent)
{
if (getSystem() != domainRegistry.getSystem())
@@ -679,64 +386,6 @@
domainRegistry.initMapsForModule(module);
}
- protected void unregisterModule(ClassLoader loader)
- {
- domainRegistry.cleanupModule(domainRegistry.getModule(loader));
- }
-
- protected void assertModule(ClassLoader loader)
- {
- ClassLoaderDomain domainForLoader = scopedChildDomainsByLoader.get(loader);
- if (domainForLoader == null)
- {
- //domainForLoader = helper.getDomain();
- domainForLoader = getSystem().getDefaultDomain();
- }
- assertNotNull(domainForLoader);
-
- ClassLoaderDomain domainForModule = domainRegistry.getClassLoaderDomainForLoader(loader);
- assertNotNull(domainForModule);
- assertSame(domainForLoader, domainForModule);
-
- Module module = domainRegistry.getModule(loader);
- assertNotNull(module);
- assertEquals(domainForModule.getName(), module.getDomainName());
- assertEquals(domainForModule.getParentDomainName(), module.getParentDomainName());
- }
-
-
- protected void assertNoClassLoader(Result result) throws Exception
- {
- if (result == null)
- {
- throw new IllegalStateException("Null result");
- }
- assertNoClassLoader(getContextName(result.getFactory()));
- }
-
- protected void assertNoClassPool(Result result) throws Exception
- {
- if (result == null)
- {
- throw new IllegalStateException("Null result");
- }
- assertNoClassLoader(getContextName(result.getFactory()));
- }
-
- protected void assertNoClassLoader(String name) throws Exception
- {
- try
- {
- Object bean = getBean(name, null);
- if (bean != null)
- fail("Should not be here: " + bean);
- }
- catch (Throwable t)
- {
- checkThrowable(IllegalStateException.class, t);
- }
- }
-
protected void unregisterClassPool(ClassPool pool) throws Exception
{
if (pool != null)
@@ -763,12 +412,6 @@
}
}
- protected void unregisterClassLoader(String name) throws Exception
- {
- KernelDeployment deployment = loaderNameDeploymentRegistry.unregisterDeployment(name);
- unregisterDeployment(deployment);
- }
-
private void unregisterDeployment(KernelDeployment deployment)
{
if (deployment != null)
@@ -777,20 +420,6 @@
}
}
- /**
- * Unregister a domain
- *
- * @param name the domain name
- */
- protected void unregisterDomain(String name)
- {
- if (name != null)
- {
- ClassLoaderDomain registeredDomain = getSystem().getDomain(name);
- unregisterDomain(registeredDomain);
- }
- }
-
protected KernelDeployment install(TestVFSClassLoaderFactory metaData) throws Exception
{
AbstractKernelDeployment deployment = new AbstractKernelDeployment();
@@ -808,11 +437,6 @@
return contextName;
}
- protected ClassLoader assertClassLoader(TestVFSClassLoaderFactory factory) throws Exception
- {
- return assertClassLoader(factory, null);
- }
-
protected ClassLoader assertClassLoader(TestVFSClassLoaderFactory factory, ClassLoader parent) throws Exception
{
try
@@ -832,82 +456,6 @@
}
}
- protected ClassPool assertClassPool(TestVFSClassLoaderFactory factory) throws Exception
- {
- ClassLoader loader = assertClassLoader(factory);
- return ClassPoolRepository.getInstance().registerClassLoader(loader);
- }
-
- protected Class<?> assertLoadClass(String name, ClassLoader initiating) throws Exception
- {
- return assertLoadClass(name, initiating, initiating);
- }
-
- protected Class<?> assertLoadClass(String name, ClassLoader initiating, ClassLoader expected) throws Exception
- {
- Class<?> clazz = initiating.loadClass(name);
- if (expected != null)
- {
- assertSame(expected, clazz.getClassLoader());
- }
- return clazz;
- }
-
- protected CtClass assertLoadCtClass(String name, ClassPool initiating) throws Exception
- {
- return assertLoadCtClass(name, initiating, initiating);
- }
-
- protected CtClass assertLoadCtClass(String name, ClassPool initiating, ClassPool expected) throws Exception
- {
- CtClass clazz = initiating.get(name);
- if (expected != null)
- {
- assertSame(expected, clazz.getClassPool());
- }
-
- //Load twice to test both create and cache
- clazz = initiating.get(name);
- if (expected != null)
- {
- assertSame(expected, clazz.getClassPool());
- }
-
- assertLoadCtClassArray(name, clazz, initiating, expected);
-
- return clazz;
- }
-
- private void assertLoadCtClassArray(String name, CtClass clazz, ClassPool initiating, ClassPool expected) throws Exception
- {
- assertLoadCtClassArray(name, clazz, 1, initiating, expected);
- assertLoadCtClassArray(name, clazz, 2, initiating, expected);
- }
-
- private void assertLoadCtClassArray(String name, CtClass clazz, int dimensions, ClassPool initiating, ClassPool expected) throws Exception
- {
- String arrayName = name;
- for (int i = 0 ; i < dimensions ; i++)
- {
- arrayName = array(arrayName);
- }
- CtClass array = initiating.get(arrayName);
-
- if (expected != null)
- {
- assertSame(expected, array.getClassPool());
- }
-
- assertSame(clazz.getClassPool(), array.getClassPool());
-
- CtClass type = array;
- for (int i = 0 ; i < dimensions ; i++)
- {
- type = type.getComponentType();
- }
- assertSame(type, clazz);
- }
-
protected Module assertModule(String contextName)
{
return assertBean(contextName + "$MODULE", Module.class);
@@ -918,9 +466,9 @@
*/
public void testClassesNotOnClasspath()
{
- assertCannotLoadClass(this.getClass().getClassLoader(), SupportClasses.CLASS_A);
- assertCannotLoadClass(this.getClass().getClassLoader(), SupportClasses.CLASS_B);
- assertCannotLoadClass(this.getClass().getClassLoader(), SupportClasses.CLASS_C);
+ assertCannotLoadClass(this.getClass().getClassLoader(), CLASS_A);
+ assertCannotLoadClass(this.getClass().getClassLoader(), CLASS_B);
+ assertCannotLoadClass(this.getClass().getClassLoader(), CLASS_C);
}
static class NoSuchClassLoaderException extends Exception
@@ -985,35 +533,4 @@
{
return classLoaderDomainSetup;
}
-
- /*public class ScopedVFSClassLoaderDomainSetup
- {
- ScopedVFSClassLoaderDomain domain;
-
- String name;
- boolean parentDelegation;
- boolean parentFirst;
- DomainRegistry registry;
-
- public ScopedVFSClassLoaderDomainSetup(String name, boolean parentDelegation, boolean parentFirst, DomainRegistry registry)
- {
- this.name = name;
- this.parentDelegation = parentDelegation;
- this.parentFirst = parentFirst;
- this.registry = registry;
- }
-
- public ScopedVFSClassLoaderDomain getDomain()
- {
- return domain;
- }
-
- public void setClassLoaderAndDomain(ClassLoader loader, ClassLoaderDomain clDomain)
- {
- if (domain == null)
- {
- domain = new ScopedVFSClassLoaderDomain(loader, name, parentDelegation, parentFirst, clDomain, registry);
- }
- }
- }*/
}
More information about the jboss-cvs-commits
mailing list