geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r713193 - in /geronimo/server/trunk/plugins: axis2/axis2-deployer/ axis2/axis2-deployer/src/main/history/ axis2/axis2-deployer/src/main/plan/ axis2/axis2-ejb-deployer/src/main/plan/ axis2/geronimo-axis2-builder/ axis2/geronimo-axis2-builder...
Date Tue, 11 Nov 2008 22:16:00 GMT
Author: gawor
Date: Tue Nov 11 14:15:56 2008
New Revision: 713193

URL: http://svn.apache.org/viewvc?rev=713193&view=rev
Log:
initial step to allow different wsdl generator implementations to be used (GERONIMO-4351)

Modified:
    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/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.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/src/main/plan/plan.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

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=713193&r1=713192&r2=713193&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml Tue Nov 11 14:15:56 2008
@@ -56,12 +56,6 @@
             <version>${version}</version>
         </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/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=713193&r1=713192&r2=713193&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 Tue
Nov 11 14:15:56 2008
@@ -21,9 +21,4 @@
         <artifactId>geronimo-axis2-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/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=713193&r1=713192&r2=713193&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 Tue Nov 11 14:15:56
2008
@@ -32,9 +32,14 @@
                 </dependencies>
             </environment>
         </xml-attribute>
-        <reference name="WsdlGenerator">
-            <name>SunWsdlGenerator</name>
-        </reference>
+        <references name="WsdlGenerator">
+            <pattern>
+                <name>SunWsdlGenerator</name>
+            </pattern>
+            <pattern>
+                <name>CXFWsdlGenerator</name>
+            </pattern>
+        </references>
     </gbean>
 
     <gbean name="Axis2ServiceRefBuilder" class="org.apache.geronimo.axis2.builder.Axis2ServiceRefBuilder">

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=713193&r1=713192&r2=713193&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 Tue Nov
11 14:15:56 2008
@@ -32,9 +32,14 @@
                 </dependencies>
             </environment>
         </xml-attribute>
-        <reference name="WsdlGenerator">
-            <name>SunWsdlGenerator</name>
-        </reference>
+        <references name="WsdlGenerator">
+            <pattern>
+                <name>SunWsdlGenerator</name>
+            </pattern>
+            <pattern>
+                <name>CXFWsdlGenerator</name>
+            </pattern>
+        </references>
     </gbean>
 
    <gbean name="Axis2ModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml?rev=713193&r1=713192&r2=713193&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml Tue Nov 11 14:15:56
2008
@@ -76,22 +76,6 @@
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
        </dependency>
 
-        <!-- add the following for wsgen -->
-        <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.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-        </dependency>
-        <!--end add for wsgen-->
     </dependencies>
 
 </project>

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=713193&r1=713192&r2=713193&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
Tue Nov 11 14:15:56 2008
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -60,12 +61,12 @@
 
     private static final Logger log = LoggerFactory.getLogger(Axis2Builder.class);
         
-    protected WsdlGenerator wsdlGenerator;
+    protected Collection<WsdlGenerator> wsdlGenerators;
     
     public Axis2Builder(Environment defaultEnviroment,
-                        WsdlGenerator wsdlGenerator) {
+                        Collection<WsdlGenerator> wsdlGenerators) {
         super(defaultEnviroment);
-        this.wsdlGenerator = wsdlGenerator;
+        this.wsdlGenerators = wsdlGenerators;
         this.webServiceFinder = new WARWebServiceFinder();
     }
     
@@ -194,6 +195,14 @@
         return in;
     }
    
+    protected WsdlGenerator getWsdlGenerator() throws DeploymentException {
+        if (this.wsdlGenerators == null || this.wsdlGenerators.isEmpty()) {
+            throw new DeploymentException("Wsdl generator not found");
+        } else {
+            return this.wsdlGenerators.iterator().next();
+        }
+    }
+    
     @Override
     protected void initialize(GBeanData targetGBean, Class serviceClass, PortInfo portInfo,
Module module) 
         throws DeploymentException {
@@ -209,6 +218,8 @@
         
         log.debug("Service " + portInfo.getServiceName() + " does not have WSDL. Generating
WSDL...");
 
+        WsdlGenerator wsdlGenerator = getWsdlGenerator();
+        
         WsdlGeneratorOptions options = new WsdlGeneratorOptions();
         options.setSAAJ(WsdlGeneratorOptions.SAAJ.Axis2);
         
@@ -224,7 +235,7 @@
             options.setWsdlPort(portInfo.getWsdlPort());
         }
                 
-        String wsdlFile = this.wsdlGenerator.generateWsdl(module, serviceClass.getName(),
module.getEarContext(), options);
+        String wsdlFile = wsdlGenerator.generateWsdl(module, serviceClass.getName(), module.getEarContext(),
options);
         portInfo.setWsdlFile(wsdlFile);
         
         log.debug("Generated " + wsdlFile + " for service " + portInfo.getServiceName());
       

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=713193&r1=713192&r2=713193&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
Tue Nov 11 14:15:56 2008
@@ -17,6 +17,8 @@
 
 package org.apache.geronimo.axis2.builder;
 
+import java.util.Collection;
+
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
@@ -31,8 +33,8 @@
 public class Axis2EJBBuilder extends Axis2Builder {
         
     public Axis2EJBBuilder(Environment defaultEnviroment,
-                           WsdlGenerator wsdlGenerator) {
-        super(defaultEnviroment, wsdlGenerator);
+                           Collection<WsdlGenerator> wsdlGenerators) {
+        super(defaultEnviroment, wsdlGenerators);
         this.webServiceFinder = new EJBWebServiceFinder();
     }
     

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=713193&r1=713192&r2=713193&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 Tue Nov 11 14:15:56
2008
@@ -32,9 +32,14 @@
                 </dependencies>
             </environment>
         </xml-attribute>
-        <reference name="WsdlGenerator">
-            <name>SunWsdlGenerator</name>
-        </reference>
+        <references name="WsdlGenerator">
+            <pattern>
+                <name>SunWsdlGenerator</name>
+            </pattern>
+            <pattern>
+                <name>CXFWsdlGenerator</name>
+            </pattern>
+        </references>
     </gbean>
 
     <gbean name="CXFServiceRefBuilder" class="org.apache.geronimo.cxf.builder.CXFServiceRefBuilder">

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=713193&r1=713192&r2=713193&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 Tue Nov 11 14:15:56
2008
@@ -32,9 +32,14 @@
                 </dependencies>
             </environment>
         </xml-attribute>
-        <reference name="WsdlGenerator">
-            <name>SunWsdlGenerator</name>
-        </reference>
+        <references name="WsdlGenerator">
+            <pattern>
+                <name>SunWsdlGenerator</name>
+            </pattern>
+            <pattern>
+                <name>CXFWsdlGenerator</name>
+            </pattern>
+        </references>
     </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=713193&r1=713192&r2=713193&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
Tue Nov 11 14:15:56 2008
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -66,15 +67,15 @@
     private static final String USE_WSGEN_PROPERTY = 
         "org.apache.geronimo.cxf.use.wsgen";
 
-    protected WsdlGenerator wsdlGenerator;
+    protected Collection<WsdlGenerator> wsdlGenerators;
     
     public CXFBuilder() {
         super(null);
     }
 
-    public CXFBuilder(Environment defaultEnvironment, WsdlGenerator wsdlGenerator) {
+    public CXFBuilder(Environment defaultEnvironment, Collection<WsdlGenerator> wsdlGenerators)
{
         super(defaultEnvironment);
-        this.wsdlGenerator = wsdlGenerator;
+        this.wsdlGenerators = wsdlGenerators;
         this.webServiceFinder = new WARWebServiceFinder();
     }
 
@@ -200,6 +201,14 @@
         }
     }
     
+    protected WsdlGenerator getWsdlGenerator() throws DeploymentException {
+        if (this.wsdlGenerators == null || this.wsdlGenerators.isEmpty()) {
+            throw new DeploymentException("Wsdl generator not found");
+        } else {
+            return this.wsdlGenerators.iterator().next();
+        }
+    }
+    
     private void generateWSDL(Class serviceClass, PortInfo portInfo, Module module) 
         throws DeploymentException {
         if (isWsdlSet(portInfo, serviceClass)) {
@@ -208,6 +217,8 @@
         }        
         LOG.debug("Service " + portInfo.getServiceName() + " does not have WSDL. Generating
WSDL...");
         
+        WsdlGenerator wsdlGenerator = getWsdlGenerator();
+        
         WsdlGeneratorOptions options = new WsdlGeneratorOptions();
         options.setSAAJ(WsdlGeneratorOptions.SAAJ.SUN);
         
@@ -225,7 +236,7 @@
             options.setWsdlPort(portInfo.getWsdlPort());
         }
                         
-        String wsdlFile = this.wsdlGenerator.generateWsdl(module, serviceClass.getName(),
module.getEarContext(), options);
+        String wsdlFile = wsdlGenerator.generateWsdl(module, serviceClass.getName(), module.getEarContext(),
options);
         portInfo.setWsdlFile(wsdlFile);
         
         LOG.debug("Generated " + wsdlFile + " for service " + portInfo.getServiceName());


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=713193&r1=713192&r2=713193&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
Tue Nov 11 14:15:56 2008
@@ -16,6 +16,8 @@
  */
 package org.apache.geronimo.cxf.builder;
 
+import java.util.Collection;
+
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
@@ -30,8 +32,8 @@
         super();
     }
 
-    public CXFEJBBuilder(Environment defaultEnvironment, WsdlGenerator wsdlGenerator) {
-        super(defaultEnvironment, wsdlGenerator);
+    public CXFEJBBuilder(Environment defaultEnvironment, Collection<WsdlGenerator>
wsdlGenerators) {
+        super(defaultEnvironment, wsdlGenerators);
         this.webServiceFinder = new EJBWebServiceFinder();
     }
   



Mime
View raw message