You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/12/06 19:09:35 UTC

svn commit: r1042749 - /geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java

Author: djencks
Date: Mon Dec  6 18:09:35 2010
New Revision: 1042749

URL: http://svn.apache.org/viewvc?rev=1042749&view=rev
Log:
GERONIMO-5050 at the moment the web/ejb integrations treat every app as a web beans app so the deployer MBE should too

Modified:
    geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java

Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java?rev=1042749&r1=1042748&r2=1042749&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java Mon Dec  6 18:09:35 2010
@@ -89,7 +89,7 @@ public class OpenWebBeansModuleBuilderEx
 
     public void createModule(Module module, Bundle bundle, Naming naming, ModuleIDBuilder idBuilder)
             throws DeploymentException {
-        if (!(module instanceof WebModule) || !hasBeanXml(module)) {
+        if (!(module instanceof WebModule) /*|| !hasBeanXml(module)*/) {
             // not a web module, nothing to do
             return;
         }
@@ -100,7 +100,7 @@ public class OpenWebBeansModuleBuilderEx
     public void createModule(Module module, Object plan, JarFile moduleFile, String targetPath, URL specDDUrl,
             Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming,
             ModuleIDBuilder idBuilder) throws DeploymentException {
-        if (!(module instanceof WebModule) || !hasBeanXml(module)) {
+        if (!(module instanceof WebModule) /*|| !hasBeanXml(module)*/) {
             // not a web module, nothing to do
             return;
         }
@@ -124,9 +124,9 @@ public class OpenWebBeansModuleBuilderEx
 
         WebModule webModule = (WebModule) module;
 
-        if (!hasBeansXml(bundle)) {
-            return;
-        }
+//        if (!hasBeansXml(bundle)) {
+//            return;
+//        }
 
         EARContext moduleContext = module.getEarContext();
         Map sharedContext = module.getSharedContext();