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

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

Author: wolfc
Date: 2010-03-25 08:03:43 -0400 (Thu, 25 Mar 2010)
New Revision: 102956

Modified:
   trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEApplicationInformer.java
Log:
JBAS-7556: allow a toplevel sar to act as a JavaEEApplication (ejb3-testsuite/initial)

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-03-25 11:46:01 UTC (rev 102955)
+++ trunk/server/src/main/java/org/jboss/as/naming/javaee/NamingJavaEEApplicationInformer.java	2010-03-25 12:03:43 UTC (rev 102956)
@@ -3,13 +3,14 @@
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
 import org.jboss.reloaded.naming.deployers.javaee.JavaEEApplicationInformer;
+import org.jboss.system.metadata.ServiceDeployment;
 
 /**
  * @author <a href="cdewolf at redhat.com">Carlo de Wolf</a>
  */
 public class NamingJavaEEApplicationInformer implements JavaEEApplicationInformer
 {
-   private static final String REQUIRED_ATTACHMENTS[] = { JBossAppMetaData.class.getName() };
+   private static final String REQUIRED_ATTACHMENTS[] = { JBossAppMetaData.class.getName(), ServiceDeployment.class.getName() };
 
    public String getApplicationName(DeploymentUnit deploymentUnit) throws IllegalArgumentException
    {
@@ -22,9 +23,17 @@
 
    public boolean isJavaEEApplication(DeploymentUnit deploymentUnit)
    {
-      return deploymentUnit.isAttachmentPresent(JBossAppMetaData.class);
+      return deploymentUnit.isAttachmentPresent(JBossAppMetaData.class) || isTopLevelServiceArchive(deploymentUnit);
    }
 
+   /**
+    * In a deployment consisting of x.sar/ejbs.jar, the x.sar substitutes an EAR.
+    */
+   protected boolean isTopLevelServiceArchive(DeploymentUnit deploymentUnit)
+   {
+      return deploymentUnit.isTopLevel() && deploymentUnit.isAttachmentPresent(ServiceDeployment.class);
+   }
+
    public String[] getRequiredAttachments()
    {
       return REQUIRED_ATTACHMENTS;