Return-Path: 
 <scm-return-33690-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 18220 invoked from network); 18 Nov 2008 20:47:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 18 Nov 2008 20:47:14 -0000
Received: (qmail 30190 invoked by uid 500); 18 Nov 2008 20:47:22 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 30180 invoked by uid 500); 18 Nov 2008 20:47:22 -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 30171 invoked by uid 99); 18 Nov 2008 20:47:22 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Nov 2008 12:47:22 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Nov 2008 20:46:08 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9E9C123888E6; Tue, 18 Nov 2008 12:46:23 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r718710 [2/2] - in /geronimo/server/trunk: ./
 assemblies/geronimo-jetty6-javaee5/ assemblies/geronimo-tomcat6-javaee5/
 plugingroups/webservices-axis2/
 plugingroups/webservices-axis2/src/main/history/
 plugingroups/webservices-cxf/ plugingrou...
Date: Tue, 18 Nov 2008 20:46:22 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081118204623.9E9C123888E6@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Added: geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/resources/gsh-cxf-tools.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/resources/gsh-cxf-tools.properties?rev=718710&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/resources/gsh-cxf-tools.properties (added)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/resources/gsh-cxf-tools.properties Tue Nov 18 12:46:21 2008
@@ -0,0 +1,36 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##  http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied.  See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
+classworldsRegExTest = .*${artifactId}.*
+classworldsEntry = load ${gshell.home}/repository/org/apache/geronimo/modules/${artifactId}/${version}/${artifactId}-*.jar
+layoutXPathTest = //layout/nodes/group/nodes/command/id[contains(.,'${artifactId}')]
+layoutEntry = \n          <group>\n            \
+            <name>jaxws-cxf</name>\n\n            \
+            <nodes>\n                \
+                <command>\n                    \
+                    <name>java2wsdl</name>\n                    \
+                    <id>${artifactId}:java2wsdl</id>\n                \
+                </command>\n\n                \
+                <command>\n                    \
+                    <name>wsdl2java</name>\n                    \
+                    <id>${artifactId}:wsdl2java</id>\n                \
+                </command>\n            \
+            </nodes>\n        \
+        </group>\n          \n
+

Propchange: geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/resources/gsh-cxf-tools.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/resources/gsh-cxf-tools.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/resources/gsh-cxf-tools.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/pom.xml?rev=718710&r1=718709&r2=718710&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/pom.xml Tue Nov 18 12:46:21 2008
@@ -61,10 +61,13 @@
         <module>cxf-deployer</module>
         <module>cxf-ejb</module>
         <module>cxf-ejb-deployer</module>
+        <module>cxf-jaxws-tools</module>
+        <module>cxf-tools</module>
         <module>geronimo-cxf</module>
         <module>geronimo-cxf-builder</module>
         <module>geronimo-cxf-ejb</module>
         <module>geronimo-cxf-ejb-builder</module>
+        <module>geronimo-cxf-tools</module>
     </modules>
 
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=718710&r1=718709&r2=718710&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Nov 18 12:46:21 2008
@@ -2793,9 +2793,41 @@
 
             <dependency>
                 <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-tools-java2ws</artifactId>
+                <version>${cxfVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.cxf</groupId>
+                        <artifactId>cxf-rt-javascript</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.cxf</groupId>
+                        <artifactId>cxf-rt-databinding-aegis</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.soap</groupId>
+                        <artifactId>saaj-api</artifactId>
+                     </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-ws-addr</artifactId>
                 <version>${cxfVersion}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity</artifactId>
+                <version>1.5</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>oro</groupId>
+                        <artifactId>oro</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
         </dependencies>
     </dependencyManagement>