[jbossws-commits] JBossWS SVN: r2230 - in trunk/jbossws-core: src/main/java/org/jboss/ws/tools/wsdl and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: jason.greene at jboss.com
Date: 2007-02-01 00:03:45 -0500 (Thu, 01 Feb 2007)
New Revision: 2230

Modified:
   trunk/jbossws-core/build.xml
   trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java
Log:
Fix JBWS-1501
Add wsimport


Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml	2007-02-01 00:52:54 UTC (rev 2229)
+++ trunk/jbossws-core/build.xml	2007-02-01 05:03:45 UTC (rev 2230)
@@ -166,6 +166,8 @@
       <fileset dir="${etc.dir}">
         <include name="wsgen.sh"/>
         <include name="wsgen.bat"/>
+        <include name="wsimport.sh"/>
+        <include name="wsimport.bat"/>
         <include name="wstools.sh"/>
         <include name="wstools.bat"/>
         <include name="wstools-log4j.xml"/>

Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java	2007-02-01 00:52:54 UTC (rev 2229)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java	2007-02-01 05:03:45 UTC (rev 2230)
@@ -343,9 +343,14 @@
          WSDLInterfaceOperation operation = operations[i];
          buffer.append("<operation name='" + operation.getName().toString() + "'");
 
-         String parameterOrder = getParameterOrder(operation);
-         if (parameterOrder.length() > 0)
-            buffer.append(" parameterOrder='").append(parameterOrder).append("'");
+         // JBWS-1501 wsimport RI fails when processing parameterOrder on one-way operations
+         if (! Constants.WSDL20_PATTERN_IN_ONLY.equals(operation.getPattern()))
+         {
+            String parameterOrder = getParameterOrder(operation);
+            if (parameterOrder.length() > 0)
+               buffer.append(" parameterOrder='").append(parameterOrder).append("'");
+          
+         }
          buffer.append(">");
 
          String opname = operation.getName().toString();