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 2010/11/17 08:46:12 UTC
svn commit: r1035941 -
/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
Author: xuhaihong
Date: Wed Nov 17 07:46:11 2010
New Revision: 1035941
URL: http://svn.apache.org/viewvc?rev=1035941&view=rev
Log:
Only merge the openwebbeans environment if required
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=1035941&r1=1035940&r2=1035941&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 Wed Nov 17 07:46:11 2010
@@ -73,20 +73,18 @@ public class OpenWebBeansModuleBuilderEx
public void createModule(Module module, Bundle bundle, Naming naming, ModuleIDBuilder idBuilder)
throws DeploymentException {
- if (!(module instanceof WebModule)) {
+ if (!(module instanceof WebModule) || !hasBeanXml(module)) {
// not a web module, nothing to do
return;
}
EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
-
}
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)) {
+ if (!(module instanceof WebModule) || !hasBeanXml(module)) {
// not a web module, nothing to do
return;
}
@@ -109,11 +107,11 @@ public class OpenWebBeansModuleBuilderEx
}
WebModule webModule = (WebModule) module;
-
+
if (!hasBeansXml(bundle)) {
return;
}
-
+
EARContext moduleContext = module.getEarContext();
Map sharedContext = module.getSharedContext();
//add the ServletContextListener to the web app context
@@ -137,8 +135,8 @@ public class OpenWebBeansModuleBuilderEx
ClassFinder classFinder = createOpenWebBeansClassFinder(webApp, webModule);
webModule.setClassFinder(classFinder);
- namingBuilders.buildNaming(webApp, jettyWebApp, webModule, buildingContext);
-
+ namingBuilders.buildNaming(webApp, jettyWebApp, webModule, buildingContext);
+
// AbstractName webBeansGBeanName = moduleContext.getNaming().createChildName(moduleName, "webbeans-lifecycle", "webbeans");
// GBeanData providerData = new GBeanData(webBeansGBeanName, OpenWebBeansGBean.class);
// try {
@@ -152,17 +150,21 @@ public class OpenWebBeansModuleBuilderEx
}
private boolean hasBeansXml(Bundle bundle) {
- return bundle.getEntry("WEB-INF/beans.xml") != null || bundle.getResource("META-INF/beans.xml") != null;
+ return bundle.getEntry("WEB-INF/beans.xml") != null || bundle.getResource("META-INF/beans.xml") != null;
}
-
+
+ private boolean hasBeanXml(Module webModule) {
+ return webModule.getDeployable().getResource("WEB-INF/beans.xml") != null || webModule.getDeployable().getResource("META-INF/beans.xml") != null;
+ }
+
protected ClassFinder createOpenWebBeansClassFinder(WebApp webApp, WebModule webModule)
throws DeploymentException {
List<Class> classes = getManagedClasses(webApp, webModule);
return new ClassFinder(classes);
- }
-
- private List<Class> getManagedClasses(WebApp webApp, WebModule webModule) throws DeploymentException {
+ }
+
+ private List<Class> getManagedClasses(WebApp webApp, WebModule webModule) throws DeploymentException {
return Collections.EMPTY_LIST;
- }
-
+ }
+
}