[jboss-cvs] JBossAS SVN: r99166 - in projects/ejb3/branches/vfs3-int: common and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: johnbailey
Date: 2010-01-08 10:49:11 -0500 (Fri, 08 Jan 2010)
New Revision: 99166

Modified:
   projects/ejb3/branches/vfs3-int/build/pom.xml
   projects/ejb3/branches/vfs3-int/common/pom.xml
   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/build/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/build/pom.xml	2010-01-08 15:37:37 UTC (rev 99165)
+++ projects/ejb3/branches/vfs3-int/build/pom.xml	2010-01-08 15:49:11 UTC (rev 99166)
@@ -335,6 +335,12 @@
         <artifactId>jboss-metadata-ejb</artifactId>
         <version>2.0.0-SNAPSHOT</version>
       </dependency>
+      
+      <dependency>
+        <groupId>org.jboss.metadata</groupId>
+        <artifactId>jboss-metadata-ear</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+      </dependency>
 
       <dependency>
         <groupId>org.jboss</groupId>

Modified: projects/ejb3/branches/vfs3-int/common/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/common/pom.xml	2010-01-08 15:37:37 UTC (rev 99165)
+++ projects/ejb3/branches/vfs3-int/common/pom.xml	2010-01-08 15:49:11 UTC (rev 99166)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>jboss-ejb3-build</artifactId>
     <groupId>org.jboss.ejb3</groupId>
-    <version>1.0.0</version>
+    <version>1.0.9-SNAPSHOT</version>
     <relativePath>../build/pom.xml</relativePath>
   </parent>
 
@@ -94,7 +94,7 @@
     
     <dependency>
       <groupId>org.jboss.metadata</groupId>
-      <artifactId>jboss-metadata</artifactId>
+      <artifactId>jboss-metadata-ejb</artifactId>
     </dependency>
  
     <dependency>
@@ -107,6 +107,11 @@
       <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-spi</artifactId>
     </dependency>
-
+	
+    <dependency>
+      <groupId>org.jboss.cl</groupId>
+      <artifactId>jboss-classloading</artifactId>
+      <version>2.2.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>

Modified: projects/ejb3/branches/vfs3-int/deployers/pom.xml
===================================================================
--- projects/ejb3/branches/vfs3-int/deployers/pom.xml	2010-01-08 15:37:37 UTC (rev 99165)
+++ projects/ejb3/branches/vfs3-int/deployers/pom.xml	2010-01-08 15:49:11 UTC (rev 99166)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jboss.ejb3</groupId>
     <artifactId>jboss-ejb3-build</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.9-SNAPSHOT</version>
   </parent>
 
   <!-- Model Version -->
@@ -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.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_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.2-SNAPSHOT</version.org.jboss.ejb3_jboss.ejb3.common>
+    <version.org.jboss.deployers_jboss-deployers-vfs>2.2.0-SNAPSHOT</version.org.jboss.deployers_jboss-deployers-vfs>
 
   </properties>
 
@@ -42,8 +42,13 @@
 
     <dependency>
       <groupId>org.jboss.metadata</groupId>
-      <artifactId>jboss-metadata</artifactId>
+      <artifactId>jboss-metadata-ejb</artifactId>
     </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.metadata</groupId>
+      <artifactId>jboss-metadata-ear</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
@@ -57,9 +62,8 @@
       <artifactId>jboss-deployers-spi</artifactId>
       <version>${version.org.jboss.deployers.jboss_deployers_spi}</version>
     </dependency>
-
-
-  <dependency>
+    
+    <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-server</artifactId>
       <version>${version.org.jboss.as.jboss_as_server}</version>
@@ -69,10 +73,14 @@
         <groupId>org.jboss.jpa</groupId>
         <artifactId>jboss-jpa-deployers</artifactId>
       </exclusion>
-    </exclusions>
+     </exclusions>
     </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.deployers</groupId>
+      <artifactId>jboss-deployers-vfs-spi</artifactId>
+      <version>${version.org.jboss.deployers.jboss_deployers_spi}</version>
+    </dependency>
 
-
-
     </dependencies>
 </project>

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-08 15:37:37 UTC (rev 99165)
+++ projects/ejb3/branches/vfs3-int/deployers/src/main/java/org/jboss/ejb3/deployers/EjbAnnotationMetaDataDeployer.java	2010-01-08 15:49:11 UTC (rev 99166)
@@ -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();