[jboss-cvs] JBossAS SVN: r99207 - in projects/reloaded/trunk/naming-deployers/src: test/java/org/jboss/reloaded/naming/deployers/test/common and 1 other directory.

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

Author: wolfc
Date: 2010-01-11 09:37:12 -0500 (Mon, 11 Jan 2010)
New Revision: 99207

Modified:
   projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/ModuleNamingDeployer.java
   projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/DummyJavaEEModuleInformer.java
Log:
RELOADED-12: do not deploy a module context for java modules (they can be stacked)

Modified: projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/ModuleNamingDeployer.java
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/ModuleNamingDeployer.java	2010-01-11 13:31:49 UTC (rev 99206)
+++ projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/ModuleNamingDeployer.java	2010-01-11 14:37:12 UTC (rev 99207)
@@ -96,6 +96,8 @@
     */
    protected boolean isJavaEEModule(DeploymentUnit unit)
    {
-      return informer.getModuleType(unit) != null;
+      // TODO: isn't this using too much inside information? It would be better to have the deployer execute explicitly on naming meta data.
+      JavaEEModuleInformer.ModuleType type = informer.getModuleType(unit);
+      return type != null && type != JavaEEModuleInformer.ModuleType.JAVA;
    }
 }

Modified: projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/DummyJavaEEModuleInformer.java
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/DummyJavaEEModuleInformer.java	2010-01-11 13:31:49 UTC (rev 99206)
+++ projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/DummyJavaEEModuleInformer.java	2010-01-11 14:37:12 UTC (rev 99207)
@@ -46,7 +46,7 @@
    public ModuleType getModuleType(DeploymentUnit deploymentUnit)
    {
       if(deploymentUnit.getSimpleName().endsWith(".jar"))
-         return ModuleType.JAVA;
+         return ModuleType.EJB;
       return null;
    }