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 2007/02/22 10:33:49 UTC
svn commit: r510454 - in /geronimo/server/trunk:
assemblies/geronimo-jetty6-jee5/src/main/var/config/
assemblies/geronimo-tomcat6-jee5/src/main/var/config/
configs/cxf-deployer/src/plan/
modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/...
Author: djencks
Date: Thu Feb 22 01:33:48 2007
New Revision: 510454
URL: http://svn.apache.org/viewvc?view=rev&rev=510454
Log:
GERONIMO-2865 Use defaultEnvironment instead of custom method to add dependencies to apps being deployed. Improve name of property setting jaxws implementation to use
Modified:
geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml
geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml?view=diff&rev=510454&r1=510453&r2=510454
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml Thu Feb 22 01:33:48 2007
@@ -156,7 +156,7 @@
</module>
<module name="org.apache.geronimo.configs/axis2-deployer/${version}/car"
- condition="props['org.apache.geronimo.jaxwsimpl'] == 'axis2'">
+ condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2'">
<!-- this gbean is not yet written -->
<!--<gbean name="Axis2ServiceRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
@@ -164,11 +164,21 @@
</module>
<module name="org.apache.geronimo.configs/cxf-deployer/${version}/car"
- condition="props.getProperty('org.apache.geronimo.jaxwsimpl', 'cxf') == 'cxf'">
+ condition="props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'">
<gbean name="CXFModuleBuilderExtension">
<attribute name="listener">?name=JettyWebContainer</attribute>
- <attribute name="listenerModuleName">org.apache.geronimo.configs/jetty6/${version}/car</attribute>
+ <attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty6</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </attribute>
</gbean>
</module>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml?view=diff&rev=510454&r1=510453&r2=510454
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml Thu Feb 22 01:33:48 2007
@@ -163,7 +163,7 @@
</module>
<module name="org.apache.geronimo.configs/axis2-deployer/${version}/car"
- condition="props.getProperty('org.apache.geronimo.jaxwsimpl', 'axis2') == 'axis2'">
+ condition="props.getProperty('org.apache.geronimo.jaxws.provider', 'axis2') == 'axis2'">
<!-- this gbean is not yet written -->
<!--<gbean name="Axis2ServiceRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
@@ -171,11 +171,21 @@
</module>
<module name="org.apache.geronimo.configs/cxf-deployer/${version}/car"
- condition="props['org.apache.geronimo.jaxwsimpl'] == 'cxf'">
+ condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf'">
<gbean name="CXFModuleBuilderExtension">
<attribute name="listener">?name=TomcatWebContainer</attribute>
- <attribute name="listenerModuleName">org.apache.geronimo.configs/tomcat6/${version}/car</attribute>
+ <attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat6</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </attribute>
</gbean>
</module>
Modified: geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml?view=diff&rev=510454&r1=510453&r2=510454
==============================================================================
--- geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml Thu Feb 22 01:33:48 2007
@@ -161,9 +161,8 @@
</gbean>
<gbean name="CXFModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
- <!-- These two attributes must be updated appropriately in the config.xml file -->
+ <!-- This attribute and the environment must be updated appropriately in the config.xml file -->
<attribute name="listener">?name=WebContainer</attribute>
- <attribute name="listenerModuleName">WebContainer</attribute>
<reference name="WebServiceBuilder">
<name>CXFBuilder</name>
Modified: geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java?view=diff&rev=510454&r1=510453&r2=510454
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java Thu Feb 22 01:33:48 2007
@@ -25,6 +25,7 @@
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.service.EnvironmentBuilder;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
@@ -40,10 +41,7 @@
import org.apache.geronimo.kernel.Naming;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.config.ConfigurationStore;
-import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.Dependency;
import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.ImportType;
import org.apache.geronimo.openejb.deployment.EjbModule;
import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
@@ -53,23 +51,22 @@
public class JAXWSEJBModuleBuilderExtension implements ModuleBuilderExtension {
protected WebServiceBuilder jaxwsBuilder;
- protected AbstractNameQuery listener;
- protected String listenerModuleName;
+ protected AbstractNameQuery listener;
protected GBeanInfo wsGBeanInfo;
+ protected Environment defaultEnvironment;
public JAXWSEJBModuleBuilderExtension() throws Exception {
- this(null, null, null, null, null, null);
+ this(null, null, null, null, null);
}
public JAXWSEJBModuleBuilderExtension(WebServiceBuilder wsBuilder,
Environment defaultEnvironment,
AbstractNameQuery listener,
- String listenerModuleName,
Object dataLink,
Kernel kernel) throws Exception {
this.jaxwsBuilder = wsBuilder;
- this.listener = listener;
- this.listenerModuleName = listenerModuleName;
+ this.listener = listener;
+ this.defaultEnvironment = defaultEnvironment;
this.wsGBeanInfo = getGBeanInfo(kernel, dataLink);
}
@@ -93,12 +90,9 @@
jaxwsBuilder.findWebServices(moduleFile, true, correctedPortLocations, environment, ejbModule.getSharedContext());
- if (this.listenerModuleName != null) {
- Artifact id = Artifact.create(this.listenerModuleName);
- Dependency dep = new Dependency(id, ImportType.ALL);
- environment.addDependency(dep);
- }
-
+ if (this.defaultEnvironment != null) {
+ EnvironmentBuilder.mergeEnvironments(environment, this.defaultEnvironment);
+ }
}
public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {
@@ -159,7 +153,6 @@
infoBuilder.addReference("WebServiceBuilder", WebServiceBuilder.class, NameFactory.MODULE_BUILDER);
infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
infoBuilder.addAttribute("listener", AbstractNameQuery.class, true);
- infoBuilder.addAttribute("listenerModuleName", String.class, true);
infoBuilder.addReference("WebServiceLinkTemplate", Object.class, NameFactory.WEB_SERVICE_LINK);
infoBuilder.addAttribute("kernel", Kernel.class, false);
@@ -167,7 +160,6 @@
"WebServiceBuilder",
"defaultEnvironment",
"listener",
- "listenerModuleName",
"WebServiceLinkTemplate",
"kernel"
});