[jboss-cvs] JBossAS SVN: r99008 - in projects/ejb3/branches/vfs3-int: aop-deployers/src/main/java/org/jboss/aop/asintegration/jboss5 and 34 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 4 18:39:01 EST 2010
Author: johnbailey
Date: 2010-01-04 18:39:00 -0500 (Mon, 04 Jan 2010)
New Revision: 99008
Modified:
projects/ejb3/branches/vfs3-int/aop-deployers/pom.xml
projects/ejb3/branches/vfs3-int/aop-deployers/src/main/java/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java
projects/ejb3/branches/vfs3-int/api/pom.xml
projects/ejb3/branches/vfs3-int/api/src/test/java/org/jboss/ejb3/api/test/signature/unit/SignatureUnitTestCase.java
projects/ejb3/branches/vfs3-int/build/pom.xml
projects/ejb3/branches/vfs3-int/concurrency/pom.xml
projects/ejb3/branches/vfs3-int/concurrency/src/test/java/org/jboss/ejb3/concurrency/test/common/AbstractBootstrapTestCase.java
projects/ejb3/branches/vfs3-int/core/pom.xml
projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/ClassFileFilter.java
projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/ClientDescriptorFileFilter.java
projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/DeploymentUnit.java
projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/EJBContainer.java
projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java
projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/injection/InjectionContainer.java
projects/ejb3/branches/vfs3-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java
projects/ejb3/branches/vfs3-int/core/src/test/java/org/jboss/injection/test/common/DummyInjectionContainer.java
projects/ejb3/branches/vfs3-int/deployers/src/main/java/org/jboss/ejb3/deployers/EjbAnnotationMetaDataDeployer.java
projects/ejb3/branches/vfs3-int/ejb3_1/pom.xml
projects/ejb3/branches/vfs3-int/embedded/pom.xml
projects/ejb3/branches/vfs3-int/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java
projects/ejb3/branches/vfs3-int/embedded/src/main/java/org/jboss/ejb3/embedded/deployment/EmbeddedEjb3DeploymentUnit.java
projects/ejb3/branches/vfs3-int/embedded/src/main/java/org/jboss/ejb3/embedded/dsl/DeploymentBuilder.java
projects/ejb3/branches/vfs3-int/endpoint-deployer/pom.xml
projects/ejb3/branches/vfs3-int/endpoint-deployer/src/test/java/org/jboss/ejb3/endpoint/deployers/test/simple/unit/DeployEndpointTestCase.java
projects/ejb3/branches/vfs3-int/endpoint-deployer/src/test/resources/conf/bootstrap/deployers.xml
projects/ejb3/branches/vfs3-int/jta-profile/pom.xml
projects/ejb3/branches/vfs3-int/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/lookup/unit/LookupTransactionManagerTestCase.java
projects/ejb3/branches/vfs3-int/metrics-deployer/pom.xml
projects/ejb3/branches/vfs3-int/nointerface/pom.xml
projects/ejb3/branches/vfs3-int/profile3_1/pom.xml
projects/ejb3/branches/vfs3-int/profile3_1/src/it/common/src/main/java/org/jboss/ejb3/profile3_1/test/common/AbstractProfile3_1_TestCase.java
projects/ejb3/branches/vfs3-int/singleton/pom.xml
projects/ejb3/branches/vfs3-int/singleton/src/test/java/org/jboss/ejb3/singleton/test/common/MockDeploymentUnit.java
projects/ejb3/branches/vfs3-int/timerservice-mk2/pom.xml
projects/ejb3/branches/vfs3-int/timerservice-mk2/src/test/java/org/jboss/ejb3/timerservice/mk2/test/common/AbstractTimerTestCase.java
projects/ejb3/branches/vfs3-int/timerservice-quartz/pom.xml
projects/ejb3/branches/vfs3-int/timerservice-quartz/src/test/java/org/jboss/ejb3/timerservice/quartz/test/simple/unit/SimpleUnitTestCase.java
projects/ejb3/branches/vfs3-int/transactions/pom.xml
projects/ejb3/branches/vfs3-int/transactions/src/test/java/org/jboss/ejb3/test/tx/common/AspectDeployment.java
projects/ejb3/branches/vfs3-int/transactions/src/test/resources/instance/deployers.xml
Log:
[JBAS-7346] - Initial work at integrating VFS3 into EJB3. Still more work to fully integrate
Modified: projects/ejb3/branches/vfs3-int/aop-deployers/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/aop-deployers/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/aop-deployers/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>2.0.5.GA</version>
+ <version>2.2.0-SNAPSHOT</version>
</dependency>
<!--
<dependency>
Modified: projects/ejb3/branches/vfs3-int/aop-deployers/src/main/java/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java
===================================================================
--- projects/ejb3/branches/vfs3-int/aop-deployers/src/main/java/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/aop-deployers/src/main/java/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -26,6 +26,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import javassist.bytecode.ClassFile;
@@ -40,12 +41,11 @@
import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VisitorAttributes;
-import org.jboss.virtual.plugins.context.jar.JarUtils;
-import org.jboss.virtual.plugins.vfs.helpers.FilterVirtualFileVisitor;
-import org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
+import org.jboss.vfs.VisitorAttributes;
+import org.jboss.vfs.util.FilterVirtualFileVisitor;
+import org.jboss.vfs.util.SuffixesExcludeFilter;
/**
* Reads the annotations and converts them into AOP metadata to be deployed properly
@@ -154,7 +154,7 @@
VisitorAttributes va = new VisitorAttributes();
va.setLeavesOnly(true);
ClassFileFilter filter = new ClassFileFilter();
- SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(JarUtils.getSuffixes());
+ SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(Arrays.asList(".zip", ".ear", ".jar", ".rar", ".war", ".sar",".har", ".aop")); // TODO: Where should these come from??
va.setRecurseFilter(noJars);
FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(filter, va);
@@ -177,14 +177,7 @@
{
public boolean accepts(VirtualFile file)
{
- try
- {
- return file.isLeaf() && file.getName().endsWith(".class");
- }
- catch (IOException e)
- {
- throw new RuntimeException("Error visiting file: " + file.getName(), e);
- }
+ return file.isLeaf() && file.getName().endsWith(".class");
}
}
}
Modified: projects/ejb3/branches/vfs3-int/api/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/api/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/api/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
- <version>2.0.1.GA</version>
+ <version>3.0.0.CR1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: projects/ejb3/branches/vfs3-int/api/src/test/java/org/jboss/ejb3/api/test/signature/unit/SignatureUnitTestCase.java
===================================================================
--- projects/ejb3/branches/vfs3-int/api/src/test/java/org/jboss/ejb3/api/test/signature/unit/SignatureUnitTestCase.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/api/src/test/java/org/jboss/ejb3/api/test/signature/unit/SignatureUnitTestCase.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -39,10 +39,10 @@
import javax.transaction.UserTransaction;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileVisitor;
-import org.jboss.virtual.VisitorAttributes;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileVisitor;
+import org.jboss.vfs.VisitorAttributes;
import org.junit.Test;
/**
@@ -202,7 +202,7 @@
String path = System.getProperty("javax.ejb.jar.path");
assertNotNull("javax.ejb.jar.path not set", path);
URI rootURI = new File(path).toURI();
- VirtualFile file = VFS.getRoot(rootURI);
+ VirtualFile file = VFS.getChild(rootURI);
final Set<String> classNames = new HashSet<String>();
VirtualFileVisitor visitor = new VirtualFileVisitor() {
public VisitorAttributes getAttributes()
Modified: projects/ejb3/branches/vfs3-int/build/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/build/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/build/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -102,10 +102,10 @@
<version.ant_ant>1.6.5</version.ant_ant>
<version.commons-validator_commons-validator>1.3.1</version.commons-validator_commons-validator>
<version.junit_junit>4.4</version.junit_junit>
- <version.org.jboss.aop_jboss-aop>2.1.1.GA</version.org.jboss.aop_jboss-aop>
- <version.org.jboss.aop_jboss-aop-aspects>2.0.0.SP1</version.org.jboss.aop_jboss-aop-aspects>
+ <version.org.jboss.aop_jboss-aop>2.1.0-SNAPSHOT</version.org.jboss.aop_jboss-aop>
+ <version.org.jboss.aop_jboss-aop-aspects>2.1.0-SNAPSHOT</version.org.jboss.aop_jboss-aop-aspects>
<version.org.jboss.common.core>2.2.14.GA</version.org.jboss.common.core>
- <version.org.jboss.deployers>2.0.0.CR5</version.org.jboss.deployers>
+ <version.org.jboss.deployers>2.2.0-SNAPSHOT</version.org.jboss.deployers>
<version.org.jboss.jbossxb>2.0.1.GA</version.org.jboss.jbossxb>
<version.org.jboss.microcontainer>2.0.8.GA</version.org.jboss.microcontainer>
<version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>
@@ -320,20 +320,20 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
- <version>2.0.5.GA</version>
+ <version>2.2.0.CR1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
- <version>2.0.5.GA</version>
+ <version>2.2.0.CR1</version>
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- <version>1.0.0.CR16</version>
+ <artifactId>jboss-metadata-ejb</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: projects/ejb3/branches/vfs3-int/concurrency/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/concurrency/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/concurrency/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.2</version>
+ <version>1.0.9-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
- <version>2.1.0.GA</version>
+ <version>3.0.0.CR1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
- <version>2.0.5.GA</version>
+ <version>2.2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-api</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
Modified: projects/ejb3/branches/vfs3-int/concurrency/src/test/java/org/jboss/ejb3/concurrency/test/common/AbstractBootstrapTestCase.java
===================================================================
--- projects/ejb3/branches/vfs3-int/concurrency/src/test/java/org/jboss/ejb3/concurrency/test/common/AbstractBootstrapTestCase.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/concurrency/src/test/java/org/jboss/ejb3/concurrency/test/common/AbstractBootstrapTestCase.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -36,8 +36,8 @@
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -104,7 +104,7 @@
// }
// TODO: another hack that simulates profile service going through deploy dir
- VirtualFile deployDir = VFS.getRoot(findDirURI("src/test/resources/deploy"));
+ VirtualFile deployDir = VFS.getChild(findDirURI("src/test/resources/deploy"));
List<VirtualFile> candidates = deployDir.getChildren();
for(VirtualFile candidate : candidates)
{
Modified: projects/ejb3/branches/vfs3-int/core/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/core/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/core/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -201,7 +201,7 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <artifactId>jboss-metadata-ejb</artifactId>
<exclusions>
<!-- jboss-metadata must not dictate the JPA API -->
<exclusion>
@@ -239,7 +239,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
- <version>2.0.0.CR1</version>
+ <version>3.0.0.CR1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/ClassFileFilter.java
===================================================================
--- projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/ClassFileFilter.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/ClassFileFilter.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -21,11 +21,9 @@
*/
package org.jboss.ejb3;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
+import org.jboss.vfs.VirtualFile;
-import java.io.IOException;
-
/**
* Comment
*
@@ -36,13 +34,6 @@
{
public boolean accepts(VirtualFile file)
{
- try
- {
- return file.isLeaf() && file.getName().endsWith(".class");
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
+ return file.isFile() && file.getName().endsWith(".class");
}
}
Modified: projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/ClientDescriptorFileFilter.java
===================================================================
--- projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/ClientDescriptorFileFilter.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/ClientDescriptorFileFilter.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -21,11 +21,9 @@
*/
package org.jboss.ejb3;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
+import org.jboss.vfs.VirtualFile;
-import java.io.IOException;
-
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
@@ -33,23 +31,16 @@
{
public boolean accepts(VirtualFile file)
{
- try
+ if (file.isFile())
{
- if (file.isLeaf())
+ if (file.getName().equals("application-client.xml") || file.getName().equals("jboss-client.xml"))
{
- if (file.getName().equals("application-client.xml") || file.getName().equals("jboss-client.xml"))
- {
- VirtualFile parent = file.getParent();
- if (parent != null && parent.getName().equals("META-INF"))
- return true;
- }
+ VirtualFile parent = file.getParent();
+ if (parent.exists() && parent.getName().equals("META-INF"))
+ return true;
}
-
- return false;
}
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
+
+ return false;
}
}
Modified: projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/DeploymentUnit.java
===================================================================
--- projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/DeploymentUnit.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/DeploymentUnit.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -27,8 +27,8 @@
import java.util.Map;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
/**
* Comment
Modified: projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/EJBContainer.java
===================================================================
--- projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/EJBContainer.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/EJBContainer.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -116,7 +116,7 @@
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.util.StringPropertyReplacer;
import org.jboss.util.naming.Util;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Comment
Modified: projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java
===================================================================
--- projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -72,7 +72,7 @@
import org.jboss.metadata.javaee.spec.Environment;
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* An EjbModule represents a collection of beans that are deployed as a unit.
Modified: projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/injection/InjectionContainer.java
===================================================================
--- projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/injection/InjectionContainer.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/injection/InjectionContainer.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -34,7 +34,7 @@
import org.jboss.ejb3.Container;
import org.jboss.ejb3.DependencyPolicy;
import org.jboss.metadata.javaee.spec.RemoteEnvironment;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* This is the container that manages all injections. Could be an EJB Container
Modified: projects/ejb3/branches/vfs3-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java
===================================================================
--- projects/ejb3/branches/vfs3-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -30,8 +30,8 @@
import org.jboss.ejb3.DeploymentUnit;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
/**
* Comment
@@ -175,7 +175,7 @@
}
/* (non-Javadoc)
- * @see org.jboss.ejb3.DeploymentUnit#getResources(org.jboss.virtual.VirtualFileFilter)
+ * @see org.jboss.ejb3.DeploymentUnit#getResources(org.jboss.vfs.VirtualFileFilter)
*/
public List<VirtualFile> getResources(VirtualFileFilter filter)
{
Modified: projects/ejb3/branches/vfs3-int/core/src/test/java/org/jboss/injection/test/common/DummyInjectionContainer.java
===================================================================
--- projects/ejb3/branches/vfs3-int/core/src/test/java/org/jboss/injection/test/common/DummyInjectionContainer.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/core/src/test/java/org/jboss/injection/test/common/DummyInjectionContainer.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -38,7 +38,7 @@
import org.jboss.injection.InjectionContainer;
import org.jboss.injection.Injector;
import org.jboss.metadata.javaee.spec.RemoteEnvironment;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
Modified: projects/ejb3/branches/vfs3-int/deployers/src/main/java/org/jboss/ejb3/deployers/EjbAnnotationMetaDataDeployer.java
===================================================================
--- projects/ejb3/branches/vfs3-int/deployers/src/main/java/org/jboss/ejb3/deployers/EjbAnnotationMetaDataDeployer.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/deployers/src/main/java/org/jboss/ejb3/deployers/EjbAnnotationMetaDataDeployer.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -40,7 +40,7 @@
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
Modified: projects/ejb3/branches/vfs3-int/ejb3_1/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/ejb3_1/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/ejb3_1/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -4,7 +4,7 @@
<parent>
<artifactId>jboss-ejb3-build</artifactId>
<groupId>org.jboss.ejb3</groupId>
- <version>1.0.8</version>
+ <version>1.0.9-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: projects/ejb3/branches/vfs3-int/embedded/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/embedded/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/embedded/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -20,9 +20,9 @@
</description>
<properties>
- <version.org.jboss.deployers>2.0.5.GA</version.org.jboss.deployers>
+ <version.org.jboss.deployers>2.2.0-SNAPSHOT</version.org.jboss.deployers>
<version.org.jboss.microcontainer>2.0.4.GA</version.org.jboss.microcontainer>
- <version.org.jboss.ejb3_jboss-ejb3-deployers>1.0.1</version.org.jboss.ejb3_jboss-ejb3-deployers>
+ <version.org.jboss.ejb3_jboss-ejb3-deployers>1.1.0-SNAPSHOT</version.org.jboss.ejb3_jboss-ejb3-deployers>
</properties>
<build>
@@ -172,7 +172,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
- <version>2.1.0.GA</version>
+ <version>3.0.0.CR1-SNAPSHOT</version>
</dependency>
<!-- TODO: there is no equivelant in AS 5.0.1 -->
<dependency>
@@ -194,7 +194,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
- <version>1.0.0</version>
+ <version>1.1.23-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>bsh</groupId>
Modified: projects/ejb3/branches/vfs3-int/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java
===================================================================
--- projects/ejb3/branches/vfs3-int/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.net.MalformedURLException;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -48,8 +49,8 @@
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
@@ -173,14 +174,14 @@
}
}
- public Deployment deploy(URL url) throws DeploymentException, IOException
+ public Deployment deploy(URL url) throws DeploymentException, URISyntaxException
{
- VirtualFile root = VFS.getRoot(url);
+ VirtualFile root = VFS.getChild(url);
VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(root);
return deploy(deployment);
}
- protected void deployDeployDirectory() throws DeploymentException, IOException
+ protected void deployDeployDirectory() throws DeploymentException, URISyntaxException
{
URL deployDirURL = classLoader.getResource("deploy");
if(deployDirURL == null)
@@ -191,7 +192,7 @@
}
List<Deployment> deployments = new ArrayList<Deployment>();
- VirtualFile deployDir = VFS.getRoot(deployDirURL);
+ VirtualFile deployDir = VFS.getChild(deployDirURL);
for(VirtualFile child : deployDir.getChildren())
{
VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(child);
@@ -201,13 +202,13 @@
mainDeployer.deploy(deployments.toArray(new Deployment[0]));
}
- private void deployMain(String name) throws DeploymentException, IllegalArgumentException, MalformedURLException, IOException
+ private void deployMain(String name) throws DeploymentException, IllegalArgumentException, MalformedURLException, URISyntaxException
{
URL url = getResource(name);
deploy(url);
}
- private void deployModules(String modules[]) throws MalformedURLException, IOException, DeploymentException
+ private void deployModules(String modules[]) throws MalformedURLException, URISyntaxException, DeploymentException
{
// TODO: deploy the world!
if(modules == null)
Modified: projects/ejb3/branches/vfs3-int/embedded/src/main/java/org/jboss/ejb3/embedded/deployment/EmbeddedEjb3DeploymentUnit.java
===================================================================
--- projects/ejb3/branches/vfs3-int/embedded/src/main/java/org/jboss/ejb3/embedded/deployment/EmbeddedEjb3DeploymentUnit.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/embedded/src/main/java/org/jboss/ejb3/embedded/deployment/EmbeddedEjb3DeploymentUnit.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -28,8 +28,8 @@
import org.jboss.ejb3.DeploymentUnit;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
/**
* A wrapper around the MC DeploymentUnit.
@@ -189,7 +189,7 @@
}
/* (non-Javadoc)
- * @see org.jboss.ejb3.DeploymentUnit#getResources(org.jboss.virtual.VirtualFileFilter)
+ * @see org.jboss.ejb3.DeploymentUnit#getResources(org.jboss.vfs.VirtualFileFilter)
*/
public List<VirtualFile> getResources(VirtualFileFilter filter)
{
Modified: projects/ejb3/branches/vfs3-int/embedded/src/main/java/org/jboss/ejb3/embedded/dsl/DeploymentBuilder.java
===================================================================
--- projects/ejb3/branches/vfs3-int/embedded/src/main/java/org/jboss/ejb3/embedded/dsl/DeploymentBuilder.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/embedded/src/main/java/org/jboss/ejb3/embedded/dsl/DeploymentBuilder.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -22,14 +22,15 @@
package org.jboss.ejb3.embedded.dsl;
import java.io.IOException;
+import java.net.URISyntaxException;
import java.net.URL;
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.spi.attachments.MutableAttachments;
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
@@ -44,7 +45,7 @@
URL url = new URL("vfsmemory", name, "");
return deployment(url, attachments);
}
- catch(IOException e)
+ catch(Exception e)
{
throw new RuntimeException(e);
}
@@ -55,21 +56,21 @@
try
{
URL url = new URL("vfsmemory", name, "");
- VirtualFile root = VFS.getRoot(url);
+ VirtualFile root = VFS.getChild(url);
VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(root);
MutableAttachments attachments = (MutableAttachments) deployment.getPredeterminedManagedObjects();
attachments.addAttachment(attachmentType, attachment);
return deployment;
}
- catch(IOException e)
+ catch(Exception e)
{
throw new RuntimeException(e);
}
}
- public static Deployment deployment(URL url) throws IOException
+ public static Deployment deployment(URL url) throws URISyntaxException
{
- VirtualFile root = VFS.getRoot(url);
+ VirtualFile root = VFS.getChild(url);
VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(root);
/*
MutableAttachments attachments = (MutableAttachments) deployment.getPredeterminedManagedObjects();
@@ -96,9 +97,9 @@
return deployment;
}
- public static Deployment deployment(URL url, Attachment<?>... attachments) throws IOException
+ public static Deployment deployment(URL url, Attachment<?>... attachments) throws URISyntaxException
{
- VirtualFile root = VFS.getRoot(url);
+ VirtualFile root = VFS.getChild(url);
VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(root);
MutableAttachments managedObjects = (MutableAttachments) deployment.getPredeterminedManagedObjects();
for(Attachment<?> attachment : attachments)
Modified: projects/ejb3/branches/vfs3-int/endpoint-deployer/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/endpoint-deployer/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/endpoint-deployer/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.2</version>
+ <version>1.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -23,9 +23,9 @@
<url>http://www.jboss.org/jbossejb3</url>
<properties>
- <version.org.jboss.aop>2.1.0.CR3</version.org.jboss.aop>
- <version.org.jboss.cl>2.2.0.M4</version.org.jboss.cl>
- <version.org.jboss.deployers>2.2.0.M2</version.org.jboss.deployers>
+ <version.org.jboss.aop>2.1.0-SNAPSHOT</version.org.jboss.aop>
+ <version.org.jboss.cl>2.2.0-SNAPSHOT</version.org.jboss.cl>
+ <version.org.jboss.deployers>2.2.0-SNAPSHOT</version.org.jboss.deployers>
<version.org.jboss.microcontainer>2.2.0.M1</version.org.jboss.microcontainer>
</properties>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
- <version>2.2.0.M2</version>
+ <version>3.0.0.CR1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: projects/ejb3/branches/vfs3-int/endpoint-deployer/src/test/java/org/jboss/ejb3/endpoint/deployers/test/simple/unit/DeployEndpointTestCase.java
===================================================================
--- projects/ejb3/branches/vfs3-int/endpoint-deployer/src/test/java/org/jboss/ejb3/endpoint/deployers/test/simple/unit/DeployEndpointTestCase.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/endpoint-deployer/src/test/java/org/jboss/ejb3/endpoint/deployers/test/simple/unit/DeployEndpointTestCase.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -29,6 +29,7 @@
import java.lang.reflect.Proxy;
import java.net.MalformedURLException;
import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.List;
import java.util.Properties;
@@ -47,8 +48,8 @@
import org.jboss.ejb3.endpoint.deployers.test.simple.StatefulGreeter;
import org.jboss.ejb3.endpoint.reflect.EndpointInvocationHandler;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -95,7 +96,7 @@
mainDeployer = (MainDeployer) server.getKernel().getController().getContext("MainDeployer", ControllerState.INSTALLED).getTarget();
// TODO: another hack that simulates profile service going through deploy dir
- VirtualFile deployDir = VFS.getRoot(findDirURI("src/test/resources/deploy"));
+ VirtualFile deployDir = VFS.getChild(findDirURI("src/test/resources/deploy"));
deployDir(deployDir);
// TODO:
@@ -108,7 +109,7 @@
deploy(getURLToTestClasses());
}
- protected static void deployResource(String name) throws DeploymentException, IOException
+ protected static void deployResource(String name) throws DeploymentException, URISyntaxException
{
URL url = Thread.currentThread().getContextClassLoader().getResource(name);
if(url == null)
@@ -116,10 +117,10 @@
deploy(url);
}
- protected static void deploy(URL url) throws DeploymentException, IOException
+ protected static void deploy(URL url) throws DeploymentException, URISyntaxException
{
log.info("Deploying " + url);
- VirtualFile root = VFS.getRoot(url);
+ VirtualFile root = VFS.getChild(url);
VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(root);
mainDeployer.deploy(deployment);
}
Modified: projects/ejb3/branches/vfs3-int/endpoint-deployer/src/test/resources/conf/bootstrap/deployers.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/endpoint-deployer/src/test/resources/conf/bootstrap/deployers.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/endpoint-deployer/src/test/resources/conf/bootstrap/deployers.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -109,7 +109,7 @@
<bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
<!-- A filter to exclude some obvious non-subdeployments -->
<property name="filter">
- <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
+ <bean name="JARFilter" class="org.jboss.vfs.util.SuffixesExcludeFilter">
<constructor><parameter>
<list elementClass="java.lang.String">
<!-- Exclude class files as subdeployments -->
@@ -233,7 +233,7 @@
<classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
</property>
</bean>
- <bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/>
+ <!-- bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/ -->
<bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
<bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
<property name="classLoading"><inject bean="ClassLoading"/></property>
Modified: projects/ejb3/branches/vfs3-int/jta-profile/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/jta-profile/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/jta-profile/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.1</version>
+ <version>1.0.9-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: projects/ejb3/branches/vfs3-int/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/lookup/unit/LookupTransactionManagerTestCase.java
===================================================================
--- projects/ejb3/branches/vfs3-int/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/lookup/unit/LookupTransactionManagerTestCase.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/lookup/unit/LookupTransactionManagerTestCase.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -43,8 +43,8 @@
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -95,7 +95,7 @@
URL url = new File("src/main/resources").toURI().toURL();
log.debug("url = " + url);
- VirtualFile root = VFS.getRoot(url);
+ VirtualFile root = VFS.getChild(url);
VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(root);
mainDeployer.deploy(deployment);
mainDeployer.checkComplete(deployment);
Modified: projects/ejb3/branches/vfs3-int/metrics-deployer/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/metrics-deployer/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/metrics-deployer/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -27,7 +27,7 @@
<properties>
<!-- Versioning -->
- <version.org.jboss.deployers.jboss_deployers_spi>2.0.7.GA</version.org.jboss.deployers.jboss_deployers_spi>
+ <version.org.jboss.deployers.jboss_deployers_spi>2.2.0-SNAPSHOT</version.org.jboss.deployers.jboss_deployers_spi>
<version.org.jboss.ejb3_jboss.ejb3.core>1.1.10</version.org.jboss.ejb3_jboss.ejb3.core>
<version.org.jboss.man_jboss.managed>2.1.0.SP1</version.org.jboss.man_jboss.managed>
<version.org.jboss.microcontainer_jboss.jmx.mc.int>2.2.0.M2</version.org.jboss.microcontainer_jboss.jmx.mc.int>
Modified: projects/ejb3/branches/vfs3-int/nointerface/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/nointerface/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/nointerface/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -22,7 +22,7 @@
<description>No-Interface implementation for EJB as defined by section 3.4.4 in EJB3.1 spec</description>
<properties>
- <version.org.jboss.deployers>2.0.8.GA</version.org.jboss.deployers>
+ <version.org.jboss.deployers>2.2.0-SNAPSHOT</version.org.jboss.deployers>
<version.org.jboss.microcontainer>2.0.8.GA</version.org.jboss.microcontainer>
<version.org.jboss_jbossxb>2.0.1.GA</version.org.jboss_jbossxb>
<version.javassist>3.7.1.GA</version.javassist>
@@ -138,7 +138,7 @@
<!-- JBoss Metadata -->
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <artifactId>jboss-metadata-ejb</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss</groupId>
Modified: projects/ejb3/branches/vfs3-int/profile3_1/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/profile3_1/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/profile3_1/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -21,8 +21,8 @@
<properties>
<version.org.jboss.ejb3.jboss-ejb3-embedded>1.0.0-SNAPSHOT</version.org.jboss.ejb3.jboss-ejb3-embedded>
- <version.org.jboss.deployers>2.0.3.GA</version.org.jboss.deployers>
- <version.org.jboss_jboss-vfs>2.0.1.GA</version.org.jboss_jboss-vfs>
+ <version.org.jboss.deployers>2.2.0-SNAPSHOT</version.org.jboss.deployers>
+ <version.org.jboss_jboss-vfs>3.0.0.CR1-SNAPSHOT</version.org.jboss_jboss-vfs>
<version.org.jboss.bootstrap_jboss-bootstrap>1.0.0-Beta-1</version.org.jboss.bootstrap_jboss-bootstrap>
<version.org.jboss.jpa_jboss-jpa-deployers>1.0.0-Beta6</version.org.jboss.jpa_jboss-jpa-deployers>
<version.org.jboss.ejb3_jboss-ejb3-deployers>1.0.1-SNAPSHOT</version.org.jboss.ejb3_jboss-ejb3-deployers>
Modified: projects/ejb3/branches/vfs3-int/profile3_1/src/it/common/src/main/java/org/jboss/ejb3/profile3_1/test/common/AbstractProfile3_1_TestCase.java
===================================================================
--- projects/ejb3/branches/vfs3-int/profile3_1/src/it/common/src/main/java/org/jboss/ejb3/profile3_1/test/common/AbstractProfile3_1_TestCase.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/profile3_1/src/it/common/src/main/java/org/jboss/ejb3/profile3_1/test/common/AbstractProfile3_1_TestCase.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -36,8 +36,8 @@
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* AbstractProfile3_1_TestCase
@@ -298,7 +298,7 @@
}
logger.debug("Deploying " + deployURL);
MainDeployer mainDeployer = getMainDeployer();
- VirtualFile root = VFS.getRoot(deployURL);
+ VirtualFile root = VFS.getChild(deployURL);
VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(root);
mainDeployer.deploy(deployment);
mainDeployer.checkComplete(deployment);
Modified: projects/ejb3/branches/vfs3-int/singleton/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/singleton/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/singleton/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-api</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: projects/ejb3/branches/vfs3-int/singleton/src/test/java/org/jboss/ejb3/singleton/test/common/MockDeploymentUnit.java
===================================================================
--- projects/ejb3/branches/vfs3-int/singleton/src/test/java/org/jboss/ejb3/singleton/test/common/MockDeploymentUnit.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/singleton/src/test/java/org/jboss/ejb3/singleton/test/common/MockDeploymentUnit.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -28,8 +28,8 @@
import org.jboss.ejb3.DeploymentUnit;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
/**
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
@@ -187,7 +187,7 @@
}
/* (non-Javadoc)
- * @see org.jboss.ejb3.DeploymentUnit#getResources(org.jboss.virtual.VirtualFileFilter)
+ * @see org.jboss.ejb3.DeploymentUnit#getResources(org.jboss.vfs.VirtualFileFilter)
*/
public List<VirtualFile> getResources(VirtualFileFilter filter)
{
Modified: projects/ejb3/branches/vfs3-int/timerservice-mk2/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/timerservice-mk2/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/timerservice-mk2/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.2</version>
+ <version>1.0.9-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-api</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
Modified: projects/ejb3/branches/vfs3-int/timerservice-mk2/src/test/java/org/jboss/ejb3/timerservice/mk2/test/common/AbstractTimerTestCase.java
===================================================================
--- projects/ejb3/branches/vfs3-int/timerservice-mk2/src/test/java/org/jboss/ejb3/timerservice/mk2/test/common/AbstractTimerTestCase.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/timerservice-mk2/src/test/java/org/jboss/ejb3/timerservice/mk2/test/common/AbstractTimerTestCase.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -40,8 +40,8 @@
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -105,7 +105,7 @@
}
// TODO: another hack that simulates profile service going through deploy dir
- VirtualFile deployDir = VFS.getRoot(findDirURI("src/test/resources/deploy"));
+ VirtualFile deployDir = VFS.getChild(findDirURI("src/test/resources/deploy"));
List<VirtualFile> candidates = deployDir.getChildren();
for(VirtualFile candidate : candidates)
{
@@ -118,7 +118,7 @@
protected static void deploy(URL url) throws DeploymentException, IOException
{
- VirtualFile root = VFS.getRoot(url);
+ VirtualFile root = VFS.getChild(url);
VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(root);
mainDeployer.deploy(deployment);
mainDeployer.checkComplete(deployment);
Modified: projects/ejb3/branches/vfs3-int/timerservice-quartz/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/timerservice-quartz/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/timerservice-quartz/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.0</version>
+ <version>1.0.9-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: projects/ejb3/branches/vfs3-int/timerservice-quartz/src/test/java/org/jboss/ejb3/timerservice/quartz/test/simple/unit/SimpleUnitTestCase.java
===================================================================
--- projects/ejb3/branches/vfs3-int/timerservice-quartz/src/test/java/org/jboss/ejb3/timerservice/quartz/test/simple/unit/SimpleUnitTestCase.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/timerservice-quartz/src/test/java/org/jboss/ejb3/timerservice/quartz/test/simple/unit/SimpleUnitTestCase.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -46,8 +46,8 @@
import org.jboss.ejb3.timerservice.spi.TimerServiceFactory;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -105,7 +105,7 @@
URL url = new File("src/main/resources").toURI().toURL();
log.debug("url = " + url);
- VirtualFile root = VFS.getRoot(url);
+ VirtualFile root = VFS.getChild(url);
VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(root);
mainDeployer.deploy(deployment);
mainDeployer.checkComplete(deployment);
Modified: projects/ejb3/branches/vfs3-int/transactions/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/transactions/pom.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/transactions/pom.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.5</version>
+ <version>1.0.9-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -21,8 +21,8 @@
</description>
<properties>
- <version.org.jboss.deployers>2.2.0.M2</version.org.jboss.deployers>
- <version.org.jboss.aop>2.1.1.GA</version.org.jboss.aop>
+ <version.org.jboss.deployers>2.2.0-SNAPSHOT</version.org.jboss.deployers>
+ <version.org.jboss.aop>2.1.0-SNAPSHOT</version.org.jboss.aop>
<version.org.jboss.microcontainer>2.2.0.M1</version.org.jboss.microcontainer>
</properties>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
- <version>2.2.0.M2</version>
+ <version>3.0.0.CR1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
@@ -158,7 +158,7 @@
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <artifactId>jboss-metadata-ejb</artifactId>
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
Modified: projects/ejb3/branches/vfs3-int/transactions/src/test/java/org/jboss/ejb3/test/tx/common/AspectDeployment.java
===================================================================
--- projects/ejb3/branches/vfs3-int/transactions/src/test/java/org/jboss/ejb3/test/tx/common/AspectDeployment.java 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/transactions/src/test/java/org/jboss/ejb3/test/tx/common/AspectDeployment.java 2010-01-04 23:39:00 UTC (rev 99008)
@@ -27,8 +27,8 @@
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* Deploy a resource.
@@ -67,7 +67,7 @@
if(resource == null)
throw new IllegalStateException("resource is null");
- VirtualFile root = VFS.getRoot(getResource(resource));
+ VirtualFile root = VFS.getChild(getResource(resource));
this.deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(root);
log.info("Deploying " + deployment);
mainDeployer.deploy(deployment);
Modified: projects/ejb3/branches/vfs3-int/transactions/src/test/resources/instance/deployers.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/transactions/src/test/resources/instance/deployers.xml 2010-01-04 22:52:21 UTC (rev 99007)
+++ projects/ejb3/branches/vfs3-int/transactions/src/test/resources/instance/deployers.xml 2010-01-04 23:39:00 UTC (rev 99008)
@@ -109,7 +109,7 @@
<bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
<!-- A filter to exclude some obvious non-subdeployments -->
<property name="filter">
- <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
+ <bean name="JARFilter" class="org.jboss.vfs.util.SuffixesExcludeFilter">
<constructor><parameter>
<list elementClass="java.lang.String">
<!-- Exclude class files as subdeployments -->
@@ -226,7 +226,7 @@
<classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
</property>
</bean>
- <bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/>
+ <!-- bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/ -->
<bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
<bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
<property name="classLoading"><inject bean="ClassLoading"/></property>
More information about the jboss-cvs-commits
mailing list