AS7-5474 fix 'jboss.as.jpa.vfs' support in PersistenceUnitInfo.getPersistenceUnitRootUrl() to return contents of persistence unit root

Author: scottmarlow

jpa/core/src/main/java/org/jboss/as/jpa/processor/PersistenceUnitParseProcessor.java

@@ -281,7 +281,7 @@ private URL getPersistenceUnitURL(VirtualFile persistence_xml, boolean convertVF
         try {
             VirtualFile metaData = persistence_xml;// di.getMetaDataFile("persistence.xml");
             return convertVFS ?
-                    metaData.getParent().getParent().getPhysicalFile().toURI().toURL() :
+                    metaData.getPhysicalFile().getParentFile().getParentFile().toURI().toURL() :
                     metaData.getParent().getParent().toURL();
 
         } catch (Exception e) {

testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/TestPersistenceProvider.java

@@ -22,16 +22,16 @@
 
 package org.jboss.as.test.integration.jpa.mockprovider.classtransformer;
 
+import java.io.File;
 import java.lang.reflect.Proxy;
+import java.net.URL;
 import java.util.Map;
 
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.spi.PersistenceProvider;
 import javax.persistence.spi.PersistenceUnitInfo;
 import javax.persistence.spi.ProviderUtil;
 
-import org.jboss.as.jpa.container.EntityManagerUnwrappedTargetInvocationHandler;
-
 /**
  * TestPersistenceProvider
  *
@@ -84,10 +84,32 @@ public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitI
                 testEntityManagerFactory
         );
 
+        testGetPersistenceUnitRootUrl(info);
+
         System.out.println("TestPersistenceProvider.createContainerEntityManagerFactory() is returning " + proxyEntityManagerFactory);
         return proxyEntityManagerFactory;
     }
 
+    private void testGetPersistenceUnitRootUrl(PersistenceUnitInfo info) {
+        URL rootUrl = info.getPersistenceUnitRootUrl();
+        File topFolder = new File(rootUrl.getFile());
+        if (topFolder == null) {
+            throw new RuntimeException("couldn't get root file representation of getPersistenceUnitRootUrl");
+        }
+        File metainfFolder[] = topFolder.listFiles();  // META-INF
+        File containedFiles[] = metainfFolder[0].listFiles();
+
+        for (File file :containedFiles) {
+
+            System.out.println("getPersistenceUnitRootUrl contains " + file.getName());
+            if (file.getName().equals("persistence.xml")) {
+                System.out.println("success: found persistence.xml");
+                return ;
+            }
+        }
+        throw new RuntimeException("failed to find 'persistence.xml' in PersistenceUnitInfo.getPersistenceUnitRootUrl() to verify that it contains 'persistence.xml'");
+    }
+
     @Override
     public ProviderUtil getProviderUtil() {
         return null;