[jboss-cvs] JBossAS SVN: r99314 - in projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers: support and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 12 14:50:38 EST 2010
Author: johnbailey
Date: 2010-01-12 14:50:37 -0500 (Tue, 12 Jan 2010)
New Revision: 99314
Modified:
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTest.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/support/AssembledDirectory.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AbstractAnnotationsScanningUnitTest.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/BootstrapDeployersSmokeTestUnitTestCase.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManifestClassLoaderUnitTestCase.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ReflectTest.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java
Log:
Update to AssembledDirectory to have consistent argument order and support for adding string paths
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTest.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTest.java 2010-01-12 19:42:17 UTC (rev 99313)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTest.java 2010-01-12 19:50:37 UTC (rev 99314)
@@ -323,7 +323,7 @@
{
VirtualFileAssembly assembly = new VirtualFileAssembly();
assemblyHandles.put(mountPoint, VFS.mountAssembly(assembly, mountPoint));
- return new AssembledDirectory(assembly);
+ return new AssembledDirectory(getClass(), assembly);
}
protected VirtualFile getVirtualFile(String path) throws URISyntaxException
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/support/AssembledDirectory.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/support/AssembledDirectory.java 2010-01-12 19:42:17 UTC (rev 99313)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/support/AssembledDirectory.java 2010-01-12 19:50:37 UTC (rev 99314)
@@ -24,6 +24,8 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.List;
import java.util.regex.Pattern;
@@ -47,9 +49,11 @@
public class AssembledDirectory
{
private final VirtualFileAssembly assembly;
+ private final Class<?> testClass;
- public AssembledDirectory(VirtualFileAssembly assembly)
+ public AssembledDirectory(Class<?> testClass, VirtualFileAssembly assembly)
{
+ this.testClass = testClass;
this.assembly = assembly;
}
@@ -142,13 +146,23 @@
return this;
}
+ public AssembledDirectory addPath(String existingPath) throws Exception
+ {
+ return addPath("", existingPath);
+ }
+
public AssembledDirectory addPath(VirtualFile existingPath) throws Exception
{
- return addPath(existingPath, "");
+ return addPath("", existingPath);
}
- public AssembledDirectory addPath(VirtualFile existingPath, String assemblyPath) throws Exception
+ public AssembledDirectory addPath(String assemblyPath, String existingPath) throws Exception
{
+ return addPath(assemblyPath, getVirtualFile(existingPath));
+ }
+
+ public AssembledDirectory addPath(String assemblyPath, VirtualFile existingPath) throws Exception
+ {
SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(JARStructure.DEFAULT_JAR_SUFFIXES);
FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(noJars);
existingPath.visit(visitor);
@@ -232,6 +246,26 @@
return false;
return true;
}
+
+ protected VirtualFile getVirtualFile(String path) throws URISyntaxException
+ {
+ URL resource = getResource(path);
+ if(resource != null)
+ return VFS.getChild(resource);
+ return null;
+ }
+ private URL getResource(final String name)
+ {
+ PrivilegedAction<URL> action = new PrivilegedAction<URL>()
+ {
+ public URL run()
+ {
+ return testClass.getResource(name);
+ }
+ };
+ return AccessController.doPrivileged(action);
+ }
+
}
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AbstractAnnotationsScanningUnitTest.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AbstractAnnotationsScanningUnitTest.java 2010-01-12 19:42:17 UTC (rev 99313)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AbstractAnnotationsScanningUnitTest.java 2010-01-12 19:50:37 UTC (rev 99314)
@@ -53,15 +53,15 @@
{
VirtualFile ear = createTopLevelWithUtil();
createAssembledDirectory(ear.getChild("simple.jar"))
- .addPackage("", JarMarkOnClassImpl.class)
- .addPackage("", JarMarkOnClass.class)
- .addPath(getVirtualFile("/annotations/basic-scan/jar/META-INF"), "META-INF");
+ .addPackage(JarMarkOnClassImpl.class)
+ .addPackage(JarMarkOnClass.class)
+ .addPath("/annotations/basic-scan/jar");
createAssembledDirectory(ear.getChild("simple.war"))
.addPackage("WEB-INF/classes", WebMarkOnClassImpl.class)
.addPackage("WEB-INF/classes", WebMarkOnClass.class)
.addPackage("WEB-INF/lib/ui.jar", SomeUIClass.class)
- .addPath(getVirtualFile("/annotations/basic-scan/web/WEB-INF"), "WEB-INF");
+ .addPath("/annotations/basic-scan/web");
enableTrace("org.jboss.deployers");
@@ -114,7 +114,7 @@
VirtualFile topLevel = VFS.getChild(getName()).getChild("top-level.ear");
createAssembledDirectory(topLevel)
- .addPath(getVirtualFile("/annotations/basic-scan/META-INF"), "META-INF")
+ .addPath("/annotations/basic-scan")
.addPackage("lib/util.jar", Util.class)
.addPackage("lib/ext.jar", External.class)
.addPackage("lib/ann.jar", NoExtRecurseFilter.class);
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/BootstrapDeployersSmokeTestUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/BootstrapDeployersSmokeTestUnitTestCase.java 2010-01-12 19:42:17 UTC (rev 99313)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/BootstrapDeployersSmokeTestUnitTestCase.java 2010-01-12 19:50:37 UTC (rev 99314)
@@ -114,8 +114,8 @@
{
VirtualFile dirA = VFS.getChild(getName()).getChild("/assembly");
createAssembledDirectory(dirA)
- .addPackage("", A.class)
- .addPath(getVirtualFile("/bootstrap/test-assembled/META-INF"), "META-INF");
+ .addPackage(A.class)
+ .addPath("/bootstrap/test-assembled");
VFSDeploymentUnit unitA = assertDeploy(dirA);
try
{
@@ -136,9 +136,9 @@
{
VirtualFile dirA = VFS.getChild(getName()).getChild("/assembly");
createAssembledDirectory(dirA)
- .addPackage("", A.class)
+ .addPackage(A.class)
.addPackage("/b", B.class)
- .addPath(getVirtualFile("/bootstrap/test-assembled/META-INF"), "/b/META-INF");
+ .addPath("/b", "/bootstrap/test-assembled");
VFSDeploymentUnit unitA = assertDeploy(dirA);
try
{
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManifestClassLoaderUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManifestClassLoaderUnitTestCase.java 2010-01-12 19:42:17 UTC (rev 99313)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManifestClassLoaderUnitTestCase.java 2010-01-12 19:50:37 UTC (rev 99314)
@@ -56,8 +56,8 @@
VirtualFile topLevel = createTopLevelWithUtil();
VirtualFile sub = topLevel.getChild("sub.jar");
createAssembledDirectory(sub)
- .addPackage("", UseA.class)
- .addPath(getVirtualFile("/classloader/manifest/basic/META-INF"), "META-INF");
+ .addPackage(UseA.class)
+ .addPath("/classloader/manifest/basic");
VFSDeploymentUnit unit = assertDeploy(topLevel);
try
{
@@ -77,8 +77,8 @@
VirtualFile topLevel = createTopLevelWithUtil();
VirtualFile sub = topLevel.getChild("sub.jar");
createAssembledDirectory(sub)
- .addPackage("", UseA.class)
- .addPath(getVirtualFile("/classloader/manifest/scoped/META-INF"), "META-INF");
+ .addPackage(UseA.class)
+ .addPath("/classloader/manifest/scoped");
enableTrace("org.jboss.deployers");
VFSDeploymentUnit unit = assertDeploy(topLevel);
try
@@ -101,12 +101,12 @@
VirtualFile topLevel = createTopLevelWithUtil();
VirtualFile sub1 = topLevel.getChild("sub1.jar");
createAssembledDirectory(sub1)
- .addPackage("", UseA.class)
- .addPath(getVirtualFile("/classloader/manifest/scoped/META-INF"), "META-INF");
+ .addPackage(UseA.class)
+ .addPath("/classloader/manifest/scoped");
VirtualFile sub2 = topLevel.getChild("sub2.jar");
createAssembledDirectory(sub2)
- .addPackage("", UseA.class)
- .addPath(getVirtualFile("/classloader/manifest/scoped/META-INF"), "META-INF");
+ .addPackage(UseA.class)
+ .addPath("/classloader/manifest/scoped");
VFSDeploymentUnit unit = assertDeploy(topLevel);
try
{
@@ -132,18 +132,18 @@
// Dummy parent to create a different parent domain
VirtualFile dummyParent = VFS.getChild(getName()).getChild("dummyParent.jar");
createAssembledDirectory(dummyParent)
- .addPath(getVirtualFile("/classloader/manifest/dummyparent/META-INF"), "META-INF");
+ .addPath("/classloader/manifest/dummyparent");
VFSDeploymentUnit dummy = assertDeploy(dummyParent);
try
{
VirtualFile topLevel = VFS.getChild(getName()).getChild("top-level.jar");
createAssembledDirectory(topLevel)
.addPackage("util.jar", A.class)
- .addPath(getVirtualFile("/classloader/manifest/topscoped/META-INF"), "META-INF");
+ .addPath("/classloader/manifest/topscoped");
VirtualFile sub = topLevel.getChild("sub.jar");
createAssembledDirectory(sub)
- .addPackage("", UseA.class)
- .addPath(getVirtualFile("/classloader/manifest/scopednotparent/META-INF"), "META-INF");
+ .addPackage(UseA.class)
+ .addPath("/classloader/manifest/scopednotparent");
VFSDeploymentUnit unit = assertDeploy(topLevel);
try
{
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ReflectTest.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ReflectTest.java 2010-01-12 19:42:17 UTC (rev 99313)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ReflectTest.java 2010-01-12 19:50:37 UTC (rev 99314)
@@ -191,14 +191,14 @@
{
VirtualFile earFile = VFS.getChild(getName()).getChild("ptd-ear-1.0-SNAPSHOT.ear");
createAssembledDirectory(earFile)
- .addPath(getVirtualFile("/reflect/ear2war"), "META-INF")
+ .addPath("META-INF", "/reflect/ear2war/META-INF")
.addPackage("lib/common.jar", PlainJavaBean.class)
- .addPath(getVirtualFile("/reflect/ear2war/war1/"), "ptd-jsf-1.0-SNAPSHOT.war/WEB-INF")
+ .addPath("ptd-jsf-1.0-SNAPSHOT.war", "/reflect/ear2war/war1")
.addPackage("ptd-jsf-1.0-SNAPSHOT.war/WEB-INF/lib/wj1.jar", AnyServlet.class)
- .addPath(getVirtualFile("/reflect/ear2war/manifest/"), "ptd-jsf-1.0-SNAPSHOT.war/WEB-INF/lib/wj1.jar/META-INF")
- .addPath(getVirtualFile("/reflect/ear2war/war2/"), "ptd-ws-1.0-SNAPSHOT.war/WEB-INF")
+ .addPath("ptd-jsf-1.0-SNAPSHOT.war/WEB-INF/lib/wj1.jar", "/reflect/ear2war/manifest")
+ .addPath("ptd-ws-1.0-SNAPSHOT.war", "/reflect/ear2war/war2")
.addPackage("ptd-ws-1.0-SNAPSHOT.war/WEB-INF/lib/wj2.jar", AnyServlet.class)
- .addPath(getVirtualFile("/reflect/ear2war/manifest/"), "ptd-ws-1.0-SNAPSHOT.war/WEB-INF/lib/wj2.jar/META-INF");
+ .addPath("ptd-ws-1.0-SNAPSHOT.war/WEB-INF/lib/wj2.jar", "/reflect/ear2war/manifest");
Deployment deployment = createVFSDeployment(earFile);
String top = deployment.getName();
@@ -215,8 +215,8 @@
{
VirtualFile jarFile = VFS.getChild(getName()).getChild("simple.jar");
createAssembledDirectory(jarFile)
- .addPackage("", PlainJavaBean.class)
- .addPath(getVirtualFile("/reflect/module"), "META-INF");
+ .addPackage(PlainJavaBean.class)
+ .addPath("/reflect/module");
Deployment deployment = createVFSDeployment(jarFile);
DeployerClient main = getDeployerClient();
@@ -275,9 +275,9 @@
{
VirtualFile jarFile = VFS.getChild(getName()).getChild("simple.jar");
createAssembledDirectory(jarFile)
- .addPackage("", PlainJavaBean.class)
- .addPath(getVirtualFile("/reflect/module"), "META-INF")
- .addPath(getVirtualFile("/reflect/" + name), "META-INF");
+ .addPackage(PlainJavaBean.class)
+ .addPath("/reflect/module")
+ .addPath("/reflect/" + name);
Deployment deployment = createVFSDeployment(jarFile);
DeployerClient main = getDeployerClient();
@@ -411,7 +411,7 @@
{
VirtualFile jarFile = VFS.getChild(getName()).getChild(name);
createAssembledDirectory(jarFile)
- .addPackage("", reference);
+ .addPackage(reference);
return jarFile;
}
@@ -419,8 +419,8 @@
{
VirtualFile jarFile = VFS.getChild(getName()).getChild("ejbs.jar");
createAssembledDirectory(jarFile)
- .addPackage("", MySLSBean.class)
- .addPath(getVirtualFile("/reflect/ejb"), "META-INF");
+ .addPackage(MySLSBean.class)
+ .addPath("/reflect/ejb");
return jarFile;
}
@@ -429,7 +429,7 @@
VirtualFile warFile = VFS.getChild(getName()).getChild("simple.war");
createAssembledDirectory(warFile)
.addPackage("WEB-INF/classes", AnyServlet.class)
- .addPath(getVirtualFile("/reflect/web"), "WEB-INF");
+ .addPath("/reflect/web");
return warFile;
}
@@ -437,7 +437,7 @@
{
VirtualFile sarFile = VFS.getChild(getName()).getChild( "simple.sar");
createAssembledDirectory(sarFile)
- .addPackage("", SomeMBean.class);
+ .addPackage(SomeMBean.class);
return sarFile;
}
@@ -447,32 +447,32 @@
VirtualFile jarFile = ear.getChild("simple.jar");
createAssembledDirectory(jarFile)
- .addPackage("", PlainJavaBean.class);
+ .addPackage(PlainJavaBean.class);
VirtualFile ejbsFile = ear.getChild("ejbs.jar");
createAssembledDirectory(ejbsFile)
- .addPackage("", MySLSBean.class)
- .addPath(getVirtualFile("/reflect/ejb"), "META-INF");
+ .addPackage(MySLSBean.class)
+ .addPath("/reflect/ejb");
VirtualFile warFile = ear.getChild("simple.war");
createAssembledDirectory(warFile)
.addPackage("WEB-INF/classes", AnyServlet.class)
- .addPath(getVirtualFile("/reflect/web"), "WEB-INF")
+ .addPath("/reflect/web")
.addPackage("WEB-INF/lib/ui.jar", UIBean.class);
// another war
warFile = ear.getChild("jsfapp.war");
createAssembledDirectory(warFile)
- .addPath(getVirtualFile("/reflect/web"), "WEB-INF")
+ .addPath("/reflect/web")
.addPackage("WEB-INF/classes", JsfBean.class)
.addPackage("WEB-INF/lib/ui_util.jar", CrmFacade.class);
// a sar
VirtualFile sarFile = ear.getChild("simple.sar");
createAssembledDirectory(sarFile)
- .addPackage("", SomeMBean.class)
- .addPath(getVirtualFile("/reflect/sar"), "META-INF");
+ .addPackage(SomeMBean.class)
+ .addPath("/reflect/sar");
enableTrace("org.jboss.deployers");
@@ -483,7 +483,7 @@
{
VirtualFile earFile = VFS.getChild(getName()).getChild("top-level.ear");
createAssembledDirectory(earFile)
- .addPath(getVirtualFile(path), "META-INF")
+ .addPath(path)
.addPackage("lib/util.jar", SomeUtil.class)
.addPackage("lib/ext.jar", External.class);
return earFile;
@@ -493,9 +493,9 @@
{
VirtualFile earFile = VFS.getChild(getName()).getChild("war-in-ear.ear");
createAssembledDirectory(earFile)
- .addPath(getVirtualFile("/reflect/warinear"), "META-INF")
+ .addPath("/reflect/warinear")
.addPackage("simple.war/WEB-INF/classes", AnyServlet.class)
- .addPath(getVirtualFile("/reflect/web"), "simple.war/WEB-INF");
+ .addPath("simple.war", "/reflect/web");
return earFile;
}
@@ -503,7 +503,7 @@
{
VirtualFile earFile = VFS.getChild(getName()).getChild("jar-in-ear.ear");
createAssembledDirectory(earFile)
- .addPath(getVirtualFile("/reflect/jarinear"), "META-INF")
+ .addPath("/reflect/jarinear")
.addPackage("simple.jar", PlainJavaBean.class);
return earFile;
}
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java 2010-01-12 19:42:17 UTC (rev 99313)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java 2010-01-12 19:50:37 UTC (rev 99314)
@@ -73,28 +73,28 @@
VirtualFile jar = ear.getChild("simple.jar");
createAssembledDirectory(jar)
- .addPackage("", PlainJavaBean.class)
- .addPath(getVirtualFile("/webbeans/simple/jar/META-INF"), "META-INF");
+ .addPackage(PlainJavaBean.class)
+ .addPath("/webbeans/simple/jar");
VirtualFile ejbs = ear.getChild("ejbs.jar");
createAssembledDirectory(ejbs)
- .addPackage("", MySLSBean.class)
- .addPath(getVirtualFile("/webbeans/simple/ejb/META-INF"), "META-INF");
+ .addPackage(MySLSBean.class)
+ .addPath("/webbeans/simple/ejb");
VirtualFile war = ear.getChild("simple.war");
createAssembledDirectory(war)
.addPackage("WEB-INF/classes", ServletWebBean.class)
- .addPath(getVirtualFile("/webbeans/simple/web/WEB-INF"), "WEB-INF")
+ .addPath("/webbeans/simple/web")
.addPackage("WEB-INF/lib/ui.jar", UIWebBean.class)
- .addPath(getVirtualFile("/webbeans/simple/ui/META-INF"), "WEB-INF/lib/ui.jar/META-INF");
+ .addPath("WEB-INF/lib/ui.jar", "/webbeans/simple/ui");
// war w/o web-beans.xml
war = ear.getChild("crm.war");
createAssembledDirectory(war)
.addPackage("WEB-INF/classes", NotWBJsfBean.class)
.addPackage("WEB-INF/lib/crm.jar", CrmWebBean.class)
- .addPath(getVirtualFile("/webbeans/simple/crm/META-INF"), "WEB-INF/lib/crm.jar/META-INF");
+ .addPath("WEB-INF/lib/crm.jar", "/webbeans/simple/crm");
enableTrace("org.jboss.deployers");
@@ -105,10 +105,10 @@
{
VirtualFile earFile = VFS.getChild(getName()).getChild("top-level.ear");
createAssembledDirectory(earFile)
- .addPath(getVirtualFile("/webbeans/simple/META-INF"), "META-INF")
+ .addPath("/webbeans/simple")
.addPackage("lib/util.jar", SomeUtil.class)
.addPackage("lib/ext.jar", ExternalWebBean.class)
- .addPath(getVirtualFile("/webbeans/simple/ext/META-INF"), "lib/ext.jar/META-INF");
+ .addPath("lib/ext.jar", "/webbeans/simple/ext");
return earFile;
}
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list