[jboss-cvs] JBossAS SVN: r58188 - trunk/server/src/main/org/jboss/deployment

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

Author: bill.burke at jboss.com
Date: 2006-11-07 15:15:06 -0500 (Tue, 07 Nov 2006)
New Revision: 58188

Modified:
   trunk/server/src/main/org/jboss/deployment/EARStructure.java
Log:
incorrectly ignoring .jar files that should be considered EJBs when scanning

Modified: trunk/server/src/main/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARStructure.java	2006-11-07 20:12:49 UTC (rev 58187)
+++ trunk/server/src/main/org/jboss/deployment/EARStructure.java	2006-11-07 20:15:06 UTC (rev 58188)
@@ -142,7 +142,20 @@
                {
                   List<VirtualFile> archives = lib.getChildren(earLibFilter);
                   for (VirtualFile archive : archives)
+                  {
                      super.addClassPath(root, archive, true, true, context);
+                     // add any jars with persistence.xml as a deployment
+                     if (archive.findChild("META-INF/persistence.xml") != null)
+                     {
+                        log.trace(archive.getName() + " in ear lib directory has persistence units");
+                        if (deployers.determineStructure(archive, metaData) == false)
+                        {
+                           throw new RuntimeException(archive.getName()
+                                 + " in lib directory has persistence.xml but is not a recognized deployment, .ear: "
+                                 + root.getName());
+                        }
+                     }
+                  }
                }
             }
             catch (IOException ignored)
@@ -220,8 +233,6 @@
     discovered above using one of the JAR file reference mechanisms such as the
     Class-Path header in a manifest file.
     * TODO: rewrite using vfs
-    * @param metaData
-    * @param di
     */
    private void scanEar(VirtualFile root, J2eeApplicationMetaData j2eeMetaData)
       throws IOException
@@ -277,6 +288,11 @@
             {
                type = J2eeModuleMetaData.CLIENT;
             }
+            else
+            {
+               // TODO: scan for annotations. Assume EJB for now
+               type = J2eeModuleMetaData.EJB;
+            }
          }
          else if( ejbXml != null || jbossXml != null )
          {