[jboss-cvs] JBossAS SVN: r97501 - in projects/jboss-classpool/trunk: src/test/java/org/jboss/test/classpool/jbosscl/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 7 07:58:17 EST 2009
Author: flavia.rainone at jboss.com
Date: 2009-12-07 07:58:17 -0500 (Mon, 07 Dec 2009)
New Revision: 97501
Added:
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java
Modified:
projects/jboss-classpool/trunk/pom.xml
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
Log:
[JBREFLECT-74] Removed dependencies to AOP (they are no longer necessary with the classpoolfactory being setup in a .xml file).
Extracted a delegate from JBossClClassPoolTest.
Commented out the parts related to JBREFLECT-80 that were causing failures (with TODO JBREFLECT-80).
Modified: projects/jboss-classpool/trunk/pom.xml
===================================================================
--- projects/jboss-classpool/trunk/pom.xml 2009-12-07 12:44:57 UTC (rev 97500)
+++ projects/jboss-classpool/trunk/pom.xml 2009-12-07 12:58:17 UTC (rev 97501)
@@ -56,7 +56,6 @@
</executions>
<configuration>
<excludes>
- <exclude>org/jboss/aop/junit/**</exclude>
<exclude>org/jboss/test/classpool/support/excluded/**</exclude>
</excludes>
</configuration>
@@ -74,10 +73,6 @@
<include>org/jboss/test/**/*TestCase.class</include>
<include>org/jboss/test/**/*Test.class</include>
</includes>
- <excludes>
- <exclude>org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersionsUnitTestCase.class</exclude>
- <!-- <exclude>org/jboss/test/**/*JBossClClassPoolTest.class</exclude> -->
- </excludes>
<systemProperties>
<property>
<name>build.testlog</name>
@@ -271,7 +266,11 @@
<mkdir dir="${project.build.directory}/test-excluded-classes/org/jboss/test/classpool/support"/>
<move file="${project.build.testOutputDirectory}/org/jboss/test/classpool/support/excluded"
- todir="${project.build.directory}/test-excluded-classes/org/jboss/test/classpool/support"/>
+ todir="${project.build.directory}/test-excluded-classes/org/jboss/test/classpool/support"/>
+ <!-- TODO JBREFLECT-80 -->
+ <!-- <copy todir="${project.build.directory}/test-excluded-classes/org/jboss/test/classpool/support">
+ <fileset dir="${project.build.testOutputDirectory}/org/jboss/test/classpool/support/excluded"/>
+ </copy> -->
<delete dir="${project.build.testOutputDirectory}/archive"/>
@@ -286,17 +285,6 @@
<include name="jsfapp.war"/>
</fileset>
</delete>
-
- <jar destfile="${archive.dir}/test-weaving-target.jar"
- basedir="${project.build.testOutputDirectory}"
- includes="org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded/target/*.class"/>
- <jar destfile="${archive.dir}/test-weaving-aspects.jar"
- basedir="${project.build.testOutputDirectory}"
- includes="org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded/aspects/*.class"/>
- <jar destfile="${archive.dir}/test-weaving-interceptions.jar"
- basedir="${project.build.testOutputDirectory}"
- includes="org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded/interceptions/*.class"/>
- <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded"/>
</tasks>
</configuration>
</execution>
@@ -326,21 +314,6 @@
<version>${version.javassist}</version>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>2.1.3.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>pluggable-instrumentor</artifactId>
- <version>2.1.3.GA</version>
- </dependency>
- <!-- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-core</artifactId>
- <version>2.1.3.GA</version>
- </dependency> -->
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
<version>${version.jboss.logging.spi}</version>
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java 2009-12-07 12:44:57 UTC (rev 97500)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java 2009-12-07 12:58:17 UTC (rev 97501)
@@ -23,7 +23,6 @@
import junit.framework.Test;
-import org.jboss.aop.AspectManager;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.deployment.KernelDeployment;
@@ -46,21 +45,21 @@
*/
public abstract class JBossClClassPoolTest<C, L> extends MicrocontainerTest
{
+ public static JBossClClassPoolTestDelegate getDelegate(Class<?> clazz) throws Exception
+ {
+ return new JBossClClassPoolTestDelegate(clazz);
+ }
+
+ protected JBossClClassPoolTestDelegate getDelegate()
+ {
+ return (JBossClClassPoolTestDelegate) super.getDelegate();
+ }
+
public static Test suite(Class<?> clazz)
{
return AbstractTestCaseWithSetup.suite(clazz);
}
- // FIXME
- static
- {
- // TODO remove this later; currently, AspectManager sets the classpoolfactory
- // at ScopedClassPoolRepositoryImpl, overwriting the setClassPoolFactory command below
- // Notice that AspectManager.instance() is invoked by AOPDependencyBuilder, so
- // we have no way of avoiding AspectManager creation
- AspectManager.instance();
- }
-
/****** HELPER FIELDS ********************************************************************/
/** The classloader helper */
@@ -87,8 +86,13 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("/org/jboss/test/classpool/jbosscl/Common.xml");
VFS.init();
+ // TODO JBREFLECT-80
+ // excluding class that knows hot to load from system classloader
+ //Set<Class<?>> excluded = AbstractJDKChecker.getExcluded();
+ //excluded.add(BeanMetaDataFactoryVisitor.class);
+ // This is a hack for a hack. ;-)
+ // excluded.add(SanityTestScenario.class);
system = (ClassLoaderSystem) getBean("ClassLoaderSystem");
this.testScenario = getTestScenario();
}
@@ -102,7 +106,6 @@
}
finally
{
- undeploy("/org/jboss/test/classpool/jbosscl/Common.xml");
super.tearDown();
}
}
Added: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java (rev 0)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java 2009-12-07 12:58:17 UTC (rev 97501)
@@ -0,0 +1,130 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, 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.test.classpool.jbosscl.test;
+
+import java.net.URL;
+
+import javax.management.MBeanServer;
+
+import org.jboss.classloader.plugins.ClassLoaderUtils;
+import org.jboss.classloader.plugins.filter.PatternClassFilter;
+import org.jboss.classloader.spi.ParentPolicy;
+import org.jboss.classloader.spi.filter.ClassFilter;
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaData10;
+import org.jboss.classloading.spi.vfs.metadata.VFSClassLoaderFactory10;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.deployers.plugins.main.MainDeployerImpl;
+import org.jboss.test.kernel.junit.MicrocontainerTestDelegate;
+import org.jboss.xb.binding.resolver.MutableSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
+
+/**
+ * BootstrapDeployersTestDelegate.
+ *
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ * @version $Revision$
+ */
+public class JBossClClassPoolTestDelegate extends MicrocontainerTestDelegate
+{
+ private static ParentPolicy parentPolicy;
+
+ private MainDeployerImpl mainDeployer;
+
+ private MBeanServer server = null;
+
+ static
+ {
+ MutableSchemaResolver resolver = SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
+ resolver.mapURIToClass("urn:jboss:classloader:1.0", VFSClassLoaderFactory10.class);
+ resolver.mapURIToClass("urn:jboss:classloading:1.0", ClassLoadingMetaData10.class);
+ // FIXME JBREFLECT-80
+ //String packageA = A.class.getPackage().getName();
+ String packageA = "org.jboss.test.classpool.support";
+ final String packageName = packageA.substring(0, packageA.lastIndexOf('.'));
+ ClassFilter classFilter = new ClassFilter()
+ {
+ String packagePath = ClassLoaderUtils.packageNameToPath(JBossClClassPoolTest.class.getName());
+ ClassFilter patternFilter = new PatternClassFilter(
+ new String[] { packageName + "\\..+" },
+ new String[] { packagePath + "/.+" },
+ new String[] { packageName, packageName + "\\..*"}
+ );
+ public boolean matchesClassName(String className)
+ {
+ return patternFilter.matchesClassName(className) == false;
+ }
+
+ public boolean matchesPackageName(String packageName)
+ {
+ return patternFilter.matchesPackageName(packageName) == false;
+ }
+
+ public boolean matchesResourcePath(String resourcePath)
+ {
+ return patternFilter.matchesResourcePath(resourcePath) == false;
+ }
+
+ public String toString()
+ {
+ return "EXCLUDE " + patternFilter;
+ }
+ };
+
+ parentPolicy = new ParentPolicy(classFilter, ClassFilter.NOTHING, "BEFORE");
+ }
+
+ public JBossClClassPoolTestDelegate(Class<?> clazz) throws Exception
+ {
+ super(clazz);
+ }
+
+ public MBeanServer getMBeanServer()
+ {
+ return server;
+ }
+
+ public void setMBeanServer(MBeanServer server)
+ {
+ this.server = server;
+ }
+
+ protected void deploy() throws Exception
+ {
+ String common = "/org/jboss/test/classpool/jbosscl/Common.xml";
+ URL url = getClass().getResource(common);
+ if (url == null)
+ throw new IllegalStateException(common + " not found");
+ deploy(url);
+ // TODO JBREFLECT-80
+ //ClassLoaderSystem system = getBean("ClassLoaderSystem", ControllerState.INSTALLED, ClassLoaderSystem.class);
+ //ClassLoaderDomain domain = system.getDefaultDomain();
+ //domain.setParentPolicy(parentPolicy);
+ super.deploy();
+ }
+
+ protected MainDeployerImpl getMainDeployer()
+ {
+ if (mainDeployer == null)
+ mainDeployer = getBean("MainDeployer", ControllerState.INSTALLED, MainDeployerImpl.class);
+ return mainDeployer;
+ }
+}
Property changes on: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
More information about the jboss-cvs-commits
mailing list