Return-Path: 
 <scm-return-19992-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 13108 invoked from network); 5 Jun 2007 18:41:33 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 5 Jun 2007 18:41:33 -0000
Received: (qmail 82471 invoked by uid 500); 5 Jun 2007 18:41:36 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 82434 invoked by uid 500); 5 Jun 2007 18:41:36 -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 82423 invoked by uid 99); 5 Jun 2007 18:41:36 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jun 2007 11:41:36 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
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; Tue, 05 Jun 2007 11:41:32 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id C34631A981D; Tue,  5 Jun 2007 11:41:11 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r544590 - in /geronimo/server/trunk/assemblies:
 geronimo-jetty6-jee5/src/main/resources/var/config/offline-deployer-config.xml
 geronimo-tomcat6-jee5/src/main/resources/var/config/offline-deployer-config.xml
Date: Tue, 05 Jun 2007 18:41:11 -0000
To: scm@geronimo.apache.org
From: dwoods@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070605184111.C34631A981D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dwoods
Date: Tue Jun  5 11:41:10 2007
New Revision: 544590

URL: http://svn.apache.org/viewvc?view=rev&rev=544590
Log:
GERONIMO-3213 Can not deploy webservice offline

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/offline-deployer-config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/offline-deployer-config.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/offline-deployer-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/offline-deployer-config.xml?view=diff&rev=544590&r1=544589&r2=544590
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/offline-deployer-config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/offline-deployer-config.xml Tue Jun  5 11:41:10 2007
@@ -24,6 +24,42 @@
     <module name="org.apache.geronimo.configs/client-deployer/${version}/car"/>
     <module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
     <module name="org.apache.geronimo.configs/jetty6-deployer/${version}/car"/>
-    <module name="org.apache.geronimo.configs/axis-deployer/${version}/car"/>
     <module name="org.apache.geronimo.configs/openejb-deployer/${version}/car"/>
+    <module name="org.apache.geronimo.configs/openejb-corba-deployer/${version}/car"/>
+    <module name="org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car"/>
+    <module name="org.apache.geronimo.configs/axis-deployer/${version}/car"/>
+    <module name="org.apache.geronimo.configs/axis2-deployer/${version}/car" 
+            condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2'">
+        <gbean name="Axis2ModuleBuilderExtension">
+            <attribute name="listener">?name=JettyWebContainer</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>
+    <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car" 
+            condition="props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'">
+        <gbean name="CXFModuleBuilderExtension">
+            <attribute name="listener">?name=JettyWebContainer</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>
 </attributes>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/offline-deployer-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/offline-deployer-config.xml?view=diff&rev=544590&r1=544589&r2=544590
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/offline-deployer-config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/offline-deployer-config.xml Tue Jun  5 11:41:10 2007
@@ -28,4 +28,38 @@
     <module name="org.apache.geronimo.configs/openejb-corba-deployer/${version}/car"/>
     <module name="org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car"/>
     <module name="org.apache.geronimo.configs/axis-deployer/${version}/car"/>
+    <module name="org.apache.geronimo.configs/axis2-deployer/${version}/car"  
+            condition="props.getProperty('org.apache.geronimo.jaxws.provider', 'axis2') == 'axis2'">
+      <gbean name="Axis2ModuleBuilderExtension">
+          <attribute name="listener">?name=TomcatWebContainer</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>
+    <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car" 
+            condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf'">
+        <gbean name="CXFModuleBuilderExtension">
+            <attribute name="listener">?name=TomcatWebContainer</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>
 </attributes>