geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r703564 [1/2] - in /geronimo/server/trunk: framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/jul/ plugingroups/webservices-axis2/ plugingroups/webservices-axis2/src/main/history/ plugingroups/webservices-cxf...
Date Fri, 10 Oct 2008 19:35:41 GMT
Author: gawor
Date: Fri Oct 10 12:35:39 2008
New Revision: 703564

URL: http://svn.apache.org/viewvc?rev=703564&view=rev
Log:
refactor wsgen functionality into a separate plugin (part of GERONIMO-4351)

Added:
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/jul/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGenerator.java   (with props)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGeneratorOptions.java   (with props)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml   (with props)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java   (contents, props changed)
      - copied, changed from r703222, geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java   (props changed)
      - copied unchanged from r703222, geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/SunWsdlGenerator.java   (with props)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java   (contents, props changed)
      - copied, changed from r703222, geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsgenCommand.java   (contents, props changed)
      - copied, changed from r703222, geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsgenCommand.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsimportCommand.java   (contents, props changed)
      - copied, changed from r703222, geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsimportCommand.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/resources/   (props changed)
      - copied from r703516, geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/resources/
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/pom.xml   (with props)
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/appended-resources/
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/appended-resources/META-INF/
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/appended-resources/META-INF/NOTICE.vm
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml   (with props)
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/plan/
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/resources/
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/resources/META-INF/
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/resources/META-INF/startup-jar
    geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/history/
    geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/history/dependencies.xml   (with props)
    geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/plan/
    geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/plan/plan.xml   (with props)
Removed:
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsgenCommand.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsimportCommand.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/resources/
    geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/resources/
Modified:
    geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml
    geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml
    geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml
    geronimo/server/trunk/plugingroups/webservices-cxf/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
    geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2EJBBuilder.java
    geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
    geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFEJBBuilder.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/resources/gsh-wsgen.properties
    geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml
    geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml
    geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/assembly/bin.xml
    geronimo/server/trunk/plugins/jaxws/pom.xml

Modified: geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml Fri Oct 10 12:35:39 2008
@@ -63,7 +63,7 @@
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jaxws-tools</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml Fri Oct 10 12:35:39 2008
@@ -8,18 +8,13 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jaxws-deployer</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>axis2-ejb-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>jaxws-tools</artifactId>
-        <type>jar</type>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml Fri Oct 10 12:35:39 2008
@@ -63,7 +63,7 @@
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jaxws-tools</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugingroups/webservices-cxf/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-cxf/src/main/history/dependencies.xml?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-cxf/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/webservices-cxf/src/main/history/dependencies.xml Fri Oct 10 12:35:39 2008
@@ -8,18 +8,13 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jaxws-deployer</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>cxf-ejb-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>jaxws-tools</artifactId>
-        <type>jar</type>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>

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=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml Fri Oct 10 12:35:39 2008
@@ -56,30 +56,11 @@
             <version>${version}</version>
         </dependency>
 
-        <!-- Needed for generating wsdl -->
         <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-tools</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.stream.buffer</groupId>
-            <artifactId>streambuffer</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jvnet.staxex</groupId>
-            <artifactId>stax-ex</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jaxws-sun-tools</artifactId>
+            <type>car</type>
+            <version>${version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/history/dependencies.xml?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/history/dependencies.xml Fri Oct 10 12:35:39 2008
@@ -22,28 +22,8 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.jvnet.staxex</groupId>
-        <artifactId>stax-ex</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.xml.stream.buffer</groupId>
-        <artifactId>streambuffer</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.xml.ws</groupId>
-        <artifactId>jaxws-rt</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.xml.ws</groupId>
-        <artifactId>jaxws-tools</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-xjc</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jaxws-sun-tools</artifactId>
+        <type>car</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/plan/plan.xml?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/plan/plan.xml Fri Oct 10 12:35:39 2008
@@ -32,6 +32,9 @@
                 </dependencies>
             </environment>
         </xml-attribute>
+        <reference name="WsdlGenerator">
+            <name>SunWsdlGenerator</name>
+        </reference>
     </gbean>
 
     <gbean name="Axis2ServiceRefBuilder" class="org.apache.geronimo.axis2.builder.Axis2ServiceRefBuilder">

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=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml Fri Oct 10 12:35:39 2008
@@ -77,13 +77,6 @@
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>axis2-deployer</artifactId>
-                            <type>car</type>
-                            <!--TODO really????? this is unlikely.  Please explain -->
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>axis2-ejb</artifactId>
                             <type>car</type>
                             <import>classes</import>

Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/plan/plan.xml?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/plan/plan.xml Fri Oct 10 12:35:39 2008
@@ -32,6 +32,9 @@
                 </dependencies>
             </environment>
         </xml-attribute>
+        <reference name="WsdlGenerator">
+            <name>SunWsdlGenerator</name>
+        </reference>
     </gbean>
 
    <gbean name="Axis2ModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java Fri Oct 10 12:35:39 2008
@@ -42,7 +42,8 @@
 import org.apache.geronimo.jaxws.PortInfo;
 import org.apache.geronimo.jaxws.builder.JAXWSServiceBuilder;
 import org.apache.geronimo.jaxws.builder.WARWebServiceFinder;
-import org.apache.geronimo.jaxws.builder.WsdlGenerator;
+import org.apache.geronimo.jaxws.wsdl.WsdlGenerator;
+import org.apache.geronimo.jaxws.wsdl.WsdlGeneratorOptions;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.xbeans.javaee.PortComponentType;
 import org.apache.geronimo.xbeans.javaee.ServiceImplBeanType;
@@ -59,8 +60,12 @@
 
     private static final Logger log = LoggerFactory.getLogger(Axis2Builder.class);
         
-    public Axis2Builder(Environment defaultEnviroment) {
+    protected WsdlGenerator wsdlGenerator;
+    
+    public Axis2Builder(Environment defaultEnviroment,
+                        WsdlGenerator wsdlGenerator) {
         super(defaultEnviroment);
+        this.wsdlGenerator = wsdlGenerator;
         this.webServiceFinder = new WARWebServiceFinder();
     }
     
@@ -204,22 +209,22 @@
         
         log.debug("Service " + portInfo.getServiceName() + " does not have WSDL. Generating WSDL...");
 
-        WsdlGenerator generator = new WsdlGenerator();
-        generator.setAxis2SAAJ();
+        WsdlGeneratorOptions options = new WsdlGeneratorOptions();
+        options.setSAAJ(WsdlGeneratorOptions.SAAJ.Axis2);
         
         // set wsdl service
         if (portInfo.getWsdlService() == null) {
-            generator.setWsdlService(JAXWSUtils.getServiceQName(serviceClass));
+            options.setWsdlService(JAXWSUtils.getServiceQName(serviceClass));
         } else {
-            generator.setWsdlService(portInfo.getWsdlService());
+            options.setWsdlService(portInfo.getWsdlService());
         }
         
         // set wsdl port
         if (portInfo.getWsdlPort() != null) {
-            generator.setWsdlPort(portInfo.getWsdlPort());
+            options.setWsdlPort(portInfo.getWsdlPort());
         }
                 
-        String wsdlFile = generator.generateWsdl(module, serviceClass.getName(), module.getEarContext(), portInfo);
+        String wsdlFile = this.wsdlGenerator.generateWsdl(module, serviceClass.getName(), module.getEarContext(), options);
         portInfo.setWsdlFile(wsdlFile);
         
         log.debug("Generated " + wsdlFile + " for service " + portInfo.getServiceName());        
@@ -254,7 +259,8 @@
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(Axis2Builder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addInterface(WebServiceBuilder.class);
         infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
-        infoBuilder.setConstructor(new String[]{"defaultEnvironment"});
+        infoBuilder.addReference("WsdlGenerator", WsdlGenerator.class, GBeanInfoBuilder.DEFAULT_J2EE_TYPE);
+        infoBuilder.setConstructor(new String[]{"defaultEnvironment", "WsdlGenerator"});
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }
 

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2EJBBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2EJBBuilder.java?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2EJBBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2EJBBuilder.java Fri Oct 10 12:35:39 2008
@@ -22,6 +22,7 @@
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.jaxws.builder.EJBWebServiceFinder;
+import org.apache.geronimo.jaxws.wsdl.WsdlGenerator;
 import org.apache.geronimo.kernel.repository.Environment;
 
 /**
@@ -29,13 +30,14 @@
  */
 public class Axis2EJBBuilder extends Axis2Builder {
         
-    public Axis2EJBBuilder(Environment defaultEnviroment) {
-        super(defaultEnviroment);
+    public Axis2EJBBuilder(Environment defaultEnviroment,
+                           WsdlGenerator wsdlGenerator) {
+        super(defaultEnviroment, wsdlGenerator);
         this.webServiceFinder = new EJBWebServiceFinder();
     }
     
     public Axis2EJBBuilder(){
-        super(null);
+        super();
     }
               
     public static final GBeanInfo GBEAN_INFO;
@@ -44,7 +46,8 @@
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(Axis2EJBBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addInterface(WebServiceBuilder.class);
         infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
-        infoBuilder.setConstructor(new String[]{"defaultEnvironment"});
+        infoBuilder.addReference("WsdlGenerator", WsdlGenerator.class, GBeanInfoBuilder.DEFAULT_J2EE_TYPE);
+        infoBuilder.setConstructor(new String[]{"defaultEnvironment", "WsdlGenerator"});
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }
 

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=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml Fri Oct 10 12:35:39 2008
@@ -56,6 +56,13 @@
             <version>${version}</version>
             <scope>runtime</scope>
        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jaxws-sun-tools</artifactId>
+            <type>car</type>
+            <version>${version}</version>
+        </dependency>
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/history/dependencies.xml?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/history/dependencies.xml Fri Oct 10 12:35:39 2008
@@ -21,4 +21,9 @@
         <artifactId>geronimo-cxf-builder</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jaxws-sun-tools</artifactId>
+        <type>car</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/plan/plan.xml?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/plan/plan.xml Fri Oct 10 12:35:39 2008
@@ -32,6 +32,9 @@
                 </dependencies>
             </environment>
         </xml-attribute>
+        <reference name="WsdlGenerator">
+            <name>SunWsdlGenerator</name>
+        </reference>
     </gbean>
 
     <gbean name="CXFServiceRefBuilder" class="org.apache.geronimo.cxf.builder.CXFServiceRefBuilder">

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=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml Fri Oct 10 12:35:39 2008
@@ -74,13 +74,6 @@
                     <category>Web Services</category>
                     <dependencies>
                         <dependency>
-                            <!-- really? -->
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>cxf-deployer</artifactId>
-                            <type>car</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>cxf-ejb</artifactId>
                             <type>car</type>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/plan/plan.xml?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/plan/plan.xml Fri Oct 10 12:35:39 2008
@@ -32,6 +32,9 @@
                 </dependencies>
             </environment>
         </xml-attribute>
+        <reference name="WsdlGenerator">
+            <name>SunWsdlGenerator</name>
+        </reference>
     </gbean>
 
     <gbean name="CXFModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">

Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java Fri Oct 10 12:35:39 2008
@@ -51,7 +51,8 @@
 import org.apache.geronimo.jaxws.PortInfo;
 import org.apache.geronimo.jaxws.builder.JAXWSServiceBuilder;
 import org.apache.geronimo.jaxws.builder.WARWebServiceFinder;
-import org.apache.geronimo.jaxws.builder.WsdlGenerator;
+import org.apache.geronimo.jaxws.wsdl.WsdlGenerator;
+import org.apache.geronimo.jaxws.wsdl.WsdlGeneratorOptions;
 import org.apache.geronimo.kernel.repository.Environment;
 
 public class CXFBuilder extends JAXWSServiceBuilder {
@@ -65,12 +66,15 @@
     private static final String USE_WSGEN_PROPERTY = 
         "org.apache.geronimo.cxf.use.wsgen";
 
+    protected WsdlGenerator wsdlGenerator;
+    
     public CXFBuilder() {
         super(null);
     }
 
-    public CXFBuilder(Environment defaultEnvironment) {
+    public CXFBuilder(Environment defaultEnvironment, WsdlGenerator wsdlGenerator) {
         super(defaultEnvironment);
+        this.wsdlGenerator = wsdlGenerator;
         this.webServiceFinder = new WARWebServiceFinder();
     }
 
@@ -203,25 +207,25 @@
             return;
         }        
         LOG.debug("Service " + portInfo.getServiceName() + " does not have WSDL. Generating WSDL...");
-
-        WsdlGenerator generator = new WsdlGenerator();
-        generator.setSunSAAJ();
+        
+        WsdlGeneratorOptions options = new WsdlGeneratorOptions();
+        options.setSAAJ(WsdlGeneratorOptions.SAAJ.SUN);
         
         JaxWsImplementorInfo serviceInfo = new JaxWsImplementorInfo(serviceClass);
         
         // set wsdl service
         if (portInfo.getWsdlService() == null) {
-            generator.setWsdlService(serviceInfo.getServiceName());
+            options.setWsdlService(serviceInfo.getServiceName());
         } else {
-            generator.setWsdlService(portInfo.getWsdlService());
+            options.setWsdlService(portInfo.getWsdlService());
         }
         
         // set wsdl port
         if (portInfo.getWsdlPort() != null) {
-            generator.setWsdlPort(portInfo.getWsdlPort());
+            options.setWsdlPort(portInfo.getWsdlPort());
         }
                         
-        String wsdlFile = generator.generateWsdl(module, serviceClass.getName(), module.getEarContext(), portInfo);
+        String wsdlFile = this.wsdlGenerator.generateWsdl(module, serviceClass.getName(), module.getEarContext(), options);
         portInfo.setWsdlFile(wsdlFile);
         
         LOG.debug("Generated " + wsdlFile + " for service " + portInfo.getServiceName()); 
@@ -238,8 +242,8 @@
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(CXFBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addInterface(WebServiceBuilder.class);
         infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
-
-        infoBuilder.setConstructor(new String[]{"defaultEnvironment"});
+        infoBuilder.addReference("WsdlGenerator", WsdlGenerator.class, GBeanInfoBuilder.DEFAULT_J2EE_TYPE);
+        infoBuilder.setConstructor(new String[]{"defaultEnvironment", "WsdlGenerator"});
 
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }

Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFEJBBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFEJBBuilder.java?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFEJBBuilder.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFEJBBuilder.java Fri Oct 10 12:35:39 2008
@@ -21,16 +21,17 @@
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.jaxws.builder.EJBWebServiceFinder;
+import org.apache.geronimo.jaxws.wsdl.WsdlGenerator;
 import org.apache.geronimo.kernel.repository.Environment;
 
 public class CXFEJBBuilder extends CXFBuilder {
 
     public CXFEJBBuilder() {
-        super(null);
+        super();
     }
 
-    public CXFEJBBuilder(Environment defaultEnvironment) {
-        super(defaultEnvironment);
+    public CXFEJBBuilder(Environment defaultEnvironment, WsdlGenerator wsdlGenerator) {
+        super(defaultEnvironment, wsdlGenerator);
         this.webServiceFinder = new EJBWebServiceFinder();
     }
   
@@ -40,8 +41,8 @@
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(CXFEJBBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addInterface(WebServiceBuilder.class);
         infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
-
-        infoBuilder.setConstructor(new String[]{"defaultEnvironment"});
+        infoBuilder.addReference("WsdlGenerator", WsdlGenerator.class, GBeanInfoBuilder.DEFAULT_J2EE_TYPE);
+        infoBuilder.setConstructor(new String[]{"defaultEnvironment", "WsdlGenerator"});
 
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml Fri Oct 10 12:35:39 2008
@@ -46,31 +46,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-command-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.gshell</groupId>
-                <artifactId>gshell-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>descriptor</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Added: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGenerator.java?rev=703564&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGenerator.java (added)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGenerator.java Fri Oct 10 12:35:39 2008
@@ -0,0 +1,30 @@
+/**
+ *  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.
+ */
+package org.apache.geronimo.jaxws.wsdl;
+
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.j2ee.deployment.Module;
+
+public interface WsdlGenerator {
+
+    public String generateWsdl(Module module, 
+                               String serviceClass, 
+                               DeploymentContext context, 
+                               WsdlGeneratorOptions options) throws DeploymentException;
+
+}

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGenerator.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGenerator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGeneratorOptions.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGeneratorOptions.java?rev=703564&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGeneratorOptions.java (added)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGeneratorOptions.java Fri Oct 10 12:35:39 2008
@@ -0,0 +1,124 @@
+/**
+ *  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.
+ */
+package org.apache.geronimo.jaxws.wsdl;
+
+import javax.xml.namespace.QName;
+
+public class WsdlGeneratorOptions {
+
+    private final static String ADD_TO_CLASSPATH_WSGEN_PROPERTY =
+        "org.apache.geronimo.jaxws.wsgen.addToClassPath";
+    
+    private final static String FORK_WSGEN_PROPERTY = 
+        "org.apache.geronimo.jaxws.wsgen.fork";
+    
+    private final static String FORK_TIMEOUT_WSGEN_PROPERTY = 
+        "org.apache.geronimo.jaxws.wsgen.fork.timeout";
+    
+    public final static long FORK_POLL_FREQUENCY = 1000 * 2; // 2 seconds
+    
+    public enum SAAJ { SUN, Axis2 };
+    
+    private QName wsdlService;
+    private QName wsdlPort;
+    private SAAJ saaj;
+    private boolean fork = getDefaultFork();
+    private long forkTimeout = getDefaultForkTimeout();
+    private boolean addToClassPath = getDefaultAddToClassPath();
+    
+    private static boolean getDefaultFork() {
+        String value = System.getProperty(FORK_WSGEN_PROPERTY);
+        if (value != null) {
+            return Boolean.valueOf(value).booleanValue();
+        } else {
+            String osName = System.getProperty("os.name");
+            if (osName == null) {
+                return false;
+            }
+            osName = osName.toLowerCase();
+            // Fork on Windows only
+            return (osName.indexOf("windows") != -1);            
+        }
+    }
+    
+    private static long getDefaultForkTimeout() {
+        String value = System.getProperty(FORK_TIMEOUT_WSGEN_PROPERTY);
+        if (value != null) {
+            return Long.parseLong(value);
+        } else {
+            return 1000 * 60; // 60 seconds
+        }
+    }
+    
+    private static boolean getDefaultAddToClassPath() {
+        String value = System.getProperty(ADD_TO_CLASSPATH_WSGEN_PROPERTY);
+        if (value == null) {
+            return true;
+        } else {
+            return Boolean.parseBoolean(value);
+        }
+    }
+    
+    public QName getWsdlService() {
+        return wsdlService;
+    }
+    
+    public void setWsdlService(QName wsdlService) {
+        this.wsdlService = wsdlService;
+    }
+    
+    public QName getWsdlPort() {
+        return wsdlPort;
+    }
+    
+    public void setWsdlPort(QName wsdlPort) {
+        this.wsdlPort = wsdlPort;
+    }
+
+    public void setSAAJ(SAAJ saaj) {
+        this.saaj = saaj;
+    }
+    
+    public SAAJ getSAAJ() {
+        return this.saaj;
+    }
+    
+    public void setAddToClassPath(boolean addToClassPath) {
+        this.addToClassPath = addToClassPath;        
+    }
+    
+    public boolean getAddToClassPath() {
+        return this.addToClassPath;
+    }
+    
+    public long getForkTimeout() {
+        return forkTimeout;
+    }
+
+    public void setForkTimeout(long forkTimeout) {
+        this.forkTimeout = forkTimeout;
+    }
+
+    public void setFork(boolean fork) {
+        this.fork = fork;
+    }
+    
+    public boolean getFork() {
+        return this.fork;
+    }
+    
+}

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGeneratorOptions.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGeneratorOptions.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/WsdlGeneratorOptions.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml?rev=703564&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml (added)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml Fri Oct 10 12:35:39 2008
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>jaxws</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-jaxws-sun-tools</artifactId>
+    <name>Geronimo Plugins, JAXWS :: Sun JAX-WS Tools</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jaxws-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.gshell</groupId>
+            <artifactId>gshell-command-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.gshell</groupId>
+                <artifactId>gshell-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>descriptor</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java (from r703222, geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java&p1=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java&r1=703222&r2=703564&rev=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java Fri Oct 10 12:35:39 2008
@@ -62,6 +62,7 @@
         { "org.apache.geronimo.specs",    "geronimo-jta_1.1_spec"},
         { "org.apache.geronimo.specs",    "geronimo-j2ee-management_1.1_spec"},
         { "org.codehaus.woodstox",        "wstx-asl" },
+        { "org.apache.geronimo.modules",  "geronimo-webservices" },
     };
     
     private final static Artifact SUN_SAAJ_IMPL_ARTIFACT = new Artifact("com.sun.xml.messaging.saaj","saaj-impl", (Version)null, "jar");
@@ -187,8 +188,7 @@
     }
     
     private boolean invoke(String toolName, URL[] jars, OutputStream os, String[] arguments) throws Exception {
-        ClassLoader parent = (this.parentClassLoader == null) ? getClass().getClassLoader() : this.parentClassLoader;
-        JarFileClassLoader loader = new JarFileClassLoader(null, jars, parent);
+        JarFileClassLoader loader = new JarFileClassLoader(null, jars, ClassLoader.getSystemClassLoader());
         if (this.overrideContextClassLoader) {
             ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
             Thread.currentThread().setContextClassLoader(loader);

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Added: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/SunWsdlGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/SunWsdlGenerator.java?rev=703564&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/SunWsdlGenerator.java (added)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/SunWsdlGenerator.java Fri Oct 10 12:35:39 2008
@@ -0,0 +1,49 @@
+/**
+ * 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.
+ */
+
+package org.apache.geronimo.jaxws.builder;
+
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.deployment.Module;
+import org.apache.geronimo.jaxws.wsdl.WsdlGeneratorOptions;
+
+public class SunWsdlGenerator implements org.apache.geronimo.jaxws.wsdl.WsdlGenerator {
+
+    public String generateWsdl(Module module,
+                               String serviceClass,
+                               DeploymentContext context,
+                               WsdlGeneratorOptions options) throws DeploymentException {
+        WsdlGenerator generator = new WsdlGenerator(options);                              
+        return generator.generateWsdl(module, serviceClass, context, null);
+    }
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(SunWsdlGenerator.class, GBeanInfoBuilder.DEFAULT_J2EE_TYPE);
+        infoBuilder.addInterface(org.apache.geronimo.jaxws.wsdl.WsdlGenerator.class);
+        GBEAN_INFO = infoBuilder.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+    
+}

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/SunWsdlGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/SunWsdlGenerator.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/SunWsdlGenerator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java (from r703222, geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java&p1=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java&r1=703222&r2=703564&rev=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java Fri Oct 10 12:35:39 2008
@@ -41,6 +41,7 @@
 import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.jaxws.PortInfo;
+import org.apache.geronimo.jaxws.wsdl.WsdlGeneratorOptions;
 import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationResolver;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
@@ -50,94 +51,21 @@
 
     private static final Logger LOG = LoggerFactory.getLogger(WsdlGenerator.class);
     
-    private final static String ADD_TO_CLASSPATH_WSGEN_PROPERTY =
-        "org.apache.geronimo.jaxws.wsgen.addToClassPath";
-    
-    private final static String FORK_WSGEN_PROPERTY = 
-        "org.apache.geronimo.jaxws.wsgen.fork";
-    
-    private final static String FORK_TIMEOUT_WSGEN_PROPERTY = 
-        "org.apache.geronimo.jaxws.wsgen.fork.timeout";
-    
-    private final static long FORK_POLL_FREQUENCY = 1000 * 2; // 2 seconds
-    
-    private QName wsdlService;
-    private QName wsdlPort;
-    private boolean forkWsgen = getForkWsgen();
-    private long forkTimeout = getForTimeout();
-    private boolean addToClassPath = getDefaultAddToClassPath();
     private JAXWSTools jaxwsTools;
-        
-    private static boolean getForkWsgen() {
-        String value = System.getProperty(FORK_WSGEN_PROPERTY);
-        if (value != null) {
-            return Boolean.valueOf(value).booleanValue();
-        } else {
-            String osName = System.getProperty("os.name");
-            if (osName == null) {
-                return false;
-            }
-            osName = osName.toLowerCase();
-            // Fork on Windows only
-            return (osName.indexOf("windows") != -1);            
-        }
-    }
-    
-    private static long getForTimeout() {
-        String value = System.getProperty(FORK_TIMEOUT_WSGEN_PROPERTY);
-        if (value != null) {
-            return Long.parseLong(value);
-        } else {
-            return 1000 * 60; // 60 seconds
-        }
-    }
+    private WsdlGeneratorOptions options;
     
-    private static boolean getDefaultAddToClassPath() {
-        String value = System.getProperty(ADD_TO_CLASSPATH_WSGEN_PROPERTY);
-        if (value == null) {
-            return true;
-        } else {
-            return Boolean.parseBoolean(value);
-        }
-    }
-    
-    public WsdlGenerator() {
+    public WsdlGenerator(WsdlGeneratorOptions options) {
+        this.options = options;
         this.jaxwsTools = new JAXWSTools();
         this.jaxwsTools.setOverrideContextClassLoader(true);
+        
+        if (options.getSAAJ() == WsdlGeneratorOptions.SAAJ.SUN) {
+            this.jaxwsTools.setUseSunSAAJ();
+        } else if (options.getSAAJ() == WsdlGeneratorOptions.SAAJ.Axis2) {
+            this.jaxwsTools.setUseAxis2SAAJ();
+        }
     }
-    
-    public void setSunSAAJ() {
-        this.jaxwsTools.setUseSunSAAJ();
-    }
-    
-    public void setAxis2SAAJ() {
-        this.jaxwsTools.setUseAxis2SAAJ();
-    }
-    
-    public void setWsdlService(QName name) {
-        this.wsdlService = name;
-    }
-    
-    public QName getWsdlService() {
-        return this.wsdlService;        
-    }
-    
-    public void setWsdlPort(QName port) {
-        this.wsdlPort = port;
-    }
-    
-    public QName getWsdlPort() {
-        return this.wsdlPort;
-    }
-    
-    public void setAddToClassPath(boolean addToClassPath) {
-        this.addToClassPath = addToClassPath;        
-    }
-    
-    public boolean getAddToClassPath() {
-        return this.addToClassPath;
-    }
-    
+                
     private URL[] getWsgenClasspath(DeploymentContext context) throws Exception {
         DeploymentConfigurationManager cm = (DeploymentConfigurationManager)context.getConfigurationManager();
         Collection<? extends Repository> repositories = cm.getRepositories();
@@ -203,13 +131,13 @@
         arguments.add("-d");
         arguments.add(moduleBaseDir.getAbsolutePath());
         
-        QName serviceName = getWsdlService();
+        QName serviceName = this.options.getWsdlService();
         if (serviceName != null) {
             arguments.add("-servicename");
             arguments.add(serviceName.toString());
         }
 
-        QName portName = getWsdlPort();
+        QName portName = this.options.getWsdlPort();
         if (portName != null) {
             arguments.add("-portname");
             arguments.add(portName.toString());
@@ -236,7 +164,7 @@
     }
     
     private File findWsdlFile(File baseDir, PortInfo portInfo) throws IOException {
-        QName serviceName = getWsdlService();
+        QName serviceName = this.options.getWsdlService();
 
         if (serviceName != null) {
             // check if serviceName.wsdl locates at the baseDir, if so, return its path.
@@ -326,7 +254,7 @@
         try {
             boolean result = false;
             
-            if (this.forkWsgen) {
+            if (this.options.getFork()) {
                 result = forkWsgen(classPath, arguments);
             } else {
                 result = invokeWsgen(urls, arguments);
@@ -338,7 +266,7 @@
                 if (wsdlFile == null) {
                     throw new DeploymentException("Unable to find the service wsdl file");
                 }
-                if (this.addToClassPath) {
+                if (this.options.getAddToClassPath()) {
                     context.getConfiguration().addToClassPath(baseDir.getName());
                 }
                 return getRelativeNameOrURL(moduleBase, wsdlFile);
@@ -393,7 +321,7 @@
         outputThread.start();        
                 
         long sleepTime = 0;        
-        while(sleepTime < this.forkTimeout) {            
+        while(sleepTime < this.options.getForkTimeout()) {            
             try {
                 int errorCode = process.exitValue();
                 if (errorCode == 0) {
@@ -409,13 +337,13 @@
             } catch (IllegalThreadStateException e) {
                 // still running
                 try {
-                    Thread.sleep(FORK_POLL_FREQUENCY);
+                    Thread.sleep(WsdlGeneratorOptions.FORK_POLL_FREQUENCY);
                 } catch (InterruptedException ee) {
                     // interrupted
                     process.destroy();
                     throw new DeploymentException("WSDL generation process was interrupted");
                 }
-                sleepTime += FORK_POLL_FREQUENCY;
+                sleepTime += WsdlGeneratorOptions.FORK_POLL_FREQUENCY;
             }
         }
         

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsgenCommand.java (from r703222, geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsgenCommand.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsgenCommand.java?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsgenCommand.java&p1=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsgenCommand.java&r1=703222&r2=703564&rev=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsgenCommand.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsgenCommand.java Fri Oct 10 12:35:39 2008
@@ -30,7 +30,7 @@
  * 
  * @version $Rev: 595889 $ $Date: 2007-11-16 20:13:06 -0500 (Fri, 16 Nov 2007) $
  */
-@CommandComponent(id="geronimo-jaxws-builder:wsgen", description="Generate JAX-WS artifacts from class")
+@CommandComponent(id="geronimo-jaxws-sun-tools:wsgen", description="Generate JAX-WS artifacts from class")
 public class WsgenCommand extends CommandSupport {
     
     @Requirement

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsgenCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsgenCommand.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsimportCommand.java (from r703222, geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsimportCommand.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsimportCommand.java?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsimportCommand.java&p1=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsimportCommand.java&r1=703222&r2=703564&rev=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsimportCommand.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsimportCommand.java Fri Oct 10 12:35:39 2008
@@ -30,7 +30,7 @@
  *  
  * @version $Rev: 595889 $ $Date: 2007-11-16 20:13:06 -0500 (Fri, 16 Nov 2007) $
  */
-@CommandComponent(id="geronimo-jaxws-builder:wsimport", description="Generate JAX-WS artifacts from WSDL")
+@CommandComponent(id="geronimo-jaxws-sun-tools:wsimport", description="Generate JAX-WS artifacts from WSDL")
 public class WsimportCommand extends CommandSupport {
     
     @Requirement

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsimportCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsimportCommand.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/resources/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/resources/gsh-wsgen.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/resources/gsh-wsgen.properties?rev=703564&r1=703516&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/resources/gsh-wsgen.properties (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/resources/gsh-wsgen.properties Fri Oct 10 12:35:39 2008
@@ -17,19 +17,19 @@
 ## under the License.
 ##
 
-classworldsRegExTest = .*geronimo-jaxws-builder.*
-classworldsEntry = load ${gshell.home}/lib/geronimo-jaxws-builder-*.jar
+classworldsRegExTest = .*geronimo-jaxws-sun-tools.*
+classworldsEntry = load ${gshell.home}/lib/geronimo-jaxws-sun-tools-*.jar
 layoutXPathTest = //layout/nodes/group/name[contains(.,'jaxws')]
 layoutEntry = \n          <group>\n            \
             <name>jaxws</name>\n\n            \
             <nodes>\n                \
                 <command>\n                    \
                     <name>wsgen</name>\n                    \
-                    <id>geronimo-jaxws-builder:wsgen</id>\n                \
+                    <id>geronimo-jaxws-sun-tools:wsgen</id>\n                \
                 </command>\n\n                \
                 <command>\n                    \
                     <name>wsimport</name>\n                    \
-                    <id>geronimo-jaxws-builder:wsimport</id>\n                \
+                    <id>geronimo-jaxws-sun-tools:wsimport</id>\n                \
                 </command>\n            \
             </nodes>\n        \
         </group>\n          \n

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml Fri Oct 10 12:35:39 2008
@@ -63,53 +63,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
-                            <Extension-Dirs>lib/ext</Extension-Dirs>
-                        </manifestEntries>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.jaxws.builder.JAXWSToolsCLI</mainClass>
-                        </manifest>
-                    </archive>
-                    <warnOnDependencyChange>true</warnOnDependencyChange>
-                    <!--
-                    NOTE: This list of dependencies is non-transitive.
-                    -->
-                    <classpath>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-jaxws-builder</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib-nodep</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-api</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-log4j12</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>jcl104-over-slf4j</artifactId>
-                        </element>
-                        <element>
-                            <groupId>log4j</groupId>
-                            <artifactId>log4j</artifactId>
-                        </element>
-                    </classpath>
-                    <classpathPrefix>../lib</classpathPrefix>
-
                     <useMavenDependencies>
                         <value>false</value>
                     </useMavenDependencies>

Added: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/pom.xml?rev=703564&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/pom.xml (added)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/pom.xml Fri Oct 10 12:35:39 2008
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>jaxws</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>jaxws-sun-tools</artifactId>
+    <name>Geronimo Plugins, JAXWS :: Sun Tools</name>
+    <packaging>car</packaging>
+
+    <description>JAX-WS command line tools</description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jaxws-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jaxws-sun-tools</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <!-- Needed for generating wsdl -->
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-tools</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.stream.buffer</groupId>
+            <artifactId>streambuffer</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jvnet.staxex</groupId>
+            <artifactId>stax-ex</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
+                            <Extension-Dirs>lib/ext</Extension-Dirs>
+                        </manifestEntries>
+                        <manifest>
+                            <mainClass>org.apache.geronimo.jaxws.builder.JAXWSToolsCLI</mainClass>
+                        </manifest>
+                    </archive>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
+                    <!--
+                    NOTE: This list of dependencies is non-transitive.
+                    -->
+                    <classpath>
+                        <element>
+                            <groupId>org.apache.geronimo.framework</groupId>
+                            <artifactId>geronimo-kernel</artifactId>
+                            <version>${version}</version>
+                        </element>
+                        <element>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-jaxws-sun-tools</artifactId>
+                            <version>${version}</version>
+                        </element>
+                        <element>
+                            <groupId>cglib</groupId>
+                            <artifactId>cglib-nodep</artifactId>
+                        </element>
+                        <element>
+                            <groupId>org.slf4j</groupId>
+                            <artifactId>slf4j-api</artifactId>
+                        </element>
+                        <element>
+                            <groupId>org.slf4j</groupId>
+                            <artifactId>slf4j-log4j12</artifactId>
+                        </element>
+                        <element>
+                            <groupId>org.slf4j</groupId>
+                            <artifactId>jcl104-over-slf4j</artifactId>
+                        </element>
+                        <element>
+                            <groupId>log4j</groupId>
+                            <artifactId>log4j</artifactId>
+                        </element>
+                    </classpath>
+                    <classpathPrefix>../lib</classpathPrefix>
+
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Web Services</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/appended-resources/META-INF/NOTICE.vm?rev=703564&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/appended-resources/META-INF/NOTICE.vm (added)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/appended-resources/META-INF/NOTICE.vm Fri Oct 10 12:35:39 2008
@@ -0,0 +1,32 @@
+##
+## 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.
+##
+## $Rev: 651007 $ $Date: 2008-04-23 14:59:19 -0400 (Wed, 23 Apr 2008) $
+##
+
+This product includes software developed for the JAXB Reference 
+Implementation project. (https://jaxb.dev.java.net/)
+
+This product includes software developed for Java API for XML Web Services
+project (JAX-WS) (https://jax-ws.dev.java.net/)
+
+This product includes software developed for StAX-Ex Project 
+(https://stax-ex.dev.java.net/)
+
+This product includes software developed for XML Stream Buffer Project
+(https://xmlstreambuffer.dev.java.net/)

Added: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml?rev=703564&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml Fri Oct 10 12:35:39 2008
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jaxws-tools</artifactId>
+        <version>2.2-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jaxws-deployer</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-jaxws-sun-tools</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.jvnet.staxex</groupId>
+        <artifactId>stax-ex</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>com.sun.xml.stream.buffer</groupId>
+        <artifactId>streambuffer</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>com.sun.xml.ws</groupId>
+        <artifactId>jaxws-rt</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>com.sun.xml.ws</groupId>
+        <artifactId>jaxws-tools</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-xjc</artifactId>
+        <type>jar</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml?rev=703564&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml Fri Oct 10 12:35:39 2008
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="SunWsdlGenerator" class="org.apache.geronimo.jaxws.builder.SunWsdlGenerator">
+    </gbean>
+
+</module>

Propchange: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/resources/META-INF/startup-jar
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/resources/META-INF/startup-jar?rev=703564&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/resources/META-INF/startup-jar (added)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/resources/META-INF/startup-jar Fri Oct 10 12:35:39 2008
@@ -0,0 +1,18 @@
+<!--
+  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.
+-->
+This file tells the Geronimo bootstrap where to look for its installation
+directory, which is ../ from wherever the jar containing this file lives.
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml?rev=703564&r1=703563&r2=703564&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml Fri Oct 10 12:35:39 2008
@@ -31,22 +31,17 @@
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jaxws-tools</artifactId>
     <name>Geronimo Plugins, JAXWS :: Tools</name>
+    <packaging>car</packaging>
 
     <description>JAX-WS command line tools</description>
     
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jaxws-deployer</artifactId>
+            <artifactId>jaxws-sun-tools</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jaxws-builder</artifactId>
-            <version>${version}</version>
-        </dependency>
     </dependencies>
     
     <build>
@@ -78,30 +73,18 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-plugin-metadata</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>prepare-metadata</goal>
-                        </goals>
-                        <configuration>
-                            <useMavenDependencies>
-                                <value>true</value>
-                                <includeVersion>true</includeVersion>
-                            </useMavenDependencies>
-                            <category>Web Services</category>
-                            <instance>
-                                <plugin-artifact>
-                                    <module-id>
-                                        <type>jar</type>
-                                    </module-id>
-                                    <copy-file relative-to="geronimo" dest-dir=""></copy-file>
-                                </plugin-artifact>
-                            </instance>
-                        </configuration>
-                    </execution>
-                </executions>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Web Services</category>
+                    <instance>
+                        <plugin-artifact>
+                            <copy-file relative-to="geronimo" dest-dir=""></copy-file>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
             </plugin>
 
             <plugin>



Mime
View raw message