Return-Path: 
 <scm-return-23526-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 63996 invoked from network); 12 Nov 2007 18:26:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 12 Nov 2007 18:26:02 -0000
Received: (qmail 4409 invoked by uid 500); 12 Nov 2007 18:25:49 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 4366 invoked by uid 500); 12 Nov 2007 18:25:49 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 4355 invoked by uid 99); 12 Nov 2007 18:25:49 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Nov 2007 10:25:49 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Nov 2007 18:26:46 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1AD5D1A9832; Mon, 12 Nov 2007 10:25:38 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071112182538.1AD5D1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>