You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/05/13 02:54:29 UTC

svn commit: r405968 - /incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java

Author: jsdelfino
Date: Fri May 12 17:54:28 2006
New Revision: 405968

URL: http://svn.apache.org/viewcvs?rev=405968&view=rev
Log:
Fix for TUSCANY-170, use same portType and operation name mangling algorithm at generation and run-runtime

Modified:
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java

Modified: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java?rev=405968&r1=405967&r2=405968&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java (original)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java Fri May 12 17:54:28 2006
@@ -16,29 +16,27 @@
  */
 package org.apache.tuscany.model.types.wsdl.impl;
 
+import static org.objectweb.asm.Opcodes.ACC_ABSTRACT;
+import static org.objectweb.asm.Opcodes.ACC_INTERFACE;
+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static org.objectweb.asm.Opcodes.V1_5;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.wsdl.Input;
-import javax.wsdl.Message;
 import javax.wsdl.Operation;
 import javax.wsdl.Part;
 import javax.wsdl.PortType;
 import javax.xml.namespace.QName;
 
-import org.objectweb.asm.ClassWriter;
-import static org.objectweb.asm.Opcodes.ACC_ABSTRACT;
-import static org.objectweb.asm.Opcodes.ACC_INTERFACE;
-import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static org.objectweb.asm.Opcodes.V1_5;
-import org.objectweb.asm.Type;
-
 import org.apache.tuscany.common.resource.ResourceLoader;
 import org.apache.tuscany.model.assembly.AssemblyContext;
 import org.apache.tuscany.model.assembly.impl.ServiceContractImpl;
 import org.apache.tuscany.model.types.wsdl.WSDLServiceContract;
 import org.apache.tuscany.model.util.XMLNameUtil;
 import org.apache.tuscany.sdo.util.SDOUtil;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Type;
 
 import commonj.sdo.Property;
 import commonj.sdo.helper.TypeHelper;
@@ -143,7 +141,11 @@
 
             // Generate methods from the WSDL operations
             for (Operation operation : (List<Operation>) portType.getOperations()) {
-                String methodName = XMLNameUtil.getJavaNameFromXMLName(operation.getName(), false);
+                
+                //FIXME Workaround for TUSCANY-170, we will need to make this consistent with the algorithm used by Axis2 WSDL2Java
+                // to generate method names from operations names
+                //String methodName = XMLNameUtil.getJavaNameFromXMLName(operation.getName(), false);
+                String methodName = operation.getName();
                 
                 // FIXME later we may want to wwitch to use the Axis2 WSDL2Java (not to generate the Java source,
                 // just to figure the WSDL to Java mapping)