[jboss-cvs] JBossAS SVN: r96127 - in projects/jboss-deployers/trunk/deployers-vfs/src/test: resources/reflect and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Nov 8 05:46:28 EST 2009
Author: alesj
Date: 2009-11-08 05:46:28 -0500 (Sun, 08 Nov 2009)
New Revision: 96127
Added:
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/META-INF/
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/META-INF/application.properties
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/META-INF/jboss-classloading.xml
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/war1/
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/war1/WEB-INF/
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/war1/WEB-INF/jboss-classloading.xml
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/war2/
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/war2/WEB-INF/
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/war2/WEB-INF/jboss-classloading.xml
Modified:
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/TypeInfoTest.java
Log:
Mock user's CL issue - http://www.jboss.org/index.html?module=bb&op=viewtopic&p=4264425#4264425.
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/TypeInfoTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/TypeInfoTest.java 2009-11-07 22:47:43 UTC (rev 96126)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/TypeInfoTest.java 2009-11-08 10:46:28 UTC (rev 96127)
@@ -29,6 +29,7 @@
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.DeploymentException;
import org.jboss.reflect.spi.TypeInfo;
import org.jboss.reflect.spi.TypeInfoFactory;
import org.jboss.test.deployers.vfs.reflect.support.crm.CrmFacade;
@@ -167,18 +168,15 @@
}
}
- public void testDomainHierarchy() throws Exception
+ protected void testDomainHierarchy(String top, String left, String right, Deployment... deployments) throws DeploymentException, ClassNotFoundException
{
- Deployment top = createIsolatedDeployment("top.jar", null, PlainJavaBean.class);
- Deployment left = createIsolatedDeployment("left.jar", "top.jar_Domain", AnyServlet.class);
- Deployment right = createIsolatedDeployment("right.jar", "top.jar_Domain", AnyServlet.class);
DeployerClient main = getDeployerClient();
- main.deploy(top, left, right);
+ main.deploy(deployments);
try
{
- DeploymentUnit duTop = getMainDeployerStructure().getDeploymentUnit(top.getName(), true);
- DeploymentUnit duLeft = getMainDeployerStructure().getDeploymentUnit(left.getName(), true);
- DeploymentUnit duRight = getMainDeployerStructure().getDeploymentUnit(right.getName(), true);
+ DeploymentUnit duTop = getMainDeployerStructure().getDeploymentUnit(top, true);
+ DeploymentUnit duLeft = getMainDeployerStructure().getDeploymentUnit(left, true);
+ DeploymentUnit duRight = getMainDeployerStructure().getDeploymentUnit(right, true);
ClassLoader topCL = getClassLoader(duTop);
ClassLoader leftCL = getClassLoader(duLeft);
ClassLoader rightCL = getClassLoader(duRight);
@@ -202,10 +200,45 @@
}
finally
{
- main.undeploy(top, left, right);
+ main.undeploy(deployments);
}
}
+ public void testDomainHierarchy() throws Exception
+ {
+ Deployment top = createIsolatedDeployment("top.jar", null, PlainJavaBean.class);
+ Deployment left = createIsolatedDeployment("left.jar", "top.jar_Domain", AnyServlet.class);
+ Deployment right = createIsolatedDeployment("right.jar", "top.jar_Domain", AnyServlet.class);
+ testDomainHierarchy(top.getName(), left.getName(), right.getName(), top, left, right);
+ }
+
+ public void testEar2War() throws Exception
+ {
+ AssembledDirectory ear = createAssembledDirectory("ptd-ear-1.0-SNAPSHOT.ear", "ptd-ear-1.0-SNAPSHOT.ear");
+ addPath(ear, "/reflect/ear2war", "META-INF");
+ AssembledDirectory lib = ear.mkdir("lib");
+ AssembledDirectory common = lib.mkdir("common.jar");
+ addPackage(common, PlainJavaBean.class);
+
+ AssembledDirectory war1 = ear.mkdir("ptd-jsf-1.0-SNAPSHOT.war");
+ AssembledDirectory webinf1 = war1.mkdir("WEB-INF");
+ addPath(war1, "/reflect/ear2war/war1/", "WEB-INF");
+ AssembledDirectory classes1 = webinf1.mkdir("classes");
+ addPackage(classes1, AnyServlet.class);
+
+ AssembledDirectory war2 = ear.mkdir("ptd-ws-1.0-SNAPSHOT.war");
+ AssembledDirectory webinf2 = war2.mkdir("WEB-INF");
+ addPath(war2, "/reflect/ear2war/war2/", "WEB-INF");
+ AssembledDirectory classes2 = webinf2.mkdir("classes");
+ addPackage(classes2, AnyServlet.class);
+
+ Deployment deployment = createVFSDeployment(ear);
+ String top = deployment.getName();
+ String left = top + "ptd-jsf-1.0-SNAPSHOT.war/";
+ String right = top + "ptd-ws-1.0-SNAPSHOT.war/";
+ testDomainHierarchy(top, left, right, deployment);
+ }
+
public void testNonDeploymentModule() throws Exception
{
URL location = AnyServlet.class.getProtectionDomain().getCodeSource().getLocation();
Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/META-INF/application.properties
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/META-INF/application.properties (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/META-INF/application.properties 2009-11-08 10:46:28 UTC (rev 96127)
@@ -0,0 +1,2 @@
+jsf-module=ptd-jsf-1.0-SNAPSHOT.war
+ws-module=ptd-ws-1.0-SNAPSHOT.war
Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/META-INF/jboss-classloading.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/META-INF/jboss-classloading.xml (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/META-INF/jboss-classloading.xml 2009-11-08 10:46:28 UTC (rev 96127)
@@ -0,0 +1,6 @@
+<classloading xmlns="urn:jboss:classloading:1.0"
+ name="ptd-ear-1.0-SNAPSHOT.ear"
+ domain="ptd-ear-1.0-SNAPSHOT.ear"
+ export-all="NON_EMPTY"
+ import-all="true"
+ parent-first="false"/>
\ No newline at end of file
Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/war1/WEB-INF/jboss-classloading.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/war1/WEB-INF/jboss-classloading.xml (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/war1/WEB-INF/jboss-classloading.xml 2009-11-08 10:46:28 UTC (rev 96127)
@@ -0,0 +1,7 @@
+<classloading xmlns="urn:jboss:classloading:1.0"
+ name="ptd-jsf-1.0-SNAPSHOT.war"
+ domain="ptd-jsf-1.0-SNAPSHOT.war"
+ parent-domain="ptd-ear-1.0-SNAPSHOT.ear"
+ export-all="NON_EMPTY"
+ import-all="true"
+ parent-first="true"/>
\ No newline at end of file
Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/war2/WEB-INF/jboss-classloading.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/war2/WEB-INF/jboss-classloading.xml (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/ear2war/war2/WEB-INF/jboss-classloading.xml 2009-11-08 10:46:28 UTC (rev 96127)
@@ -0,0 +1,7 @@
+<classloading xmlns="urn:jboss:classloading:1.0"
+ name="ptd-ws-1.0-SNAPSHOT.war"
+ domain="ptd-ws-1.0-SNAPSHOT.war"
+ parent-domain="ptd-ear-1.0-SNAPSHOT.ear"
+ export-all="NON_EMPTY"
+ import-all="true"
+ parent-first="true"/>
More information about the jboss-cvs-commits
mailing list