cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1062055 - in /cxf/branches/2.3.x-fixes: ./ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ tools/wsdlto/...
Date Fri, 21 Jan 2011 22:20:29 GMT
Author: dkulp
Date: Fri Jan 21 22:20:28 2011
New Revision: 1062055

URL: http://svn.apache.org/viewvc?rev=1062055&view=rev
Log:
Merged revisions 1062051 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1062051 | dkulp | 2011-01-21 17:18:27 -0500 (Fri, 21 Jan 2011) | 2 lines
  
  [CXF-3268] Add a jaxws21 profile to the tooling to have it not output
  the stuff that is specific to jaxws 2.2
........

Added:
    cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWS21Container.java
      - copied unchanged from r1062051, cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWS21Container.java
    cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/JAXWS21ServiceGenerator.java
      - copied unchanged from r1062051, cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/JAXWS21ServiceGenerator.java
Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
    cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
    cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
    cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java?rev=1062055&r1=1062054&r2=1062055&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
(original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
Fri Jan 21 22:20:28 2011
@@ -137,7 +137,7 @@ public class ServiceGenerator extends Ab
                 setAttributes("wsdlUrl", url);
                 setCommonAttributes();
                 
-                if (Service.class.getDeclaredConstructors().length == 2) {
+                if (isJaxws22()) {
                     setAttributes("jaxws22", true);
                 }
     
@@ -146,6 +146,10 @@ public class ServiceGenerator extends Ab
             }
         }
     }
+    
+    public boolean isJaxws22() {
+        return Service.class.getDeclaredConstructors().length == 2;
+    }
 
     public void register(final ClassCollector collector, String packageName, String fileName)
{
         collector.addServiceClassName(packageName , fileName , packageName + "." + fileName);

Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml?rev=1062055&r1=1062054&r2=1062055&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
(original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
Fri Jan 21 22:20:28 2011
@@ -20,17 +20,31 @@ under the License.
 
 <plugin name="jaxws" version="" provider="cxf.apache.org" xmlns="http://cxf.apache.org/tools/plugin">
     <frontend name="jaxws" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile">
-	<container name="JAXWSContainer" toolspec="jaxws-toolspec.xml"/>
-	<processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/>
-	<builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11"/>
-	<generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators">
-	    <generator name="AntGenerator"/>
-	    <generator name="ClientGenerator"/>
-	    <generator name="FaultGenerator"/>
-	    <generator name="ImplGenerator"/>
-	    <generator name="SEIGenerator"/>
-	    <generator name="ServerGenerator"/>
-	    <generator name="ServiceGenerator"/>
-	</generators>
+	   <container name="JAXWSContainer" toolspec="jaxws-toolspec.xml"/>
+	   <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/>
+	   <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11"/>
+	   <generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators">
+	       <generator name="AntGenerator"/>
+	       <generator name="ClientGenerator"/>
+	       <generator name="FaultGenerator"/>
+	       <generator name="ImplGenerator"/>
+	       <generator name="SEIGenerator"/>
+	       <generator name="ServerGenerator"/>
+	       <generator name="ServiceGenerator"/>
+	   </generators>
+    </frontend>
+    <frontend name="jaxws21" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile">
+       <container name="JAXWS21Container" toolspec="jaxws-toolspec.xml"/>
+       <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/>
+       <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11"/>
+       <generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators">
+           <generator name="AntGenerator"/>
+           <generator name="ClientGenerator"/>
+           <generator name="FaultGenerator"/>
+           <generator name="ImplGenerator"/>
+           <generator name="SEIGenerator"/>
+           <generator name="ServerGenerator"/>
+           <generator name="JAXWS21ServiceGenerator"/>
+       </generators>
     </frontend>
 </plugin>
\ No newline at end of file

Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java?rev=1062055&r1=1062054&r2=1062055&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
(original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
Fri Jan 21 22:20:28 2011
@@ -50,7 +50,7 @@ public class JAXWSProfileTest extends As
 
         Map<String, FrontEnd> frontends = loader.getFrontEnds();
         assertNotNull(frontends);
-        assertEquals(1, frontends.size());
+        assertEquals(2, frontends.size());
 
         FrontEnd frontend = getFrontEnd(frontends, 0);
         assertEquals("jaxws", frontend.getName());

Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java?rev=1062055&r1=1062054&r2=1062055&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
(original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
Fri Jan 21 22:20:28 2011
@@ -41,7 +41,7 @@ public class PluginLoaderTest extends As
         
         Map<String, FrontEnd> frontends = loader.getFrontEnds();
         assertNotNull(frontends);
-        assertEquals(1, frontends.size());
+        assertEquals(2, frontends.size());
 
         FrontEnd frontend = getFrontEnd(frontends, 0);
         assertEquals("jaxws", frontend.getName());



Mime
View raw message