[jboss-cvs] JBossAS SVN: r110173 - trunk/server/src/main/java/org/jboss/as/naming/javaee.

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

Author: jaikiran
Date: 2010-12-23 07:23:16 -0500 (Thu, 23 Dec 2010)
New Revision: 110173

Modified:
   trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEApplicationInformer.java
Log:
JBAS-8770 Fix NamingJavaEEApplicationInformer which incorrectly reported a .jar with jboss-service.xml as an enterprise archive

Modified: trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEApplicationInformer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEApplicationInformer.java	2010-12-23 07:06:02 UTC (rev 110172)
+++ trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEApplicationInformer.java	2010-12-23 12:23:16 UTC (rev 110173)
@@ -47,7 +47,10 @@
     */
    protected boolean isTopLevelServiceArchive(DeploymentUnit deploymentUnit)
    {
-      return deploymentUnit.isTopLevel() && deploymentUnit.isAttachmentPresent(ServiceDeployment.class);
+      // Added additional check for file extension to prevent a .jar with jboss-service.xml 
+      // from being considered as an enterprise archive (https://issues.jboss.org/browse/JBAS-8770)
+      return deploymentUnit.isTopLevel() && deploymentUnit.isAttachmentPresent(ServiceDeployment.class)
+            && deploymentUnit.getSimpleName().endsWith(".sar");  
    }
 
    public String[] getRequiredAttachments()