[jboss-cvs] JBossAS SVN: r101185 - in projects/weld-int/branches/6.0.0.Beta7_VFS3_int: deployer/src/main/java/org/jboss/weld/integration/deployer/env and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 19 15:28:11 EST 2010
Author: johnbailey
Date: 2010-02-19 15:28:10 -0500 (Fri, 19 Feb 2010)
New Revision: 101185
Modified:
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/DynamicDependencyCreator.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryDeployer.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaData.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaDataDeployer.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostFacesConfigDeployer.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostJBossAppMetadataDeployer.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldAwareMetadataDeployer.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldClassloadingDeployer.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldFilesDeployer.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/util/VFSManifestFinder.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockEjbJarDeployer.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossAppDeployer.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossDeployer.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossWebDeployer.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockWebDeployer.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/CLIsolationTestCase.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/PostDeployersTestCase.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/WeldDiscoveryEnvTestCase.java
projects/weld-int/branches/6.0.0.Beta7_VFS3_int/pom.xml
Log:
[WELDINT-48] - Merged VFS3 integration branch changes -r 99300:101165
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/DynamicDependencyCreator.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/DynamicDependencyCreator.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/DynamicDependencyCreator.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -70,7 +70,7 @@
if (whenRequiredState == null)
whenRequired = ControllerState.INSTALLED;
else
- whenRequired = new ControllerState(whenRequiredState);
+ whenRequired = ControllerState.getInstance(whenRequiredState);
ControllerState currentTargetState = targetControllerContext.getState();
if (controller.getStates().isBeforeState(currentTargetState, whenRequired) == false)
@@ -78,7 +78,7 @@
ControllerState dependent = null;
if (dependentState != null)
- dependent = new ControllerState(dependentState);
+ dependent = ControllerState.getInstance(dependentState);
DependencyInfo di = targetControllerContext.getDependencyInfo();
for (Object dependency : dependencies)
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryDeployer.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryDeployer.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryDeployer.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -33,7 +33,7 @@
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
import org.jboss.weld.integration.deployer.ext.JBossWeldMetaData;
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaData.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaData.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaData.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -24,7 +24,7 @@
import java.io.Serializable;
import java.net.URL;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* JBoss Weld custom meta data
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaDataDeployer.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaDataDeployer.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaDataDeployer.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -23,7 +23,7 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* JBoss WBD deployer.
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostFacesConfigDeployer.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostFacesConfigDeployer.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostFacesConfigDeployer.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -26,7 +26,7 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Post faces-config.xml deployer.
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostJBossAppMetadataDeployer.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostJBossAppMetadataDeployer.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostJBossAppMetadataDeployer.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -24,7 +24,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
/**
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -33,7 +33,7 @@
import org.jboss.metadata.web.spec.FilterMetaData;
import org.jboss.metadata.web.spec.FiltersMetaData;
import org.jboss.metadata.web.spec.ListenerMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
/**
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldAwareMetadataDeployer.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldAwareMetadataDeployer.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldAwareMetadataDeployer.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -25,7 +25,7 @@
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Weld aware metadata deployer.
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldClassloadingDeployer.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldClassloadingDeployer.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldClassloadingDeployer.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -27,7 +27,7 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Handle classloading metadata creation.
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -37,7 +37,7 @@
import org.jboss.metadata.ejb.spec.InterceptorClassesMetaData;
import org.jboss.metadata.ejb.spec.InterceptorMetaData;
import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
/**
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldFilesDeployer.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldFilesDeployer.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldFilesDeployer.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -30,7 +30,7 @@
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
import org.jboss.weld.integration.deployer.ext.JBossWeldMetaData;
@@ -66,7 +66,7 @@
for (VirtualFile cp : classpaths)
{
VirtualFile wbXml = cp.getChild("META-INF/beans.xml");
- if (wbXml != null)
+ if (wbXml.exists())
{
// add url
wbFiles.add(wbXml);
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/util/VFSManifestFinder.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/util/VFSManifestFinder.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/main/java/org/jboss/weld/integration/util/VFSManifestFinder.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -24,9 +24,9 @@
import java.net.URL;
import java.util.jar.Manifest;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VFSUtils;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VFSUtils;
/**
* Find manifest info from class - JBoss VFS.
@@ -42,7 +42,7 @@
protected Manifest findManifest(URL url) throws Exception
{
- VirtualFile root = VFS.getRoot(url);
+ VirtualFile root = VFS.getChild(url);
return VFSUtils.getManifest(root);
}
}
\ No newline at end of file
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockEjbJarDeployer.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockEjbJarDeployer.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockEjbJarDeployer.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -25,7 +25,7 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Mock ejb-jar.xml parser.
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossAppDeployer.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossAppDeployer.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossAppDeployer.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -25,7 +25,7 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Mock application.properties parser.
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossDeployer.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossDeployer.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossDeployer.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -24,7 +24,7 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Mock jboss.xml parser.
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossWebDeployer.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossWebDeployer.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossWebDeployer.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -24,7 +24,7 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Mock jboss-web.xml parser.
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockWebDeployer.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockWebDeployer.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockWebDeployer.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -24,7 +24,7 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Mock web.xml parser.
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -38,7 +38,7 @@
import org.jboss.test.deployers.support.jar.PlainJavaBean;
import org.jboss.test.deployers.support.ui.UIWebBean;
import org.jboss.test.deployers.support.web.ServletWebBean;
-import org.jboss.virtual.AssembledDirectory;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
import org.jboss.weld.bootstrap.spi.Deployment;
import org.jboss.weld.integration.deployer.DeployersUtils;
@@ -68,7 +68,7 @@
public void testSimpleUsage() throws Exception
{
- AssembledDirectory ear = createBasicEar(MockEmptyEjbServices.class);
+ VirtualFile ear = createBasicEar(MockEmptyEjbServices.class);
VFSDeploymentUnit topUnit = assertDeploy(ear);
try
{
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -35,7 +35,8 @@
import org.jboss.test.deployers.support.ui.UIWebBean;
import org.jboss.test.deployers.support.util.SomeUtil;
import org.jboss.test.deployers.support.web.ServletWebBean;
-import org.jboss.virtual.AssembledDirectory;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* AbstractWeldTest.
@@ -71,126 +72,106 @@
return (Boolean)m.invoke(target);
}
- protected AssembledDirectory createBasicEar() throws Exception
+ protected VirtualFile createBasicEar() throws Exception
{
return createBasicEar(SomeUtil.class);
}
- protected AssembledDirectory createBasicEar(Class<?> utilClass) throws Exception
+ protected VirtualFile createBasicEar(Class<?> utilClass) throws Exception
{
- AssembledDirectory ear = createTopLevelWithUtil(utilClass);
+ VirtualFile ear = createTopLevelWithUtil(utilClass);
- AssembledDirectory jar = ear.mkdir("simple.jar");
- addPackage(jar, PlainJavaBean.class);
- addPath(jar, "/weld/simple/jar", "META-INF");
+ VirtualFile jar = ear.getChild("simple.jar");
+ createAssembledDirectory(jar)
+ .addPackage(PlainJavaBean.class)
+ .addPath("/weld/simple/jar");
- AssembledDirectory ejbs = ear.mkdir("ejbs.jar");
- addPackage(ejbs, MySLSBean.class);
- addPath(ejbs, "/weld/simple/ejb", "META-INF");
+ VirtualFile ejbs = ear.getChild("ejbs.jar");
+ createAssembledDirectory(ejbs)
+ .addPackage(MySLSBean.class)
+ .addPath("/weld/simple/ejb");
- AssembledDirectory war = ear.mkdir("simple.war");
- AssembledDirectory webinf = war.mkdir("WEB-INF");
- AssembledDirectory classes = webinf.mkdir("classes");
- addPackage(classes, ServletWebBean.class);
- addPath(war, "/weld/simple/web", "WEB-INF");
+ VirtualFile war = ear.getChild("simple.war");
+ createAssembledDirectory(war)
+ .addPackage("WEB-INF/classes", ServletWebBean.class)
+ .addPath("/weld/simple/web")
+ .addPackage("WEB-INF/lib/ui.jar", UIWebBean.class)
+ .addPath("WEB-INF/lib/ui.jar", "/weld/simple/ui");
- AssembledDirectory lib = webinf.mkdir("lib");
-
- AssembledDirectory uijar = lib.mkdir("ui.jar");
- addPackage(uijar, UIWebBean.class);
- addPath(uijar, "/weld/simple/ui", "META-INF");
-
// war w/o beans.xml
- war = ear.mkdir("crm.war");
- webinf = war.mkdir("WEB-INF");
- classes = webinf.mkdir("classes");
- addPackage(classes, NotWBJsfBean.class);
-
- lib = webinf.mkdir("lib");
-
- uijar = lib.mkdir("crm.jar");
- addPackage(uijar, CrmWebBean.class);
- addPath(uijar, "/weld/simple/crm", "META-INF");
-
+ war = ear.getChild("crm.war");
+ createAssembledDirectory(war)
+ .addPackage("WEB-INF/classes", NotWBJsfBean.class)
+ .addPackage("WEB-INF/lib/crm.jar", CrmWebBean.class)
+ .addPath("WEB-INF/lib/crm.jar", "/weld/simple/crm");
+
enableTrace("org.jboss.deployers");
return ear;
}
- protected AssembledDirectory createTopLevelWithUtil() throws Exception
+ protected VirtualFile createTopLevelWithUtil() throws Exception
{
return createTopLevelWithUtil("/weld/simple");
}
- protected AssembledDirectory createTopLevelWithUtil(Class<?> utilClass) throws Exception
+ protected VirtualFile createTopLevelWithUtil(Class<?> utilClass) throws Exception
{
return createTopLevelWithUtil("/weld/simple", utilClass);
}
- protected AssembledDirectory createTopLevelWithUtil(String path) throws Exception
+ protected VirtualFile createTopLevelWithUtil(String path) throws Exception
{
return createTopLevelWithUtil(path, SomeUtil.class);
}
- protected AssembledDirectory createTopLevelWithUtil(String path, Class<?> utilClass) throws Exception
+ protected VirtualFile createTopLevelWithUtil(String path, Class<?> utilClass) throws Exception
{
- AssembledDirectory topLevel = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(topLevel, path, "META-INF");
-
- AssembledDirectory earLib = topLevel.mkdir("lib");
-
- AssembledDirectory util = earLib.mkdir("util.jar");
- addPackage(util, utilClass);
-
- AssembledDirectory ext = earLib.mkdir("ext.jar");
- addPackage(ext, ExternalWebBean.class);
- addPath(ext, "/weld/simple/ext", "META-INF");
-
- return topLevel;
+ VirtualFile earFile = VFS.getChild("top-level.ear");
+ createAssembledDirectory(earFile)
+ .addPath(path)
+ .addPackage("lib/util.jar", utilClass)
+ .addPackage("lib/ext.jar", ExternalWebBean.class)
+ .addPath("lib/ext.jar", "/weld/simple/ext");
+ return earFile;
}
- protected AssembledDirectory createWarInEar() throws Exception
+ protected VirtualFile createWarInEar() throws Exception
{
- AssembledDirectory ear = createAssembledDirectory("war-in-ear.ear", "war-in-ear.ear");
- addPath(ear, "/weld/warinear", "META-INF");
-
- AssembledDirectory war = ear.mkdir("simple.war");
- AssembledDirectory webinf = war.mkdir("WEB-INF");
- AssembledDirectory classes = webinf.mkdir("classes");
- addPackage(classes, ServletWebBean.class);
- addPath(war, "/weld/simple/web", "WEB-INF");
-
- return ear;
+ VirtualFile earFile = VFS.getChild("war-in-ear.ear");
+ createAssembledDirectory(earFile)
+ .addPath("/weld/warinear")
+ .addPackage("simple.war/WEB-INF/classes", ServletWebBean.class)
+ .addPath("simple.war", "/weld/simple/web");
+ return earFile;
}
- protected AssembledDirectory createJarInEar() throws Exception
+ protected VirtualFile createJarInEar() throws Exception
{
- AssembledDirectory ear = createAssembledDirectory("jar-in-ear.ear", "jar-in-ear.ear");
- addPath(ear, "/weld/jarinear", "META-INF");
-
- AssembledDirectory jar = ear.mkdir("simple.jar");
- addPackage(jar, PlainJavaBean.class);
- addPath(jar, "/weld/simple/jar", "META-INF");
-
- return ear;
+ VirtualFile earFile = VFS.getChild("jar-in-ear.ear");
+ createAssembledDirectory(earFile)
+ .addPath("/weld/jarinear")
+ .addPackage("simple.jar", PlainJavaBean.class)
+ .addPath("simple.jar", "/weld/simple/jar");
+ return earFile;
}
- protected AssembledDirectory createWar(String warName, Class<?> reference) throws Exception
+ protected VirtualFile createWar(String warName, Class<?> reference) throws Exception
{
- AssembledDirectory war = createAssembledDirectory(warName, warName);
- AssembledDirectory webinf = war.mkdir("WEB-INF");
- AssembledDirectory classes = webinf.mkdir("classes");
- addPackage(classes, reference);
- addPath(war, "/weld/simple/web", "WEB-INF");
- return war;
+ VirtualFile warFile = VFS.getChild(warName);
+ createAssembledDirectory(warFile)
+ .addPackage("WEB-INF/classes", reference)
+ .addPath("/weld/simple/web");
+ return warFile;
}
- protected AssembledDirectory createEjbJar(String jarName, Class<?> reference) throws Exception
+ protected VirtualFile createEjbJar(String jarName, Class<?> reference) throws Exception
{
- AssembledDirectory jar = createAssembledDirectory(jarName, jarName);
- addPackage(jar, reference);
- addPath(jar, "/weld/simple/ejb", "META-INF");
- return jar;
+ VirtualFile jarFile = VFS.getChild(jarName);
+ createAssembledDirectory(jarFile)
+ .addPackage(reference)
+ .addPath("/weld/simple/ejb");
+ return jarFile;
}
}
\ No newline at end of file
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -32,7 +32,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.test.deployers.support.deployer.CheckableJndiBinderDeployer;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
/**
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/CLIsolationTestCase.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/CLIsolationTestCase.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/CLIsolationTestCase.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -29,7 +29,7 @@
import org.jboss.test.deployers.support.jar.PlainJavaBean;
import org.jboss.test.deployers.support.jsf.NotWBJsfBean;
import org.jboss.test.deployers.support.web.ServletWebBean;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* CL isolation tests.
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/PostDeployersTestCase.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/PostDeployersTestCase.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/PostDeployersTestCase.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -35,8 +35,8 @@
import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.ListenerMetaData;
-import org.jboss.virtual.AssembledDirectory;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.metadata.WeldEjbInterceptorMetadataDeployer;
/**
@@ -98,15 +98,12 @@
public void testWarWithNoWBFile() throws Exception
{
- AssembledDirectory ear = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(ear, "/weld/warwowb", "META-INF");
+ VirtualFile ear = VFS.getChild("top-level.ear");
+ createAssembledDirectory(ear)
+ .addPath("/weld/warwowb")
+ .addPath("simple.war", "/weld/warwowb/web")
+ .addPath("ejbs.jar", "/weld/warwowb/ejb");
- AssembledDirectory war = ear.mkdir("simple.war");
- addPath(war, "/weld/warwowb/web", "WEB-INF");
-
- AssembledDirectory ejbs = ear.mkdir("ejbs.jar");
- addPath(ejbs, "/weld/warwowb/ejb", "META-INF");
-
DeploymentUnit topDU = assertDeploy(ear);
try
{
@@ -124,8 +121,9 @@
protected void testJar(String type, boolean testCL) throws Exception
{
- AssembledDirectory topLevel = createAssembledDirectory("ejbs.jar", "ejbs.jar");
- addPath(topLevel, "/weld/" + type + "/ejb", "META-INF");
+ VirtualFile topLevel = VFS.getChild("ejbs.jar");
+ createAssembledDirectory(topLevel)
+ .addPath("/weld/" + type + "/ejb");
DeploymentUnit topDU = assertDeploy(topLevel);
try
@@ -141,8 +139,9 @@
protected void testWar(String type, boolean testCL, boolean testListner) throws Exception
{
- AssembledDirectory topLevel = createAssembledDirectory("web.war", "web.war");
- addPath(topLevel, "/weld/" + type + "/web", "WEB-INF");
+ VirtualFile topLevel = VFS.getChild("web.war");
+ createAssembledDirectory(topLevel)
+ .addPath("/weld/" + type + "/web");
DeploymentUnit topDU = assertDeploy(topLevel);
try
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -29,8 +29,8 @@
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.test.deployers.support.jar.PlainJavaBean;
-import org.jboss.virtual.AssembledDirectory;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
/**
@@ -77,36 +77,30 @@
public void testEar() throws Exception
{
- AssembledDirectory ear = createAssembledDirectory("jar-in-ear.ear", "jar-in-ear.ear");
- addPath(ear, "/weld/jarwarinear", "META-INF");
+ VirtualFile ear = VFS.getChild("jar-in-ear.ear");
+ createAssembledDirectory(ear)
+ .addPath("/weld/jarwarinear")
+ .addPackage("simple.jar", PlainJavaBean.class)
+ .addPackage("simple.war/WEB-INF/classes", PlainJavaBean.class)
+ .addPath("simple.war", "/weld/warwowb/web");
- AssembledDirectory jar = ear.mkdir("simple.jar");
- addPackage(jar, PlainJavaBean.class);
-
- AssembledDirectory war = ear.mkdir("simple.war");
- AssembledDirectory webinf = war.mkdir("WEB-INF");
- AssembledDirectory classes = webinf.mkdir("classes");
- addPackage(classes, PlainJavaBean.class);
- addPath(war, "/weld/warwowb/web", "WEB-INF");
-
testDeployment(ear);
}
public void testWar() throws Exception
{
- AssembledDirectory war = createAssembledDirectory("w1.war", "w1.war");
- AssembledDirectory webinf = war.mkdir("WEB-INF");
- AssembledDirectory classes = webinf.mkdir("classes");
- addPackage(classes, PlainJavaBean.class);
- addPath(war, "/weld/warwowb/web", "WEB-INF");
-
+ VirtualFile war = VFS.getChild("w1.war");
+ createAssembledDirectory(war)
+ .addPackage("WEB-INF/classes", PlainJavaBean.class)
+ .addPath("/weld/warwowb/web");
testDeployment(war);
}
public void testJar() throws Exception
{
- AssembledDirectory jar = createAssembledDirectory("j1.jar", "j1.jar");
- addPackage(jar, PlainJavaBean.class);
+ VirtualFile jar = VFS.getChild("j1.jar");
+ createAssembledDirectory(jar)
+ .addPackage(PlainJavaBean.class);
testDeployment(jar);
}
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/WeldDiscoveryEnvTestCase.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/WeldDiscoveryEnvTestCase.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer/src/test/java/org/jboss/test/deployers/test/WeldDiscoveryEnvTestCase.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -36,7 +36,7 @@
import org.jboss.test.deployers.support.jar.PlainJavaBean;
import org.jboss.test.deployers.support.ui.UIWebBean;
import org.jboss.test.deployers.support.web.ServletWebBean;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.env.WeldDiscoveryEnvironment;
/**
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -34,7 +34,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryVisitor;
import org.jboss.test.deployers.BootstrapDeployersTest;
-import org.jboss.virtual.AssembledDirectory;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.bootstrap.api.Bootstrap;
import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
import org.jboss.weld.integration.deployer.DeployersUtils;
@@ -155,18 +155,20 @@
// return jar;
// }
- protected void createMcLib(AssembledDirectory dir, String metaInfParent, Class<?> clazz) throws Exception
+ protected void createMcLib(VirtualFile dir, String metaInfParent, Class<?> clazz) throws Exception
{
- AssembledDirectory mcDir = dir.mkdir("mc.jar");
- addPackage(mcDir, clazz);
- addPath(mcDir, metaInfParent, "META-INF");
+ VirtualFile mcDir = dir.getChild("mc.jar");
+ createAssembledDirectory(mcDir)
+ .addPackage(clazz)
+ .addPath(metaInfParent);
}
- protected void createWeldLib(AssembledDirectory dir, String metaInfParent, Class<?> clazz) throws Exception
+ protected void createWeldLib(VirtualFile dir, String metaInfParent, Class<?> clazz) throws Exception
{
- AssembledDirectory weldDir = dir.mkdir("weld.jar");
- addPackage(weldDir, clazz);
- addPath(weldDir, metaInfParent, "META-INF");
+ VirtualFile weldDir = dir.getChild("weld.jar");
+ createAssembledDirectory(weldDir)
+ .addPackage(clazz)
+ .addPath(metaInfParent);
}
protected Class<?> findClass(DeploymentUnit unit, String name, boolean mustFind)
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -29,7 +29,8 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.test.deployers.support.mcandweld.mc.simple.SimpleBean;
import org.jboss.test.deployers.support.mcandweld.weld.simple.SimpleWebBean;
-import org.jboss.virtual.AssembledDirectory;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
import org.jboss.weld.integration.deployer.env.FlatDeployment;
@@ -53,8 +54,9 @@
public void testUninstallOfIntermediateBeanIfBeanManagerWasNotInstalled() throws Throwable
{
DeployerClient mainDeployer = getDeployerClient();
- AssembledDirectory ear = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(ear, "/weld/mcandweld/ear/weldandmc", "META-INF");
+ VirtualFile ear = VFS.getChild("top-level.ear");
+ createAssembledDirectory(ear)
+ .addPath("/weld/mcandweld/ear/weldandmc");
createMcLib(ear, "/weld/mcandweld/mc/simple", SimpleBean.class);
createWeldLib(ear, "/weld/mcandweld/weld", SimpleWebBean.class);
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java 2010-02-19 20:28:10 UTC (rev 101185)
@@ -42,8 +42,8 @@
import org.jboss.test.deployers.support.mcandweld.mc.simple.SimpleBean;
import org.jboss.test.deployers.support.mcandweld.weld.frommc.WeldBeanWithInjectedMcBean;
import org.jboss.test.deployers.support.mcandweld.weld.simple.SimpleWebBean;
-import org.jboss.virtual.AssembledDirectory;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
import org.jboss.weld.integration.deployer.env.FlatDeployment;
@@ -66,8 +66,9 @@
public void testMcDeployment() throws Exception
{
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/mconly", "META-INF");
+ VirtualFile top = VFS.getChild("top-level.ear");
+ createAssembledDirectory(top)
+ .addPath("/weld/mcandweld/ear/mconly");
createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
Deployment deployment = createVFSDeployment(top);
@@ -88,8 +89,9 @@
public void testWeldDeployment() throws Exception
{
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/weldonly", "META-INF");
+ VirtualFile top = VFS.getChild("top-level.ear");
+ createAssembledDirectory(top)
+ .addPath("/weld/mcandweld/ear/weldonly");
createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
testBootstrap(top, new RunSpecificTest()
@@ -103,8 +105,9 @@
public void testWeldAndMcDeployment() throws Exception
{
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
+ VirtualFile top = VFS.getChild("top-level.ear");
+ createAssembledDirectory(top)
+ .addPath("/weld/mcandweld/ear/weldandmc");
createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
@@ -124,8 +127,9 @@
public void testMcInjectedByWeld() throws Exception
{
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
+ VirtualFile top = VFS.getChild("top-level.ear");
+ createAssembledDirectory(top)
+ .addPath("/weld/mcandweld/ear/weldandmc");
createMcLib(top, "/weld/mcandweld/mc/fromweld", McBeanWithInjectedWeldBean.class);
createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
@@ -148,8 +152,9 @@
public void testWeldInjectedByMc() throws Exception
{
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
+ VirtualFile top = VFS.getChild("top-level.ear");
+ createAssembledDirectory(top)
+ .addPath("/weld/mcandweld/ear/weldandmc");
createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
createWeldLib(top, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
@@ -172,8 +177,9 @@
public void testMcInjectedIntoWeldInjectedIntoMc() throws Exception
{
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/bidirectional", "META-INF");
+ VirtualFile top = VFS.getChild("top-level.ear");
+ createAssembledDirectory(top)
+ .addPath("/weld/mcandweld/bidirectional");
createMcLib(top, "/weld/mcandweld/bidirectional/mc/end", First.class);
createWeldLib(top, "/weld/mcandweld/weld", Middle.class);
@@ -203,8 +209,9 @@
public void testWeldInjectedIntoMcInjectedIntoWeld() throws Exception
{
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/bidirectional", "META-INF");
+ VirtualFile top = VFS.getChild("top-level.ear");
+ createAssembledDirectory(top)
+ .addPath("/weld/mcandweld/bidirectional");
createMcLib(top, "/weld/mcandweld/bidirectional/mc/middle", Middle.class);
createWeldLib(top, "/weld/mcandweld/weld", First.class);
@@ -233,15 +240,17 @@
public void testExternalMcBeanInjectedIntoWeld() throws Exception
{
- AssembledDirectory mcEar = createAssembledDirectory("mc.ear", "mc.ear");
- addPath(mcEar, "/weld/mcandweld/ear/mconly", "META-INF");
+ VirtualFile mcEar = VFS.getChild("mc.ear");
+ createAssembledDirectory(mcEar)
+ .addPath("/weld/mcandweld/ear/mconly");
createMcLib(mcEar, "/weld/mcandweld/mc/simple", SimpleBean.class);
Deployment mc = deploy(mcEar);
try
{
- AssembledDirectory weldEar = createAssembledDirectory("weld.ear", "weld.ear");
- addPath(weldEar, "/weld/mcandweld/ear/weldonly", "META-INF");
+ VirtualFile weldEar = VFS.getChild("weld.ear");
+ createAssembledDirectory(weldEar)
+ .addPath("/weld/mcandweld/ear/weldonly");
createWeldLib(weldEar, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
testBootstrap(weldEar, new RunSpecificTest()
@@ -268,15 +277,17 @@
public void testExternalMcBeanInjectedIntoWeld2() throws Exception
{
- AssembledDirectory mcEar = createAssembledDirectory("mc.ear", "mc.ear");
- addPath(mcEar, "/weld/mcandweld/ear/mconly", "META-INF");
+ VirtualFile mcEar = VFS.getChild("mc.ear");
+ createAssembledDirectory(mcEar)
+ .addPath("/weld/mcandweld/ear/mconly");
createMcLib(mcEar, "/weld/mcandweld/mc/simple", SimpleBean.class);
Deployment mc = deploy(mcEar);
undeploy(mc);
- AssembledDirectory weldEar = createAssembledDirectory("weld.ear", "weld.ear");
- addPath(weldEar, "/weld/mcandweld/ear/weldonly", "META-INF");
+ VirtualFile weldEar = VFS.getChild("weld.ear");
+ createAssembledDirectory(weldEar)
+ .addPath("/weld/mcandweld/ear/weldonly");
createWeldLib(weldEar, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
try
Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/pom.xml
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/pom.xml 2010-02-19 19:47:10 UTC (rev 101184)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/pom.xml 2010-02-19 20:28:10 UTC (rev 101185)
@@ -7,7 +7,7 @@
</parent>
<groupId>org.jboss.weld.integration</groupId>
<artifactId>weld-jboss-int</artifactId>
- <version>6.0.0.Beta7</version>
+ <version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Weld JBoss AS Integration Aggregator</name>
<scm>
@@ -27,18 +27,18 @@
<properties>
<version.weld>1.0.1-CR2</version.weld>
<version.jboss.interceptor>1.0.0-CR11</version.jboss.interceptor>
- <version.jboss.vfs>2.2.0.Alpha2</version.jboss.vfs>
+ <version.jboss.vfs>3.0.0.CR1</version.jboss.vfs>
<version.jboss.man>2.1.1.SP1</version.jboss.man>
<version.jboss.microcontainer>2.2.0.Alpha4</version.jboss.microcontainer>
- <version.jboss.cl>2.2.0.Alpha1</version.jboss.cl>
- <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers>
+ <version.jboss.cl>2.2.0.Alpha3</version.jboss.cl>
+ <version.jboss.deployers>2.2.0.Alpha2</version.jboss.deployers>
<version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
<version.jboss.logging.spi>2.2.0.CR1</version.jboss.logging.spi>
<version.jboss.classloading.spi>6.0.0-Alpha8</version.jboss.classloading.spi>
<version.jboss.transaction.spi>6.0.0-Alpha8</version.jboss.transaction.spi>
<version.jboss.metadata>2.0.0-alpha-5</version.jboss.metadata>
<version.jbossxb>2.0.2.Beta4</version.jbossxb>
- <version.jboss.ejb3>1.0.0</version.jboss.ejb3>
+ <version.jboss.ejb3>1.0.2</version.jboss.ejb3>
<version.jboss.ejb3.core>1.1.5</version.jboss.ejb3.core>
<version.jboss.ejb3.endpoint>0.1.3</version.jboss.ejb3.endpoint>
<version.jboss.ejb.api>3.0.0.GA_SP1</version.jboss.ejb.api>
More information about the jboss-cvs-commits
mailing list