FYI, I just changed 'props' to be a real Properties object, so you
can use something like:
condition="props.getProperty('org.apache.geronimo.jaxwsimpl',
'cxf') == 'cxf'"
instead of:
condition="props['org.apache.geronimo.jaxwsimpl'] == 'cxf' ||
props['org.apache.geronimo.jaxwsimpl'] == null"
--jason
On Feb 20, 2007, at 5:15 PM, [EMAIL PROTECTED] wrote:
Author: djencks
Date: Tue Feb 20 17:15:34 2007
New Revision: 509853
URL: http://svn.apache.org/viewvc?view=rev&rev=509853
Log:
Use jdillons' expression evaluation to switch between cxf and axis2
using a command line -Dorg.apache.geronimo.jaxwsimpl=cxf/axis2
property
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
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=509853&r1=509852&r2=509853
======================================================================
========
--- 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 17:15:34 2007
@@ -155,14 +155,14 @@
<module name="org.apache.geronimo.configs/client-deployer/$
{version}/car">
</module>
- <module name="org.apache.geronimo.configs/axis2-deployer/$
{version}/car" load="false">
+ <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">
+ <module name="org.apache.geronimo.configs/cxf-deployer/$
{version}/car" condition="props['org.apache.geronimo.jaxwsimpl'] ==
'cxf' || props['org.apache.geronimo.jaxwsimpl'] == null">
<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=509853&r1=509852&r2=509853
======================================================================
========
--- 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 17:15:34 2007
@@ -162,14 +162,14 @@
<module name="org.apache.geronimo.configs/client-deployer/$
{version}/car">
</module>
- <module name="org.apache.geronimo.configs/axis2-deployer/$
{version}/car" load="false">
+ <module name="org.apache.geronimo.configs/axis2-deployer/$
{version}/car" condition="props['org.apache.geronimo.jaxwsimpl']
== 'axis2' || props['org.apache.geronimo.jaxwsimpl'] == null">
<!-- 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">
+ <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>
