Author: jdillon
Date: Tue Feb 20 20:09:44 2007
New Revision: 509886
URL: http://svn.apache.org/viewvc?view=rev&rev=509886
Log:
(GERONIMO-2858) Applied condition change from Jarek, only change to use props[''] syntax when
default not needed
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/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.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=509886&r1=509885&r2=509886
==============================================================================
--- 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 Tue
Feb 20 20:09:44 2007
@@ -155,14 +155,16 @@
<module name="org.apache.geronimo.configs/client-deployer/${version}/car">
</module>
- <module name="org.apache.geronimo.configs/axis2-deployer/${version}/car" condition="props['org.apache.geronimo.jaxwsimpl']
== 'axis2'">
+ <module name="org.apache.geronimo.configs/axis2-deployer/${version}/car"
+ condition="props['org.apache.geronimo.jaxwsimpl'] == '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>
</gbean>-->
</module>
- <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car" condition="props['org.apache.geronimo.jaxwsimpl']
== 'cxf' || props['org.apache.geronimo.jaxwsimpl'] == null">
+ <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car"
+ condition="props.getProperty('org.apache.geronimo.jaxwsimpl', 'cxf') == 'cxf'">
<gbean name="CXFModuleBuilderExtension">
<attribute name="listener">?name=JettyWebContainer</attribute>
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=509886&r1=509885&r2=509886
==============================================================================
--- 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
Tue Feb 20 20:09:44 2007
@@ -162,14 +162,16 @@
<module name="org.apache.geronimo.configs/client-deployer/${version}/car">
</module>
- <module name="org.apache.geronimo.configs/axis2-deployer/${version}/car" condition="props['org.apache.geronimo.jaxwsimpl']
== 'axis2' || props['org.apache.geronimo.jaxwsimpl'] == null">
+ <module name="org.apache.geronimo.configs/axis2-deployer/${version}/car"
+ condition="props.getProperty('org.apache.geronimo.jaxwsimpl', '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>
</gbean>-->
</module>
- <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car" condition="props['org.apache.geronimo.jaxwsimpl']
== 'cxf'">
+ <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car"
+ condition="props['org.apache.geronimo.jaxwsimpl'] == 'cxf'">
<gbean name="CXFModuleBuilderExtension">
<attribute name="listener">?name=TomcatWebContainer</attribute>
Modified: geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java?view=diff&rev=509886&r1=509885&r2=509886
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
Tue Feb 20 20:09:44 2007
@@ -231,10 +231,6 @@
return status;
}
- protected String getProviderClass() {
- return org.apache.axis2.jaxws.spi.Provider.class.getName();
- }
-
public Object createService(Class serviceInterface,
Class serviceReference,
URI wsdlURI,
Modified: geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java?view=diff&rev=509886&r1=509885&r2=509886
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
Tue Feb 20 20:09:44 2007
@@ -172,10 +172,6 @@
}
}
- protected String getProviderClass() {
- return org.apache.cxf.jaxws.spi.ProviderImpl.class.getName();
- }
-
public Object createService(Class serviceInterface,
Class serviceReference,
URI wsdlURI,
Modified: geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java?view=diff&rev=509886&r1=509885&r2=509886
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java
Tue Feb 20 20:09:44 2007
@@ -56,7 +56,6 @@
public abstract class JAXWSServiceBuilder implements WebServiceBuilder {
private static final Log LOG = LogFactory.getLog(JAXWSServiceBuilder.class);
- public static final String JAXWSPROVIDER_PROPERTY = "javax.xml.ws.spi.Provider";
protected final Environment defaultEnvironment;
@@ -212,10 +211,6 @@
String seiClassName,
DeploymentContext context)
throws DeploymentException {
- String provider = System.getProperty(JAXWSPROVIDER_PROPERTY);
- if(provider != null && !provider.equals(getProviderClass())){
- return false;
- }
Map sharedContext = ((WebModule) module).getSharedContext();
Map portInfoMap = (Map) sharedContext.get(getKey());
if (portInfoMap == null) {
@@ -264,8 +259,6 @@
return true;
}
-
- protected abstract String getProviderClass();
protected abstract GBeanInfo getContainerFactoryGBeanInfo();
|