[jboss-cvs] JBossAS SVN: r74099 - in projects/ejb3/trunk/core: src/main/java/org/jboss/ejb3/entity and 1 other directory.

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

Author: alesj
Date: 2008-06-04 08:54:18 -0400 (Wed, 04 Jun 2008)
New Revision: 74099

Modified:
   projects/ejb3/trunk/core/pom.xml
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/entity/PersistenceUnitDeployment.java
Log:
Update to VFS 2.0.0.Beta13.
Hack the JPA url according to spec.

Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml	2008-06-04 12:40:21 UTC (rev 74098)
+++ projects/ejb3/trunk/core/pom.xml	2008-06-04 12:54:18 UTC (rev 74099)
@@ -160,7 +160,7 @@
     <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-vfs</artifactId>
-      <version>2.0.0.Beta11</version>
+      <version>2.0.0.Beta13</version>
     </dependency>
     
     <dependency>

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/entity/PersistenceUnitDeployment.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/entity/PersistenceUnitDeployment.java	2008-06-04 12:40:21 UTC (rev 74098)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/entity/PersistenceUnitDeployment.java	2008-06-04 12:54:18 UTC (rev 74099)
@@ -44,6 +44,8 @@
 import org.jboss.logging.Logger;
 import org.jboss.metadata.jpa.spec.PersistenceUnitMetaData;
 import org.jboss.metadata.jpa.spec.TransactionType;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VFSUtils;
 
 /**
  * Comment
@@ -217,11 +219,18 @@
       pi.setPersistenceUnitName(metaData.getName());
       pi.setMappingFileNames(safeList(metaData.getMappingFiles()));
       pi.setExcludeUnlistedClasses(metaData.isExcludeUnlistedClasses());
-      log.debug("Persistence root url " + di.getRootFile());
-      pi.setPersistenceUnitRootUrl(di.getRootFile().toURL());
-//      PersistenceUnitTransactionType transactionType = PersistenceUnitTransactionType.JTA;
-//      if ("RESOURCE_LOCAL".equals(xml.getTransactionType()))
-//         transactionType = PersistenceUnitTransactionType.RESOURCE_LOCAL;
+      VirtualFile root = di.getRootFile();
+      log.debug("Persistence root: " + root);
+      // hack the JPA url
+      URL url = root.toURL();
+      // is not nested, so direct VFS URL is not an option
+      if (VFSUtils.isNestedFile(root) == false)
+      {
+         String urlString = url.toExternalForm();
+         if (urlString.startsWith("vfs"))
+            url = new URL(urlString.substring(3));
+      }
+      pi.setPersistenceUnitRootUrl(url);
       PersistenceUnitTransactionType transactionType = getJPATransactionType();
       pi.setTransactionType(transactionType);