[jboss-cvs] JBossAS SVN: r101400 - in projects/ejb3/trunk/core: src/main/java/org/jboss/ejb3 and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 24 09:46:55 EST 2010
Author: johnbailey
Date: 2010-02-24 09:46:52 -0500 (Wed, 24 Feb 2010)
New Revision: 101400
Modified:
projects/ejb3/trunk/core/pom.xml
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/ClassFileFilter.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/ClientDescriptorFileFilter.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/DeploymentUnit.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java
projects/ejb3/trunk/core/src/main/java/org/jboss/injection/InjectionContainer.java
projects/ejb3/trunk/core/src/main/java/org/jboss/injection/ServiceRefInjector.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java
projects/ejb3/trunk/core/src/test/java/org/jboss/injection/test/common/DummyInjectionContainer.java
Log:
[EJBTHREE-2007] - Update to EJB3 core to use VFS abstraction
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2010-02-24 14:42:08 UTC (rev 101399)
+++ projects/ejb3/trunk/core/pom.xml 2010-02-24 14:46:52 UTC (rev 101400)
@@ -213,6 +213,10 @@
<artifactId>jboss-jaxws</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee</artifactId>
</exclusion>
@@ -237,12 +241,6 @@
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>2.0.0.CR1</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.naming</groupId>
<artifactId>jnpserver</artifactId>
</dependency>
@@ -457,6 +455,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.ejb3.vfs</groupId>
+ <artifactId>jboss-ejb3-vfs-spi</artifactId>
+ <version>1.0.0-alpha-1</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.ejb3.timeout</groupId>
<artifactId>jboss-ejb3-timeout-spi</artifactId>
<version>0.1.1</version>
@@ -526,6 +530,10 @@
<artifactId>javassist</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</exclusion>
@@ -554,6 +562,10 @@
<artifactId>javassist</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</exclusion>
@@ -635,7 +647,13 @@
<dependency>
<groupId>org.jboss.jpa</groupId>
<artifactId>jboss-jpa-deployers</artifactId>
- <version>1.0.0-CR1</version>
+ <version>1.0.2-alpha-1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/ClassFileFilter.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/ClassFileFilter.java 2010-02-24 14:42:08 UTC (rev 101399)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/ClassFileFilter.java 2010-02-24 14:46:52 UTC (rev 101400)
@@ -21,11 +21,11 @@
*/
package org.jboss.ejb3;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VirtualFile;
-
import java.io.IOException;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
+import org.jboss.ejb3.vfs.spi.VirtualFileFilter;
+
/**
* Comment
*
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/ClientDescriptorFileFilter.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/ClientDescriptorFileFilter.java 2010-02-24 14:42:08 UTC (rev 101399)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/ClientDescriptorFileFilter.java 2010-02-24 14:46:52 UTC (rev 101400)
@@ -21,11 +21,11 @@
*/
package org.jboss.ejb3;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VirtualFile;
-
import java.io.IOException;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
+import org.jboss.ejb3.vfs.spi.VirtualFileFilter;
+
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/DeploymentUnit.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/DeploymentUnit.java 2010-02-24 14:42:08 UTC (rev 101399)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/DeploymentUnit.java 2010-02-24 14:46:52 UTC (rev 101400)
@@ -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.ejb3.vfs.spi.VirtualFile;
+import org.jboss.ejb3.vfs.spi.VirtualFileFilter;
/**
* Comment
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java 2010-02-24 14:42:08 UTC (rev 101399)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java 2010-02-24 14:46:52 UTC (rev 101400)
@@ -54,6 +54,7 @@
import org.jboss.ejb3.statistics.InvocationStatistics;
import org.jboss.ejb3.timeout.spi.TimeoutMethodCallbackRequirements;
import org.jboss.ejb3.tx.UserTransactionImpl;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
import org.jboss.ejb3.util.Service;
import org.jboss.injection.*;
import org.jboss.jca.spi.ComponentStack;
@@ -68,7 +69,6 @@
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.util.StringPropertyReplacer;
import org.jboss.util.naming.Util;
-import org.jboss.virtual.VirtualFile;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java 2010-02-24 14:42:08 UTC (rev 101399)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java 2010-02-24 14:46:52 UTC (rev 101400)
@@ -59,6 +59,7 @@
import org.jboss.ejb3.proxy.factory.ProxyFactoryHelper;
import org.jboss.ejb3.resolvers.DefaultMessageDestinationReferenceResolver;
import org.jboss.ejb3.resolvers.MessageDestinationReferenceResolver;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
import org.jboss.injection.InjectionHandler;
import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver;
import org.jboss.logging.Logger;
@@ -71,7 +72,6 @@
import org.jboss.metadata.javaee.spec.Environment;
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.virtual.VirtualFile;
/**
* An EjbModule represents a collection of beans that are deployed as a unit.
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/injection/InjectionContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/injection/InjectionContainer.java 2010-02-24 14:42:08 UTC (rev 101399)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/InjectionContainer.java 2010-02-24 14:46:52 UTC (rev 101400)
@@ -33,8 +33,8 @@
import org.jboss.ejb3.Container;
import org.jboss.ejb3.DependencyPolicy;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
import org.jboss.metadata.javaee.spec.RemoteEnvironment;
-import org.jboss.virtual.VirtualFile;
/**
* This is the container that manages all injections. Could be an EJB Container
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/injection/ServiceRefInjector.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/injection/ServiceRefInjector.java 2010-02-24 14:42:08 UTC (rev 101399)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/ServiceRefInjector.java 2010-02-24 14:46:52 UTC (rev 101400)
@@ -28,6 +28,7 @@
import javax.naming.Context;
import javax.xml.ws.WebServiceException;
+import org.jboss.ejb3.vfs.spi.UnifiedVirtualFileFactory;
import org.jboss.logging.Logger;
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.serviceref.ServiceReferenceHandler;
@@ -60,7 +61,7 @@
{
Context envCtx = container.getEnc();
ClassLoader loader = container.getClassloader();
- UnifiedVirtualFile vfsRoot = new VirtualFileAdaptor(container.getRootFile());
+ UnifiedVirtualFile vfsRoot = UnifiedVirtualFileFactory.getInstance().create(container.getRootFile());
new ServiceReferenceHandler().bindServiceRef(envCtx, name, vfsRoot, loader, sref);
}
catch (Exception e)
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java 2010-02-24 14:42:08 UTC (rev 101399)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java 2010-02-24 14:46:52 UTC (rev 101400)
@@ -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.ejb3.vfs.spi.VirtualFile;
+import org.jboss.ejb3.vfs.spi.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.ejb3.vfs.spi.VirtualFileFilter)
*/
public List<VirtualFile> getResources(VirtualFileFilter filter)
{
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/injection/test/common/DummyInjectionContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/injection/test/common/DummyInjectionContainer.java 2010-02-24 14:42:08 UTC (rev 101399)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/injection/test/common/DummyInjectionContainer.java 2010-02-24 14:46:52 UTC (rev 101400)
@@ -34,11 +34,11 @@
import org.jboss.ejb3.Container;
import org.jboss.ejb3.DependencyPolicy;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
import org.jboss.injection.EncInjector;
import org.jboss.injection.InjectionContainer;
import org.jboss.injection.Injector;
import org.jboss.metadata.javaee.spec.RemoteEnvironment;
-import org.jboss.virtual.VirtualFile;
/**
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
More information about the jboss-cvs-commits
mailing list