[jboss-cvs] JBossAS SVN: r57842 - branches/JEE5_TCK/server/src/main/org/jboss/deployment

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

Author: wolfc
Date: 2006-10-26 07:47:41 -0400 (Thu, 26 Oct 2006)
New Revision: 57842

Modified:
   branches/JEE5_TCK/server/src/main/org/jboss/deployment/EARDeployer.java
Log:
JBCTS-383: scan ear sub-deployments for jboss.xml

Modified: branches/JEE5_TCK/server/src/main/org/jboss/deployment/EARDeployer.java
===================================================================
--- branches/JEE5_TCK/server/src/main/org/jboss/deployment/EARDeployer.java	2006-10-26 11:43:08 UTC (rev 57841)
+++ branches/JEE5_TCK/server/src/main/org/jboss/deployment/EARDeployer.java	2006-10-26 11:47:41 UTC (rev 57842)
@@ -424,7 +424,7 @@
     of the application package, with the .war extension removed.
    b. All ear modules with extension of .rar are considered resource adapters.
    c. A directory named lib is considered to be the library directory, as
-    described in Section EE.8.2.1, “Bundled Libraries.”
+    described in Section�EE.8.2.1, �Bundled Libraries.�
    d. For all ear modules with a filename extension of .jar, but not in the lib
     directory, do the following:
    i. If the JAR file contains a META-INF/MANIFEST.MF file with a Main-Class
@@ -466,6 +466,7 @@
                File mfFile = new File(earDir, module+"/META-INF/MANIFEST.MF");
                File clientXml = new File(earDir, module+"/META-INF/application-client.xml");
                File ejbXml = new File(earDir, module+"/META-INF/ejb-jar.xml");
+               File jbossXml = new File(earDir, module+"/META-INF/jboss.xml");
                if( clientXml.exists() )
                {
                   J2eeModuleMetaData car = new J2eeModuleMetaData(J2eeModuleMetaData.CONNECTOR, module);
@@ -483,7 +484,7 @@
                      metaData.addModule(car);                     
                   }
                }
-               else if( ejbXml.exists() )
+               else if( ejbXml.exists() || jbossXml.exists() )
                {
                   J2eeModuleMetaData ejb = new J2eeModuleMetaData(J2eeModuleMetaData.EJB, module);
                   metaData.addModule(ejb);
@@ -537,7 +538,7 @@
                      J2eeModuleMetaData car = new J2eeModuleMetaData(J2eeModuleMetaData.CONNECTOR, module);
                      metaData.addModule(car);
                   }
-                  else if( name.equals("META-INF/ejb-jar.xml") )
+                  else if( name.equals("META-INF/ejb-jar.xml") || name.equals("META-INF/jboss.xml") )
                   {
                      J2eeModuleMetaData ejb = new J2eeModuleMetaData(J2eeModuleMetaData.EJB, module);
                      metaData.addModule(ejb);