[jboss-cvs] JBossAS SVN: r101436 - in branches/vfs3-int: component-matrix and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 24 22:21:33 EST 2010
Author: johnbailey
Date: 2010-02-24 22:21:33 -0500 (Wed, 24 Feb 2010)
New Revision: 101436
Modified:
branches/vfs3-int/build/build.xml
branches/vfs3-int/component-matrix/pom.xml
branches/vfs3-int/ejb3/pom.xml
branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/client/ClientContainer.java
branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
Log:
[EJBTHREE-2007] - Integrated EJB3 VFS abstraction into AS VFS3 branch
Modified: branches/vfs3-int/build/build.xml
===================================================================
--- branches/vfs3-int/build/build.xml 2010-02-25 03:20:07 UTC (rev 101435)
+++ branches/vfs3-int/build/build.xml 2010-02-25 03:21:33 UTC (rev 101436)
@@ -1962,8 +1962,10 @@
<fileset refid="org.jboss.ejb3:jboss-ejb3-timerservice-spi:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-transactions:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3_1:jar"/>
- <fileset refid="org.jboss.ejb3.vfs:vfs-spi:jar"/>
- <fileset refid="org.jboss.ejb3.vfs:vfs-impl-vfs3:jar"/>
+ <fileset refid="org.jboss.ejb3.timeout:jboss-ejb3-timeout-spi:jar"/>
+ <fileset refid="org.jboss.ejb3.timeout:jboss-ejb3-timeout-3.1:jar"/>
+ <fileset refid="org.jboss.ejb3.vfs:jboss-ejb3-vfs-spi:jar"/>
+ <fileset refid="org.jboss.ejb3.vfs:jboss-ejb3-vfs-impl-vfs3:jar"/>
<fileset refid="org.jboss.reloaded:jboss-reloaded-naming:jar"/>
<fileset refid="org.jboss.reloaded:jboss-reloaded-naming-deployers:jar"/>
<fileset refid="org.hibernate:hibernate-core:jar"/>
Modified: branches/vfs3-int/component-matrix/pom.xml
===================================================================
--- branches/vfs3-int/component-matrix/pom.xml 2010-02-25 03:20:07 UTC (rev 101435)
+++ branches/vfs3-int/component-matrix/pom.xml 2010-02-25 03:21:33 UTC (rev 101436)
@@ -64,15 +64,7 @@
<version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
<version.org.jboss.aspects.security>1.0.1</version.org.jboss.aspects.security>
<version.org.jboss.aspects.transaction>1.0.0.GA</version.org.jboss.aspects.transaction>
- <version.org.jboss.bootstrap.api>2.0.0-alpha-2</version.org.jboss.bootstrap.api>
- <version.org.jboss.bootstrap.api.as>2.0.0-alpha-2</version.org.jboss.bootstrap.api.as>
- <version.org.jboss.bootstrap.api.mc>2.0.0-alpha-1</version.org.jboss.bootstrap.api.mc>
- <version.org.jboss.bootstrap.impl.as>2.0.0-alpha-4</version.org.jboss.bootstrap.impl.as>
- <version.org.jboss.bootstrap.impl.base>2.0.0-alpha-4</version.org.jboss.bootstrap.impl.base>
- <version.org.jboss.bootstrap.impl.mc>2.0.0-alpha-3</version.org.jboss.bootstrap.impl.mc>
- <version.org.jboss.bootstrap.spi>2.0.0-alpha-3</version.org.jboss.bootstrap.spi>
- <version.org.jboss.bootstrap.spi.as>2.0.0-alpha-4</version.org.jboss.bootstrap.spi.as>
- <version.org.jboss.bootstrap.spi.mc>2.0.0-alpha-2</version.org.jboss.bootstrap.spi.mc>
+ <version.org.jboss.bootstrap>2.1.0-alpha-4</version.org.jboss.bootstrap>
<version.org.jboss.cache.core>3.2.1.GA</version.org.jboss.cache.core>
<version.org.jboss.cache.pojo>3.0.0.GA</version.org.jboss.cache.pojo>
<version.org.jboss.cl>2.2.0.Alpha3</version.org.jboss.cl>
@@ -85,8 +77,7 @@
<version.org.jboss.deployers>2.2.0.Alpha2</version.org.jboss.deployers>
<version.org.jboss.ejb3>1.0.4</version.org.jboss.ejb3>
<version.org.jboss.ejb3.common.client>1.0.2</version.org.jboss.ejb3.common.client>
- <version.org.jboss.ejb3.core.client>1.2.2</version.org.jboss.ejb3.core.client>
- <version.org.jboss.ejb3.vfs3>1.0.0-SNAPSHOT</version.org.jboss.ejb3.vfs3>
+ <version.org.jboss.ejb3.core.client>1.2.3-SNAPSHOT</version.org.jboss.ejb3.core.client>
<version.org.jboss.ejb3.endpoint.deployer>0.1.4</version.org.jboss.ejb3.endpoint.deployer>
<version.org.jboss.ejb3.ext.api>1.1.0</version.org.jboss.ejb3.ext.api>
<version.org.jboss.ejb3.jpa.int>2.0.0-alpha-1</version.org.jboss.ejb3.jpa.int>
@@ -96,6 +87,8 @@
<version.org.jboss.ejb3.proxy.impl.client>1.0.6</version.org.jboss.ejb3.proxy.impl.client>
<version.org.jboss.ejb3.proxy.spi.client>1.0.0</version.org.jboss.ejb3.proxy.spi.client>
<version.org.jboss.ejb3.security.client>1.0.0</version.org.jboss.ejb3.security.client>
+ <version.org.jboss.ejb3.timeout>0.1.1</version.org.jboss.ejb3.timeout>
+ <version.org.jboss.ejb3.vfs>1.0.0-alpha-1</version.org.jboss.ejb3.vfs>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
<version.org.jboss.integration>6.0.0.Alpha9</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.2.Beta3</version.org.jboss.jbossxb>
@@ -112,7 +105,7 @@
<version.org.jboss.mc-int>2.2.0.Alpha2</version.org.jboss.mc-int>
<version.org.jboss.mdr>2.2.0.Alpha1</version.org.jboss.mdr>
<version.org.jboss.metadata.client>2.0.0.Alpha</version.org.jboss.metadata.client>
- <version.org.jboss.metadata.common>2.0.0.Alpha11</version.org.jboss.metadata.common>
+ <version.org.jboss.metadata.common>2.0.0.Alpha12</version.org.jboss.metadata.common>
<version.org.jboss.metadata.ear>2.0.0.Alpha2</version.org.jboss.metadata.ear>
<version.org.jboss.metadata.ejb>2.0.0-alpha-6</version.org.jboss.metadata.ejb>
<version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
@@ -1984,14 +1977,19 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.ejb3.timeout</groupId>
+ <artifactId>jboss-ejb3-timeout-3.1</artifactId>
+ <version>${version.org.jboss.ejb3.timeout}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ejb3.vfs</groupId>
- <artifactId>vfs-spi</artifactId>
- <version>${version.org.jboss.ejb3.vfs3}</version>
+ <artifactId>jboss-ejb3-vfs-spi</artifactId>
+ <version>${version.org.jboss.ejb3.vfs}</version>
</dependency>
<dependency>
<groupId>org.jboss.ejb3.vfs</groupId>
- <artifactId>vfs-impl-vfs3</artifactId>
- <version>${version.org.jboss.ejb3.vfs3}</version>
+ <artifactId>jboss-ejb3-vfs-impl-vfs3</artifactId>
+ <version>${version.org.jboss.ejb3.vfs}</version>
<exclusions>
<exclusion>
<groupId>org.jboss</groupId>
@@ -2121,19 +2119,19 @@
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-api</artifactId>
- <version>${version.org.jboss.bootstrap.api}</version>
+ <version>${version.org.jboss.bootstrap}</version>
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-api-as</artifactId>
- <version>${version.org.jboss.bootstrap.api.as}</version>
+ <version>${version.org.jboss.bootstrap}</version>
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-api-mc</artifactId>
- <version>${version.org.jboss.bootstrap.api.mc}</version>
+ <version>${version.org.jboss.bootstrap}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
@@ -2145,19 +2143,19 @@
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-impl-as</artifactId>
- <version>${version.org.jboss.bootstrap.impl.as}</version>
+ <version>${version.org.jboss.bootstrap}</version>
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-impl-base</artifactId>
- <version>${version.org.jboss.bootstrap.impl.base}</version>
+ <version>${version.org.jboss.bootstrap}</version>
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-impl-mc</artifactId>
- <version>${version.org.jboss.bootstrap.impl.mc}</version>
+ <version>${version.org.jboss.bootstrap}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
@@ -2169,19 +2167,19 @@
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-spi</artifactId>
- <version>${version.org.jboss.bootstrap.spi}</version>
+ <version>${version.org.jboss.bootstrap}</version>
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-spi-as</artifactId>
- <version>${version.org.jboss.bootstrap.spi.as}</version>
+ <version>${version.org.jboss.bootstrap}</version>
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-spi-mc</artifactId>
- <version>${version.org.jboss.bootstrap.spi.mc}</version>
+ <version>${version.org.jboss.bootstrap}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
Modified: branches/vfs3-int/ejb3/pom.xml
===================================================================
--- branches/vfs3-int/ejb3/pom.xml 2010-02-25 03:20:07 UTC (rev 101435)
+++ branches/vfs3-int/ejb3/pom.xml 2010-02-25 03:21:33 UTC (rev 101436)
@@ -277,7 +277,12 @@
<dependency>
<groupId>org.jboss.ejb3.vfs</groupId>
- <artifactId>vfs-impl-vfs3</artifactId>
+ <artifactId>jboss-ejb3-vfs-spi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3.vfs</groupId>
+ <artifactId>jboss-ejb3-vfs-impl-vfs3</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss</groupId>
@@ -285,6 +290,11 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3.timeout</groupId>
+ <artifactId>jboss-ejb3-timeout-3.1</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
Modified: branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/client/ClientContainer.java
===================================================================
--- branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/client/ClientContainer.java 2010-02-25 03:20:07 UTC (rev 101435)
+++ branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/client/ClientContainer.java 2010-02-25 03:21:33 UTC (rev 101436)
@@ -48,6 +48,7 @@
import org.jboss.ejb3.DependencyPolicy;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.ejb3.client.injection.ClientPersistenceUnitHandler;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
import org.jboss.injection.DependsHandler;
import org.jboss.injection.EncInjector;
import org.jboss.injection.InjectionContainer;
@@ -59,7 +60,6 @@
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.RemoteEnvironment;
import org.jboss.util.NotImplementedException;
-import org.jboss.virtual.VirtualFile;
/**
* Injection of the application client main class is handled from here.
Modified: branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
===================================================================
--- branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java 2010-02-25 03:20:07 UTC (rev 101435)
+++ branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java 2010-02-25 03:21:33 UTC (rev 101436)
@@ -53,6 +53,8 @@
import org.jboss.ejb3.enc.MessageDestinationResolver;
import org.jboss.ejb3.javaee.AbstractJavaEEComponent;
import org.jboss.ejb3.javaee.SimpleJavaEEModule;
+import org.jboss.ejb3.vfs.spi.UnifiedVirtualFileFactory;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
import org.jboss.injection.DependsHandler;
import org.jboss.injection.EncInjector;
import org.jboss.injection.ExtendedInjectionContainer;
@@ -66,8 +68,6 @@
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.serviceref.ServiceReferenceHandler;
-import org.jboss.metadata.serviceref.VirtualFileAdaptor;
-import org.jboss.virtual.VirtualFile;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
/**
@@ -360,7 +360,7 @@
String encName = "env/" + name;
Context encCtx = getEnc();
- UnifiedVirtualFile vfsRoot = new VirtualFileAdaptor(getRootFile().getWrapped());
+ UnifiedVirtualFile vfsRoot = UnifiedVirtualFileFactory.getInstance().create(getRootFile());
new ServiceReferenceHandler().bindServiceRef(encCtx, encName, vfsRoot, getClassloader(), sref);
}
Modified: branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
===================================================================
--- branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java 2010-02-25 03:20:07 UTC (rev 101435)
+++ branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java 2010-02-25 03:21:33 UTC (rev 101436)
@@ -122,7 +122,7 @@
public void register(Ejb3Deployment deployment)
{
// Create the path name relative to the root
- String pathName = deployment.getDeploymentUnit().getRootFile().getWrapped().getPathName();
+ String pathName = deployment.getDeploymentUnit().getRootFile().getPathName();
if(pathName.startsWith(shortName))
{
if(pathName.length() > shortName.length())
@@ -135,7 +135,7 @@
public void unregister(Ejb3Deployment deployment)
{
- String pathName = deployment.getDeploymentUnit().getRootFile().getWrapped().getPathName();
+ String pathName = deployment.getDeploymentUnit().getRootFile().getPathName();
if(pathName.startsWith(shortName))
pathName = pathName.substring(shortName.length()+1);
deployments.remove(pathName);
Modified: branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
===================================================================
--- branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java 2010-02-25 03:20:07 UTC (rev 101435)
+++ branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java 2010-02-25 03:21:33 UTC (rev 101436)
@@ -81,7 +81,7 @@
return unit.removeAttachment(name);
}
- public org.jboss.virtual.VirtualFile getRootFile()
+ public org.jboss.ejb3.vfs.spi.VirtualFile getRootFile()
{
return new VirtualFileWrapper(unit.getFile(""));
}
@@ -141,7 +141,7 @@
return extractDescriptorUrl("jboss.xml");
}
- public org.jboss.virtual.VirtualFile getMetaDataFile(String name)
+ public org.jboss.ejb3.vfs.spi.VirtualFile getMetaDataFile(String name)
{
return new VirtualFileWrapper(unit.getMetaDataFile(name));
}
@@ -205,7 +205,7 @@
return interceptorInfoRepository;
}
- public List<org.jboss.virtual.VirtualFile> getResources(org.jboss.virtual.VirtualFileFilter filter)
+ public List<org.jboss.ejb3.vfs.spi.VirtualFile> getResources(org.jboss.ejb3.vfs.spi.VirtualFileFilter filter)
{
List<VirtualFile> classPath = unit.getClassPath();
if(classPath == null || classPath.isEmpty())
@@ -235,7 +235,7 @@
}
}
final List<VirtualFile> matches = visitor.getMatched();
- final List<org.jboss.virtual.VirtualFile> wrappedMatches = new ArrayList<org.jboss.virtual.VirtualFile>(matches.size());
+ final List<org.jboss.ejb3.vfs.spi.VirtualFile> wrappedMatches = new ArrayList<org.jboss.ejb3.vfs.spi.VirtualFile>(matches.size());
for(VirtualFile match : matches)
{
wrappedMatches.add(new VirtualFileWrapper(match));
Modified: branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
===================================================================
--- branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java 2010-02-25 03:20:07 UTC (rev 101435)
+++ branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java 2010-02-25 03:21:33 UTC (rev 101436)
@@ -67,7 +67,7 @@
import org.jboss.metadata.javaee.spec.Environment;
import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
import org.jboss.ejb3.vfs.impl.vfs3.VirtualFileWrapper;
import org.jboss.web.WebApplication;
import org.jboss.web.tomcat.service.injection.TomcatInjectionUtils;
More information about the jboss-cvs-commits
mailing list