[jboss-cvs] JBossAS SVN: r112039 - trunk/server/src/main/java/org/jboss/deployment.

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

Author: beve
Date: 2011-08-12 10:31:42 -0400 (Fri, 12 Aug 2011)
New Revision: 112039

Modified:
   trunk/server/src/main/java/org/jboss/deployment/EARStructure.java
Log:
JBAS-8803 Inclusion of an EJB JARFile in EAR /lib causes "No module with relative path" error


Modified: trunk/server/src/main/java/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/EARStructure.java	2011-08-12 13:46:47 UTC (rev 112038)
+++ trunk/server/src/main/java/org/jboss/deployment/EARStructure.java	2011-08-12 14:31:42 UTC (rev 112039)
@@ -211,15 +211,11 @@
                      Automounter.mount(file, archive);
                      addClassPath(structureContext, archive, true, true, context);
                      // add any jars with persistence.xml as a deployment
-                     if (archive.getChild("META-INF/persistence.xml").exists())
+                     VirtualFile child = archive.getChild("META-INF/persistence.xml");
+                     if (child.exists()) 
                      {
-                        log.trace(archive.getName() + " in ear lib directory has persistence units");
-                        if (structureContext.determineChildStructure(archive) == false)
-                        {
-                           throw new RuntimeException(archive.getName()
-                                 + " in lib directory has persistence.xml but is not a recognized deployment, .ear: "
-                                 + file.getName());
-                        }
+                         log.trace(archive.getName() + " in ear lib directory has persistence units");
+                         addMetaDataPath(structureContext, context, child.getPathNameRelativeTo(file), MetaDataType.ALTERNATIVE);
                      }
                      else if (trace)
                         log.trace(archive.getPathName() + " does not contain META-INF/persistence.xml");