[jboss-cvs] JBossAS SVN: r67871 - trunk/ejb3/src/main/org/jboss/ejb3/deployers.

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

Author: wolfc
Date: 2007-12-04 06:46:15 -0500 (Tue, 04 Dec 2007)
New Revision: 67871

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/PersistenceUnitParsingDeployer.java
Log:
EJBTHREE-1138: Disabled jarjar URL stream handler

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/PersistenceUnitParsingDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/PersistenceUnitParsingDeployer.java	2007-12-04 11:32:04 UTC (rev 67870)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/PersistenceUnitParsingDeployer.java	2007-12-04 11:46:15 UTC (rev 67871)
@@ -97,10 +97,18 @@
          throws Exception
    {
       VirtualFile persistenceRoot = file.getParent().getParent();
+      
+      // We can't pass in a VFS url.
       //URL persistenceUnitRootUrl = persistenceRoot.toURL();
+      
       // FIXME: is this a supported hack?
-      URL persistenceUnitRootUrl = new URL("jarjar:" + persistenceRoot.getHandler().toURL());
+      // This introduces severe regression, will go the jar: url way (EJB-326)
+      //URL persistenceUnitRootUrl = new URL("jarjar:" + persistenceRoot.getHandler().toURL());
       
+      // http://opensource.atlassian.com/projects/hibernate/browse/EJB-326
+      URL persistenceUnitRootUrl = persistenceRoot.getHandler().toURL();
+      assert persistenceUnitRootUrl.getProtocol().equals("jar") || persistenceUnitRootUrl.getProtocol().equals("file") : "expected a jar or file url, but was " + persistenceUnitRootUrl;
+      
       URL persistenceXmlUrl = file.toURL();
       PersistenceUnitsMetaData metaData = new PersistenceUnitsMetaData(persistenceUnitRootUrl, PersistenceXmlLoader.deploy(persistenceXmlUrl, new HashMap<String, String>(),
             new EJB3DTDEntityResolver(), PersistenceUnitTransactionType.JTA));