[jboss-cvs] JBossAS SVN: r99669 - in projects/ejb3/branches/vfs3-int: core/.settings and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 20 14:13:48 EST 2010
Author: johnbailey
Date: 2010-01-20 14:13:47 -0500 (Wed, 20 Jan 2010)
New Revision: 99669
Modified:
projects/ejb3/branches/vfs3-int/core/.settings/org.maven.ide.eclipse.prefs
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/pom.xml
projects/ejb3/branches/vfs3-int/deployers/src/main/java/org/jboss/ejb3/deployers/EjbAnnotationMetaDataDeployer.java
Log:
[JBAS-7363] - Additional VFS integration for EJB3
Modified: projects/ejb3/branches/vfs3-int/core/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/ejb3/branches/vfs3-int/core/.settings/org.maven.ide.eclipse.prefs 2010-01-20 18:47:31 UTC (rev 99668)
+++ projects/ejb3/branches/vfs3-int/core/.settings/org.maven.ide.eclipse.prefs 2010-01-20 19:13:47 UTC (rev 99669)
@@ -1,9 +1,9 @@
-#Fri Oct 02 12:42:17 CEST 2009
-activeProfiles=eclipse,JPA-2.0
+#Thu Jan 14 10:11:45 CST 2010
+activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
includeModules=false
-resolveWorkspaceProjects=false
+resolveWorkspaceProjects=true
resourceFilterGoals=process-resources resources\:testResources
skipCompilerPlugin=true
version=1
Modified: projects/ejb3/branches/vfs3-int/core/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/core/pom.xml 2010-01-20 18:47:31 UTC (rev 99668)
+++ projects/ejb3/branches/vfs3-int/core/pom.xml 2010-01-20 19:13:47 UTC (rev 99669)
@@ -202,6 +202,7 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata</artifactId>
+ <version>1.0.0.CR19-SNAPSHOT</version>
<exclusions>
<!-- jboss-metadata must not dictate the JPA API -->
<exclusion>
@@ -239,7 +240,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>
@@ -622,7 +623,7 @@
<dependency>
<groupId>org.jboss.jpa</groupId>
<artifactId>jboss-jpa-deployers</artifactId>
- <version>1.0.0-CR1</version>
+ <version>1.0.2-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-20 18:47:31 UTC (rev 99668)
+++ projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/ClassFileFilter.java 2010-01-20 19:13:47 UTC (rev 99669)
@@ -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-20 18:47:31 UTC (rev 99668)
+++ projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/ClientDescriptorFileFilter.java 2010-01-20 19:13:47 UTC (rev 99669)
@@ -21,10 +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 +32,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 != null && 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-20 18:47:31 UTC (rev 99668)
+++ projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/DeploymentUnit.java 2010-01-20 19:13:47 UTC (rev 99669)
@@ -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-20 18:47:31 UTC (rev 99668)
+++ projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/EJBContainer.java 2010-01-20 19:13:47 UTC (rev 99669)
@@ -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-20 18:47:31 UTC (rev 99668)
+++ projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java 2010-01-20 19:13:47 UTC (rev 99669)
@@ -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-20 18:47:31 UTC (rev 99668)
+++ projects/ejb3/branches/vfs3-int/core/src/main/java/org/jboss/injection/InjectionContainer.java 2010-01-20 19:13:47 UTC (rev 99669)
@@ -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-20 18:47:31 UTC (rev 99668)
+++ projects/ejb3/branches/vfs3-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java 2010-01-20 19:13:47 UTC (rev 99669)
@@ -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
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-20 18:47:31 UTC (rev 99668)
+++ projects/ejb3/branches/vfs3-int/core/src/test/java/org/jboss/injection/test/common/DummyInjectionContainer.java 2010-01-20 19:13:47 UTC (rev 99669)
@@ -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/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/deployers/pom.xml 2010-01-20 18:47:31 UTC (rev 99668)
+++ projects/ejb3/branches/vfs3-int/deployers/pom.xml 2010-01-20 19:13:47 UTC (rev 99669)
@@ -23,10 +23,10 @@
<properties>
<!-- Versioning -->
- <version.org.jboss.deployers.jboss_deployers_spi>2.0.0.CR2</version.org.jboss.deployers.jboss_deployers_spi>
- <version.org.jboss.as.jboss_as_server>5.0.0.CR2</version.org.jboss.as.jboss_as_server>
+ <version.org.jboss.deployers.jboss_deployers_spi>2.2.0-SNAPSHOT</version.org.jboss.deployers.jboss_deployers_spi>
+ <version.org.jboss.as.jboss_as_server>6.0.0-SNAPSHOT</version.org.jboss.as.jboss_as_server>
<version.org.jboss.ejb3_jboss.ejb3.common>1.0.0</version.org.jboss.ejb3_jboss.ejb3.common>
- <version.org.jboss.deployers_jboss-deployers-vfs>2.0.0.CR5</version.org.jboss.deployers_jboss-deployers-vfs>
+ <version.org.jboss.deployers_jboss-deployers-vfs>2.2.0-SNAPSHOT</version.org.jboss.deployers_jboss-deployers-vfs>
</properties>
@@ -43,6 +43,7 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata</artifactId>
+ <version>1.0.0.CR19-SNAPSHOT</version>
</dependency>
<dependency>
@@ -58,7 +59,13 @@
<version>${version.org.jboss.deployers.jboss_deployers_spi}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${version.org.jboss.deployers.jboss_deployers_spi}</version>
+ </dependency>
+
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-server</artifactId>
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-20 18:47:31 UTC (rev 99668)
+++ projects/ejb3/branches/vfs3-int/deployers/src/main/java/org/jboss/ejb3/deployers/EjbAnnotationMetaDataDeployer.java 2010-01-20 19:13:47 UTC (rev 99669)
@@ -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>
@@ -84,16 +84,7 @@
// why is this?
VirtualFile root = unit.getRoot();
- boolean isLeaf = true;
- try
- {
- isLeaf = root.isLeaf();
- }
- catch(IOException ignore)
- {
- // ignore
- }
- if(isLeaf == true)
+ if(root.isFile())
return;
List<VirtualFile> classpath = unit.getClassPath();
More information about the jboss-cvs-commits
mailing list