You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/04/09 03:36:13 UTC
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/...
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 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
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 @@
<version>${project.version}</version>
<type>car</type>
</dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
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 @@
<import-package>javassist.util.proxy</import-package>
</environment>
</xml-attribute>
- <xml-attribute name="jsfPluginEnvironment">
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dependencies>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- </dependency>
- </dependencies>
- </environment>
- </xml-attribute>
</gbean>
<gbean name="OWBNamingBuilder" class="org.apache.geronimo.openwebbeans.deployment.OpenWebBeansNamingBuilder"/>
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 @@
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-resource</artifactId>
<type>jar</type>
</dependency>