[jboss-cvs] JBossAS SVN: r99252 - in projects/jpa/branches/vfs3-int: mcint and 2 other directories.

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

Author: johnbailey
Date: 2010-01-11 17:40:02 -0500 (Mon, 11 Jan 2010)
New Revision: 99252

Modified:
   projects/jpa/branches/vfs3-int/deployers/src/main/java/org/jboss/jpa/deployment/PersistenceUnitDeployment.java
   projects/jpa/branches/vfs3-int/mcint/pom.xml
   projects/jpa/branches/vfs3-int/mcint/src/test/java/org/jboss/jpa/mcint/test/annotations/unit/AnnotationsTestCase.java
   projects/jpa/branches/vfs3-int/mcint/src/test/java/org/jboss/jpa/mcint/test/common/DummyPersistenceUnit.java
Log:
[JBAS-7366] - Some more VFS3 integration

Modified: projects/jpa/branches/vfs3-int/deployers/src/main/java/org/jboss/jpa/deployment/PersistenceUnitDeployment.java
===================================================================
--- projects/jpa/branches/vfs3-int/deployers/src/main/java/org/jboss/jpa/deployment/PersistenceUnitDeployment.java	2010-01-11 22:10:03 UTC (rev 99251)
+++ projects/jpa/branches/vfs3-int/deployers/src/main/java/org/jboss/jpa/deployment/PersistenceUnitDeployment.java	2010-01-11 22:40:02 UTC (rev 99252)
@@ -49,7 +49,6 @@
 import org.jboss.logging.Logger;
 import org.jboss.metadata.jpa.spec.PersistenceUnitMetaData;
 import org.jboss.util.naming.NonSerializableFactory;
-import org.jboss.vfs.VFSUtils;
 import org.jboss.vfs.VirtualFile;
 
 /**

Modified: projects/jpa/branches/vfs3-int/mcint/pom.xml
===================================================================
--- projects/jpa/branches/vfs3-int/mcint/pom.xml	2010-01-11 22:10:03 UTC (rev 99251)
+++ projects/jpa/branches/vfs3-int/mcint/pom.xml	2010-01-11 22:40:02 UTC (rev 99252)
@@ -65,10 +65,10 @@
     </dependency>
     -->
     <!-- indirectly referenced by MicroContainerTestDelegate -->
-    <dependency>
-      <groupId>org.jboss</groupId>
+       <dependency>
+      <groupId>org.jboss.test</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.5.GA</version>
+      <version>1.1.0.GA</version>
       <scope>test</scope>
     </dependency>
     <!-- 
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>org.jboss.jpa</groupId>
       <artifactId>jboss-jpa-deployers</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
     <!--
     <dependency>
@@ -104,9 +104,9 @@
     </dependency>
     -->
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
-      <artifactId>jboss-kernel</artifactId>
-      <version>2.0.3.GA</version>
+      <groupId>org.jboss.kernel</groupId>
+        <artifactId>jboss-kernel</artifactId>
+      <version>2.2.0-SNAPSHOT</version>
     </dependency>
     <!-- 
     <dependency>
@@ -148,5 +148,15 @@
       <scope>test</scope>
     </dependency>
     -->
+	<dependency>
+	  <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+      <version>2.2.0.CR1</version>
+    </dependency>
+    <dependency>
+	  <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-log4j</artifactId>
+      <version>2.2.0.CR1</version>
+    </dependency>
   </dependencies>
 </project>

Modified: projects/jpa/branches/vfs3-int/mcint/src/test/java/org/jboss/jpa/mcint/test/annotations/unit/AnnotationsTestCase.java
===================================================================
--- projects/jpa/branches/vfs3-int/mcint/src/test/java/org/jboss/jpa/mcint/test/annotations/unit/AnnotationsTestCase.java	2010-01-11 22:10:03 UTC (rev 99251)
+++ projects/jpa/branches/vfs3-int/mcint/src/test/java/org/jboss/jpa/mcint/test/annotations/unit/AnnotationsTestCase.java	2010-01-11 22:40:02 UTC (rev 99252)
@@ -23,7 +23,7 @@
 
 import static org.junit.Assert.assertNotNull;
 
-import java.io.IOException;
+import java.net.URISyntaxException;
 import java.net.URL;
 
 import org.jboss.deployers.spi.DeploymentException;
@@ -31,8 +31,9 @@
 import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
 import org.jboss.jpa.mcint.test.annotations.MyMCBean;
 import org.jboss.jpa.mcint.test.common.MicroContainerTestHelper;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.logging.Logger;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -56,6 +57,7 @@
    @BeforeClass
    public static void beforeClass() throws Exception
    {
+      System.out.println(Logger.class.getClassLoader().getResource("org/jboss/logging/Logger.class"));
       delegate = new MicroContainerTestHelper(AnnotationsTestCase.class);
       
       delegate.setUp();
@@ -65,14 +67,14 @@
       deploy("/org/jboss/jpa/mcint/test/annotations");
    }
    
-   protected static void deploy(URL url) throws DeploymentException, IOException
+   protected static void deploy(URL url) throws DeploymentException, URISyntaxException
    {
-      VirtualFile file = VFS.getRoot(url);
+      VirtualFile file = VFS.getChild(url);
       VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(file);
       delegate.getMainDeployer().deploy(deployment);      
    }
    
-   protected static void deploy(String spec) throws DeploymentException, IOException 
+   protected static void deploy(String spec) throws DeploymentException, URISyntaxException 
    {
       URL url = AnnotationsTestCase.class.getResource(spec);
       if(url == null)

Modified: projects/jpa/branches/vfs3-int/mcint/src/test/java/org/jboss/jpa/mcint/test/common/DummyPersistenceUnit.java
===================================================================
--- projects/jpa/branches/vfs3-int/mcint/src/test/java/org/jboss/jpa/mcint/test/common/DummyPersistenceUnit.java	2010-01-11 22:10:03 UTC (rev 99251)
+++ projects/jpa/branches/vfs3-int/mcint/src/test/java/org/jboss/jpa/mcint/test/common/DummyPersistenceUnit.java	2010-01-11 22:40:02 UTC (rev 99252)
@@ -25,6 +25,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
+import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
 import org.jboss.jpa.spi.PersistenceUnit;
@@ -59,4 +60,21 @@
       throw new RuntimeException("NYI");
    }
 
+   public EntityManager getTransactionScopedEntityManager()
+   {
+      throw new RuntimeException("NYI");
+   }
+
+   public boolean isInTx()
+   {
+      throw new RuntimeException("NYI");
+   }
+
+   public void verifyInTx()
+   {
+      throw new RuntimeException("NYI");
+   }
+   
+   
+
 }