svn commit: r164978 - /geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java

[gd...@apache.org]

Author: gdamour
Date: Wed Apr 27 06:17:33 2005
New Revision: 164978

URL: http://svn.apache.org/viewcvs?rev=164978&view=rev
Log:
Reverse the temporary fix; after second review, I have been able to figure out 
how to fix axis. The JIRA issue tracking the fix is: AXIS-1959.

Modified:
    geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java

Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java?rev=164978&r1=164977&r2=164978&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java (original)
+++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java Wed Apr 27 06:17:33 2005
@@ -45,7 +45,6 @@
 import org.apache.axis.constants.Style;
 import org.apache.axis.constants.Use;
 import org.apache.axis.description.JavaServiceDesc;
-import org.apache.axis.description.OperationDesc;
 import org.apache.axis.encoding.TypeMapping;
 import org.apache.axis.encoding.TypeMappingRegistryImpl;
 import org.apache.geronimo.axis.client.TypeInfo;
@@ -205,14 +204,7 @@
                 wrappedElementQNames.addAll(wrappedElementQNamesForOper);
             }
 
-            // TODO fix Axis: a JavaServiceDesc can be document or rpc and
-            // still define a WSDL operation using a wrapper style mapping.
-            // when fixed, the three following lines should be removed.
-            OperationDesc operationDesc =  operationDescBuilder.buildOperationDesc();
-            if (Style.WRAPPED == operationDesc.getStyle()) {
-                serviceDesc.setStyle(Style.WRAPPED);
-            }
-            serviceDesc.addOperationDesc(operationDesc);
+            serviceDesc.addOperationDesc(operationDescBuilder.buildOperationDesc());
         }
 
         return wrappedElementQNames;