geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r594248 - in /geronimo/server/trunk/plugins: axis2/axis2-deployer/pom.xml axis2/axis2-ejb-deployer/pom.xml cxf/cxf-deployer/pom.xml cxf/cxf-ejb-deployer/pom.xml
Date Mon, 12 Nov 2007 18:25:36 GMT
Author: gawor
Date: Mon Nov 12 10:25:35 2007
New Revision: 594248

URL: http://svn.apache.org/viewvc?rev=594248&view=rev
Log:
updated conditions so that tomcat will continue to default to axis2 and jetty to cxf

Modified:
    geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml

Modified: geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml?rev=594248&r1=594247&r2=594248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml Mon Nov 12 10:25:35 2007
@@ -90,8 +90,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider']
== 'axis2'"/>
-                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider']
== 'axis2'"/>
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider']
== 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName ==
'tomcat6')"/>
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider']
== 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName ==
'tomcat6')"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml?rev=594248&r1=594247&r2=594248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml Mon Nov 12 10:25:35 2007
@@ -105,12 +105,12 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider']
== 'axis2'">
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider']
== 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName ==
'tomcat6')">
                                 <gbean name="Axis2ModuleBuilderExtension">
                                     <attribute name="listener">?name=#{webcontainer}</attribute>
                                 </gbean>
                             </config-xml-content>
-                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider']
== 'axis2'">
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider']
== 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName ==
'tomcat6')">
                                 <gbean name="Axis2ModuleBuilderExtension">
                                     <attribute name="listener">?name=#{webcontainer}</attribute>
                                 </gbean>

Modified: geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml?rev=594248&r1=594247&r2=594248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml Mon Nov 12 10:25:35 2007
@@ -92,8 +92,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" condition="props.getProperty('org.apache.geronimo.jaxws.provider',
'cxf') == 'cxf'"/>
-                            <config-xml-content server="offline" condition="props.getProperty('org.apache.geronimo.jaxws.provider',
'cxf') == 'cxf'"/>
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider']
== 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')"/>
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider']
== 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml?rev=594248&r1=594247&r2=594248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml Mon Nov 12 10:25:35 2007
@@ -105,12 +105,12 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" condition="props.getProperty('org.apache.geronimo.jaxws.provider',
'cxf') == 'cxf'">
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider']
== 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')">
                                 <gbean name="CXFModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
                                     <attribute name="listener">?name=#{webcontainer}</attribute>
                                 </gbean>
                             </config-xml-content>
-                            <config-xml-content server="offline" condition="props.getProperty('org.apache.geronimo.jaxws.provider',
'cxf') == 'cxf'">
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider']
== 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')">
                                 <gbean name="CXFModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
                                     <attribute name="listener">?name=#{webcontainer}</attribute>
                                 </gbean>



Mime
View raw message