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

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

Author: alesj
Date: 2010-06-02 11:45:25 -0400 (Wed, 02 Jun 2010)
New Revision: 105583

Modified:
   trunk/server/src/main/java/org/jboss/deployment/JBossAppParsingDeployer.java
Log:
[JBAS-7974]; ignore jboss-app.xml coming from non EAR.

Modified: trunk/server/src/main/java/org/jboss/deployment/JBossAppParsingDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/JBossAppParsingDeployer.java	2010-06-02 14:27:21 UTC (rev 105582)
+++ trunk/server/src/main/java/org/jboss/deployment/JBossAppParsingDeployer.java	2010-06-02 15:45:25 UTC (rev 105583)
@@ -23,6 +23,7 @@
 
 import org.jboss.aop.microcontainer.aspects.jmx.JMX;
 import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractNameIgnoreMechanism;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
@@ -56,6 +57,7 @@
       addInput(JBossAppMetaData.class); // EarContentsDeployer can produce it
       setName("jboss-app.xml");
       setTopLevelOnly(true);
+      setNameIgnoreMechanism(new NonEarJBossAppNameIgnoreMechanism()); // JBAS-7974
    }
 
    @Override
@@ -170,4 +172,18 @@
       if (this.unauthenticatedIdentity != null)
          unit.addAttachment("EAR.unauthenticatedIdentity", this.unauthenticatedIdentity, String.class);
    }
+
+   private static class NonEarJBossAppNameIgnoreMechanism extends AbstractNameIgnoreMechanism
+   {
+      public boolean ignoreName(DeploymentUnit unit, String name)
+      {
+         return false;
+      }
+
+      public boolean ignorePath(DeploymentUnit unit, String path)
+      {
+         String simpleName = unit.getSimpleName();
+         return simpleName.endsWith(".ear") == false; // it's not EAR, ignore it
+      }
+   }
 }