Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 55571 invoked from network); 9 Apr 2011 01:36:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Apr 2011 01:36:38 -0000 Received: (qmail 14959 invoked by uid 500); 9 Apr 2011 01:36:38 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 14899 invoked by uid 500); 9 Apr 2011 01:36:38 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 14892 invoked by uid 99); 9 Apr 2011 01:36:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Apr 2011 01:36:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Apr 2011 01:36:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 52AB323889BF; Sat, 9 Apr 2011 01:36:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1090505 - in /geronimo/server/trunk/plugins/openwebbeans: geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/ geronimo-openwebbeans/ geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/... Date: Sat, 09 Apr 2011 01:36:13 -0000 To: scm@geronimo.apache.org From: xuhaihong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110409013613.52AB323889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xuhaihong Date: Sat Apr 9 01:36:12 2011 New Revision: 1090505 URL: http://svn.apache.org/viewvc?rev=1090505&view=rev Log: Revert the changes for GERONIMO-5893, it caused deployment failures Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml 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=1090505&r1=1090504&r2=1090505&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 Sat Apr 9 01:36:12 2011 @@ -23,6 +23,7 @@ import java.lang.reflect.Method; import java.net.URL; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -31,7 +32,7 @@ import java.util.Set; import java.util.jar.JarFile; import javax.enterprise.inject.Produces; - +import javax.enterprise.inject.spi.Producer; import org.apache.geronimo.common.DeploymentException; import org.apache.geronimo.deployment.ModuleIDBuilder; import org.apache.geronimo.deployment.service.EnvironmentBuilder; @@ -73,7 +74,6 @@ public class OpenWebBeansModuleBuilderEx private static final Logger log = LoggerFactory.getLogger(OpenWebBeansModuleBuilderExtension.class); private final Environment defaultEnvironment; - private final Environment jsfPluginEnvironment; //only plausible naming builder is ours that adds BeanManager entry private final NamingBuilder namingBuilders; @@ -82,10 +82,8 @@ public class OpenWebBeansModuleBuilderEx public OpenWebBeansModuleBuilderExtension( @ParamAttribute(name = "defaultEnvironment") Environment defaultEnvironment, - @ParamAttribute(name = "jsfPluginEnvironment") Environment jsfPluginEnvironment, @ParamReference(name = "NamingBuilders", namingType = NameFactory.MODULE_BUILDER) NamingBuilder namingBuilders) { this.defaultEnvironment = defaultEnvironment; - this.jsfPluginEnvironment = jsfPluginEnvironment; this.namingBuilders = namingBuilders; } @@ -97,9 +95,6 @@ public class OpenWebBeansModuleBuilderEx } EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment); - if(hasBeanXml(module)){ - EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), jsfPluginEnvironment); - } } public void createModule(Module module, Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, @@ -108,12 +103,9 @@ public class OpenWebBeansModuleBuilderEx if (!(module instanceof WebModule) /*|| !hasBeanXml(module)*/) { // not a web module, nothing to do return; - } - - EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment); - if(hasBeanXml(module)){ - EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), jsfPluginEnvironment); } + + EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment); } public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml?rev=1090505&r1=1090504&r2=1090505&view=diff ============================================================================== --- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml (original) +++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml Sat Apr 9 01:36:12 2011 @@ -160,7 +160,12 @@ org.apache.openwebbeans openwebbeans-web - + + + + org.apache.openwebbeans + openwebbeans-jsf + org.apache.openwebbeans Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java?rev=1090505&r1=1090504&r2=1090505&view=diff ============================================================================== --- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java (original) +++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java Sat Apr 9 01:36:12 2011 @@ -31,14 +31,15 @@ import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSessionActivationListener; import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionListener; - import org.apache.webbeans.component.InjectionPointBean; import org.apache.webbeans.config.OWBLogConst; +import org.apache.webbeans.config.OpenWebBeansConfiguration; import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.conversation.ConversationManager; import org.apache.webbeans.el.ELContextStore; import org.apache.webbeans.logger.WebBeansLogger; import org.apache.webbeans.spi.ContainerLifecycle; +import org.apache.webbeans.spi.ContextsService; import org.apache.webbeans.spi.FailOverService; import org.apache.webbeans.util.WebBeansUtil; import org.apache.webbeans.web.context.WebContextsService; Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml?rev=1090505&r1=1090504&r2=1090505&view=diff ============================================================================== --- geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml (original) +++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml Sat Apr 9 01:36:12 2011 @@ -52,11 +52,6 @@ ${project.version} car - - - org.apache.openwebbeans - openwebbeans-jsf - org.apache.geronimo.modules Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml?rev=1090505&r1=1090504&r2=1090505&view=diff ============================================================================== --- geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml (original) +++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml Sat Apr 9 01:36:12 2011 @@ -54,16 +54,6 @@ javassist.util.proxy - - - - - org.apache.openwebbeans - openwebbeans-jsf - - - - Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml?rev=1090505&r1=1090504&r2=1090505&view=diff ============================================================================== --- geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml Sat Apr 9 01:36:12 2011 @@ -58,11 +58,6 @@ org.apache.openwebbeans - openwebbeans-jsf - jar - - - org.apache.openwebbeans openwebbeans-resource jar