axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nadira...@apache.org
Subject svn commit: r394863 [6/6] - in /webservices/axis/trunk/c: include/axis/ src/cbindings/ src/cbindings/client/ src/wsdl/org/apache/axis/wsdl/wsdl2ws/ src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ tests/auto_bui...
Date Tue, 18 Apr 2006 06:52:51 GMT
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java?rev=394863&r1=394862&r2=394863&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java Mon Apr 17 23:52:47 2006
@@ -71,6 +71,13 @@
             
             // include header file for datatype
             writer.write("#include \"" + classname + ".h\"\n");
+            
+            writer.write("\n");
+            writer.write("#include <axis/AxisWrapperAPI.h>\n");
+            writer.write("#include <axis/IWrapperSoapSerializer.h>\n");
+            writer.write("#include <axis/IWrapperSoapDeSerializer.h>\n");
+            writer.write("#include <axis/client/Stub.h>\n");
+            writer.write("#include <axis/client/Call.h>\n");
             writer.write("\n");
             
             this.writeMethods();

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java?rev=394863&r1=394862&r2=394863&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java Mon Apr 17 23:52:47 2006
@@ -96,12 +96,12 @@
         
         if (attribs.length == 0)
         {
-            writer.write("\taxiscSerializeIWrapperSoapSerializer(pSZ,\">\", NULL);\n");
+            writer.write("\taxiscSoapSerializerSerialize(pSZ,\">\", NULL);\n");
 
             if (extensionBaseAttrib != null)
             {
                 String typeName = extensionBaseAttrib.getTypeName();
-                writer.write("\taxiscSerializeAsChardata(pSZ,(void*)");
+                writer.write("\taxiscSoapSerializerSerializeAsChardata(pSZ,(void*)");
                 
                 if (!CUtils.isPointerType(typeName))
                     writer.write("&");
@@ -130,15 +130,15 @@
         writer.write("\tAxiscBool blnIsNewPrefix = xsdc_boolean_false;\n\n");
         
         writer.write("\tif ( param == NULL )\n\t{\n");
-        writer.write("\t\taxiscSerializeAsAttribute(pSZ, \"xsi:nil\", 0, (void*)&(xsdc_boolean_true), XSDC_BOOLEAN);\n");
-        writer.write("\t\taxiscSerializeIWrapperSoapSerializer(pSZ, \">\", NULL);\n");
+        writer.write("\t\taxiscSoapSerializerSerializeAsAttribute(pSZ, \"xsi:nil\", 0, (void*)&(xsdc_boolean_true), XSDC_BOOLEAN);\n");
+        writer.write("\t\taxiscSoapSerializerSerialize(pSZ, \">\", NULL);\n");
         writer.write("\t\treturn AXISC_SUCCESS;\n");
         writer.write("\t}\n\n");
 
         writer.write("\tif (!bArray)\n\t{\n");
-        writer.write("\t\tconst AxiscChar* sPrefix = axiscGetNamespacePrefixIWrapperSoapSerializer(pSZ,Axis_URI_" + classname + ", &blnIsNewPrefix);\n");
+        writer.write("\t\tconst AxiscChar* sPrefix = axiscSoapSerializerGetNamespacePrefix(pSZ,Axis_URI_" + classname + ", &blnIsNewPrefix);\n");
         writer.write("\t\tif (blnIsNewPrefix)\n\t\t{\n");
-        writer.write("\t\t\taxiscSerializeIWrapperSoapSerializer(pSZ,\" xmlns:\", sPrefix, \"=\\\"\",\n");
+        writer.write("\t\t\taxiscSoapSerializerSerialize(pSZ,\" xmlns:\", sPrefix, \"=\\\"\",\n");
         writer.write("\t\t\t\tAxis_URI_" + classname + ", \"\\\"\", NULL );\n");
         writer.write("\t\t}\n");
         writer.write("\t}\n");
@@ -179,14 +179,14 @@
                 if (isPointerType)
                 {
                     writer.write("\tif (0 != param->" + attribs[i].getParamNameAsMember() + ")\n");
-                    writer.write("\t\taxiscSerializeAsAttribute(pSZ,\""
+                    writer.write("\t\taxiscSoapSerializerSerializeAsAttribute(pSZ,\""
                             + soapTagName + "\", 0, (void*)(param->"
                             + attribs[i].getParamNameAsMember() + "), "
                             + CUtils.getXSDTypeForBasicType(basicType) + ");\n");
                 }
                 else
                 {
-                    writer.write("\t\taxiscSerializeAsAttribute(pSZ,\""
+                    writer.write("\t\taxiscSoapSerializerSerializeAsAttribute(pSZ,\""
                             + soapTagName
                             + "\", 0, (void*)&(param->"
                             + attribs[i].getParamNameAsMember()
@@ -211,20 +211,20 @@
         {
             writer.write("\tif(Axis_URI_" + classname + ")\n\t{\n");
             writer.write("\t\tAxiscBool blnIsNewPrefix = xsdc_boolean_false;\n");
-            writer.write("\t\tconst AxisChar* sPrefix = axiscGetNamespacePrefixIWrapperSoapSerializer(pSZ,Axis_URI_"
+            writer.write("\t\tconst AxisChar* sPrefix = axiscSoapSerializerGetNamespacePrefix(pSZ,Axis_URI_"
                         + classname + ", &blnIsNewPrefix);\n");
-            writer.write("\t\taxiscSerializeIWrapperSoapSerializer(pSZ, \" xmlns:\", sPrefix, \"=\\\"\",");
+            writer.write("\t\taxiscSoapSerializerSerialize(pSZ, \" xmlns:\", sPrefix, \"=\\\"\",");
             writer.write("Axis_URI_" + classname + ", \" " + " \\\"\"");
             writer.write(", NULL);\n\t}\n");
         }               
         
-        writer.write("\taxiscSerializeIWrapperSoapSerializer(pSZ, \">\", 0);\n");
+        writer.write("\taxiscSoapSerializerSerialize(pSZ, \">\", 0);\n");
         if (extensionBaseAttrib != null)
         {
             String typeName = extensionBaseAttrib.getTypeName(); 
             if( typeName != null)
             {
-                writer.write("\taxiscSerializeAsChardata(pSZ, (void*)");
+                writer.write("\taxiscSoapSerializerSerializeAsChardata(pSZ, (void*)");
                 if (!CUtils.isPointerType(typeName))
                     writer.write("&");
 
@@ -268,7 +268,7 @@
             if (attribs[i].isAnyType())
             {
                 anyCounter += 1;
-                writer.write("\taxiscSerializeAnyObject(pSZ, param->any" + Integer.toString(anyCounter) +");\n");
+                writer.write("\taxiscSoapSerializerSerializeAnyObject(pSZ, param->any" + Integer.toString(anyCounter) +");\n");
             } 
             else if (attribs[i].isArray())
             {
@@ -280,7 +280,7 @@
                     else
                         baseTypeName = attribs[i].getTypeName();
                     
-                    writer.write("\taxiscSerializeBasicArray(pSZ, (const Axisc_Array *)param->" + attribs[i].getParamName()
+                    writer.write("\taxiscSoapSerializerSerializeBasicArray(pSZ, (const Axisc_Array *)param->" + attribs[i].getParamName()
                         + ", " + namespace + ","
                         + CUtils.getXSDTypeForBasicType(baseTypeName) + ", \""
                         + attribs[i].getParamNameAsSOAPElement() + "\");\n");
@@ -294,7 +294,7 @@
                     else
                         namespace = "NULL";
                     
-                    writer.write("\taxiscSerializeCmplxArray(pSZ, (const Axisc_Array *)param->"
+                    writer.write("\taxiscSoapSerializerSerializeCmplxArray(pSZ, (const Axisc_Array *)param->"
                                     + attribs[i].getParamNameAsMember() + ",\n");
                     writer.write("\t\t\t\t\t\t (void*) Axis_Serialize_" + arrayType + ",\n");
                     writer.write("\t\t\t\t\t\t (void*) Axis_Delete_" + arrayType + ",\n");
@@ -317,7 +317,7 @@
                 
                 if (CUtils.isPointerType(baseTypeName))
                 {
-                    writer.write("\taxiscSerializeAsElement(pSZ, \""
+                    writer.write("\taxiscSoapSerializerSerializeAsElement(pSZ, \""
                             + attribs[i].getSOAPElementNameAsString()
                             + "\", " + namespace
                             + ", (void*)(param->" + attribs[i].getParamNameWithoutSymbols() + "), "
@@ -335,14 +335,14 @@
                             && (isElementNillable(i)))
                             && !(attribs[i].getTypeName().equals("xsdc__string")) )
                     {
-                        writer.write("\t\taxiscSerializeAsElement(pSZ, \""
+                        writer.write("\t\taxiscSoapSerializerSerializeAsElement(pSZ, \""
                                 + attribs[i].getSOAPElementNameAsString() + "\", " + namespace
                                 + ", (void*)(*(param->" + attribs[i].getParamNameWithoutSymbols()
                                 + ")), " + CUtils.getXSDTypeForBasicType(baseTypeName) + ");\n");
                     }
                     else
                     {
-                        writer.write("\t\taxiscSerializeAsElement(pSZ, \""
+                        writer.write("\t\taxiscSoapSerializerSerializeAsElement(pSZ, \""
                                 + attribs[i].getSOAPElementNameAsString() + "\", " + namespace
                                 + ", (void*)(param->" + attribs[i].getParamNameWithoutSymbols()
                                 + "), " + CUtils.getXSDTypeForBasicType(baseTypeName) + ");\n");
@@ -350,7 +350,7 @@
                 }                           
                 else
                 {
-                    writer.write("\taxiscSerializeAsElement(pSZ, \""
+                    writer.write("\taxiscSoapSerializerSerializeAsElement(pSZ, \""
                             + attribs[i].getSOAPElementNameAsString() + "\", " + namespace
                             + ", (void*)&(param->" + attribs[i].getParamNameWithoutSymbols()
                             + "), " + CUtils.getXSDTypeForBasicType(baseTypeName) + ");\n");
@@ -377,21 +377,21 @@
                 
                 if (attribs[i].getNsQualified())
                 {
-                    writer.write("\taxiscSerializeIWrapperSoapSerializer(pSZ, \"<\", axiscGetNamespacePrefixIWrapperSoapSerializer(pSZ, \""
+                    writer.write("\taxiscSoapSerializerSerialize(pSZ, \"<\", axiscSoapSerializerGetNamespacePrefix(pSZ, \""
                                     + type.getName().getNamespaceURI()
                                     + "\"), \":\", \"" + elm + "\", 0);\n");
                     writer.write("\tAxis_Serialize_" + attribs[i].getTypeName()
                             + "(param->" + attribs[i].getParamName() + ", pSZ);\n");
-                    writer.write("\taxiscSerializeIWrapperSoapSerializer(pSZ, \"</\", axiscGetNamespacePrefixIWrapperSoapSerializer(pSZ, \""
+                    writer.write("\taxiscSoapSerializerSerialize(pSZ, \"</\", axiscSoapSerializerGetNamespacePrefix(pSZ, \""
                                     + type.getName().getNamespaceURI()
                                     + "\"), \":\", \"" + elm + "\", \">\", 0);\n");
                 }
                 else
                 {
-                    writer.write("\taxiscSerializeIWrapperSoapSerializer(pSZ, \"<" + elm + "\", 0);\n");
+                    writer.write("\taxiscSoapSerializerSerialize(pSZ, \"<" + elm + "\", 0);\n");
                     writer.write("\tAxis_Serialize_" + attribs[i].getTypeName()
                             + "(param->" + attribs[i].getParamName() + ", pSZ);\n");
-                    writer.write("\taxiscSerializeIWrapperSoapSerializer(pSZ, \"</" + elm + "\", \">\", 0);\n");
+                    writer.write("\taxiscSoapSerializerSerialize(pSZ, \"</" + elm + "\", \">\", 0);\n");
                 }
                 
                 if (attribs[i].isOptional())
@@ -409,7 +409,7 @@
         }
 
         writer.write("\n\tif (!bArray && blnIsNewPrefix)\n");
-        writer.write("\t\taxiscRemoveNamespacePrefix(pSZ, Axis_URI_" + classname + ");\n\n");
+        writer.write("\t\taxiscSoapSerializerRemoveNamespacePrefix(pSZ, Axis_URI_" + classname + ");\n\n");
         
         writer.write("\treturn AXISC_SUCCESS;\n");
         writer.write("}\n");
@@ -432,7 +432,7 @@
         {
             if (extensionBaseAttrib != null)
             {
-                writer.write("\taxiscGetChardataAs(pDZ, (void*)&(param->"
+                writer.write("\taxiscSoapDeSerializerGetChardataAs(pDZ, (void*)&(param->"
                         + extensionBaseAttrib.getParamNameAsMember() + "), "
                         + CUtils.getXSDTypeForBasicType(extensionBaseAttrib.getTypeName()) + ");\n");
             }
@@ -466,7 +466,7 @@
             if (attribs[i].isAnyType())
             {
                 anyCounter +=1;
-                writer.write("\tparam->any" + anyCounter + " = axiscGetAnyObjectIWrapperSoapDeSerializer(pDZ);\n");
+                writer.write("\tparam->any" + anyCounter + " = axiscSoapDeSerializerGetAnyObject(pDZ);\n");
             }
             else if (attribs[i].isArray())
             {
@@ -492,7 +492,7 @@
                     writer.write("\t/* Deserialize array */\n");
                     writer.write("\tparam->" + attribs[i].getParamNameAsMember() 
                             + " = (" + baseTypeName + "_Array *)" 
-                            + "axiscGetBasicArrayIWrapperSoapDeSerializer(pDZ, " 
+                            + "axiscSoapDeSerializerGetBasicArray(pDZ, " 
                             + CUtils.getXSDTypeForBasicType(baseTypeName) + ", \"" 
                             + attribs[i].getParamNameAsSOAPElement() + "\",0);\n");
 
@@ -501,7 +501,7 @@
                 else
                 {
                     arrayType = attribs[i].getTypeName();
-                    writer.write("\taxiscGetCmplxArrayIWrapperSoapDeSerializer(pDZ,\n" 
+                    writer.write("\taxiscSoapDeSerializerGetCmplxArray(pDZ,\n" 
                             + "\t\t(Axisc_Array *)param->" + attribs[i].getParamName() + ",\n" 
                             + "\t\t(void*)Axis_DeSerialize_"  + arrayType + ",\n"
                             + "\t\t(void*)Axis_Create_"       + arrayType + ",\n"
@@ -525,7 +525,7 @@
                 if (attribs[i].isOptional())
                 {
                     writer.write("\n\t{\n"); // start new variable scope                    
-                    writer.write("\tconst char* elementName" + i + " = axiscPeekNextElementName(pDZ);\n");
+                    writer.write("\tconst char* elementName" + i + " = axiscSoapDeSerializerPeekNextElementName(pDZ);\n");
                     writer.write("\t\tif(strcmp(elementName" + i + ", \"" + soapTagName + "\") == 0)\n");
                     writer.write("\t\t{\n");
                 }
@@ -553,6 +553,7 @@
                         
                         writer.write("\t\t*(param->"
                                 + attribs[i].getParamNameAsMember() + ") = "
+                                + "axiscSoapDeSerializer" 
                                 + CUtils.getParameterGetValueMethodName(
                                         attribs[i].getTypeName(), attribs[i].isAttribute()) + "(pDZ, \""
                                 + soapTagName + "\",0);\n");
@@ -571,14 +572,16 @@
                         writer.write("\t{\n");  // start new scope
                         if( isPointerType)
                         {
-                            writer.write("\t" + typeName + "    pValue" + i + " = " +
-                                    CUtils.getParameterGetValueMethodName(baseTypeName, attribs[i].isAttribute()) +
+                            writer.write("\t" + typeName + "    pValue" + i + " = "
+                                    + "axiscSoapDeSerializer"
+                                    + CUtils.getParameterGetValueMethodName(baseTypeName, attribs[i].isAttribute()) +
                                     "(pDZ,\"" + soapTagName + "\", 0);\n");
                         }
                         else
                         {
-                            writer.write("\t" + typeName + " *  pValue" + i + " = " +
-                                    CUtils.getParameterGetValueMethodName(baseTypeName, attribs[i].isAttribute()) +
+                            writer.write("\t" + typeName + " *  pValue" + i + " = " 
+                                    + "axiscSoapDeSerializer"
+                                    + CUtils.getParameterGetValueMethodName(baseTypeName, attribs[i].isAttribute()) +
                                     "(pDZ, \"" + soapTagName + "\", 0);\n");
                         }
                         
@@ -599,6 +602,7 @@
                 {
                     writer.write("\tparam->"
                             + attribs[i].getParamNameAsMember() + " = "
+                            + "axiscSoapDeSerializer"
                             + CUtils.getParameterGetValueMethodName(
                                     attribs[i].getTypeName(), attribs[i].isAttribute()) + "(pDZ, \""
                             + soapTagName + "\",0);\n");
@@ -610,6 +614,7 @@
                     writer.write("\t{\n");
                     writer.write("\t" + attribs[i].getTypeName() + " * "
                         + attribs[i].getParamNameAsMember() + " = " 
+                        + "axiscSoapDeSerializer"
                         + CUtils.getParameterGetValueMethodName(attribs[i].getTypeName(), attribs[i].isAttribute()) 
                         + "(pDZ, \"" + elementNameToSearchFor + "\",0);\n");
                     
@@ -647,14 +652,14 @@
                 
                 if (attribs[i].isOptional())
                 {
-                    writer.write("\tconst char* elementName" + i + " = axiscPeekNextElementName(pDZ);\n");
+                    writer.write("\tconst char* elementName" + i + " = axiscSoapDeSerializerPeekNextElementName(pDZ);\n");
                     writer.write("\tif(strcmp(elementName" + i + ", \"" + soapTagName + "\") == 0)\n");
                     writer.write("\t{\n");
                 }
 
                 writer.write("\tparam->" + attribs[i].getParamNameAsMember() 
                         + " = ("  + attribs[i].getTypeName()
-                        + "*)axiscGetCmplxObjectIWrapperSoapDeSerializer(pDZ,(void*)Axis_DeSerialize_"
+                        + "*)axiscSoapDeSerializerGetCmplxObject(pDZ,(void*)Axis_DeSerialize_"
                         + attribs[i].getTypeName()
                         + "\n\t\t, (void*)Axis_Create_"
                         + attribs[i].getTypeName() + ", (void*)Axis_Delete_"
@@ -686,13 +691,13 @@
         if (extensionBaseAttrib != null
                 && extensionBaseAttrib.getTypeName() != null)
         {
-            writer.write("\taxiscGetChardataAs(pDZ, (void*)&(param->"
+            writer.write("\taxiscSoapDeSerializerGetChardataAs(pDZ, (void*)&(param->"
                     + extensionBaseAttrib.getParamNameAsMember() + "), "
                     + CUtils.getXSDTypeForBasicType(extensionBaseAttrib.getTypeName()) + ");\n");
         }
         
         writer.write("\t/* Return deserialization status */\n");
-        writer.write("\treturn axiscGetStatusIWrapperSoapDeSerializer(pDZ);\n");
+        writer.write("\treturn axiscSoapDeSerializerGetStatus(pDZ);\n");
         writer.write("}\n");
     }
     

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java?rev=394863&r1=394862&r2=394863&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java Mon Apr 17 23:52:47 2006
@@ -127,6 +127,12 @@
             
             writer.write("#include \"" + classname + CUtils.C_HEADER_SUFFIX + "\"\n");
             writer.write("\n");
+            writer.write("#include <axis/client/Stub.h>\n");
+            writer.write("#include <axis/client/Call.h>\n");
+            writer.write("#include <axis/IWrapperSoapSerializer.h>\n");
+            writer.write("#include <axis/IWrapperSoapDeSerializer.h>\n");
+
+            writer.write("\n");
         }
         catch (IOException e)
         {

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java?rev=394863&r1=394862&r2=394863&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java Mon Apr 17 23:52:47 2006
@@ -119,22 +119,15 @@
             writer.write("#include <stdlib.h>\n");
             writer.write("#include <string.h>\n");
             writer.write("\n");
+            
+            writer.write("#include \"" + this.classname + CUtils.C_HEADER_SUFFIX + "\"\n");
+            writer.write("\n");
 
-            writer.write("#include <axis/Axis.h>\n");
-            writer.write("#include <axis/GDefine.h>\n");
-            writer.write("#include <axis/AxisUserAPI.h>\n");
-            writer.write("#include <axis/AxisUserAPIArrays.h>\n");
-            writer.write("#include <axis/SoapEnvVersions.h>\n");
-            writer.write("#include <axis/WSDDDefines.h>\n");
-            writer.write("#include <axis/TypeMapping.h>\n");
+            writer.write("#include <axis/client/Stub.h>\n");
+            writer.write("#include <axis/client/Call.h>\n");
             writer.write("#include <axis/AxisWrapperAPI.h>\n");
             writer.write("#include <axis/IWrapperSoapSerializer.h>\n");
             writer.write("#include <axis/IWrapperSoapDeSerializer.h>\n");
-            writer.write("#include <axis/client/Stub.h>\n");
-            writer.write("#include <axis/client/Call.h>\n");
-            writer.write("\n");
-            
-            writer.write("#include \"" + this.classname + CUtils.C_HEADER_SUFFIX + "\"\n");
             writer.write("\n");
         }
         catch (IOException e)

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java?rev=394863&r1=394862&r2=394863&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java Mon Apr 17 23:52:47 2006
@@ -391,8 +391,6 @@
             writer.write("#include <axis/SoapEnvVersions.h>\n");
             writer.write("#include <axis/WSDDDefines.h>\n");
             writer.write("#include <axis/TypeMapping.h>\n");
-            writer.write("#include <axis/client/Stub.h>\n");
-            writer.write("#include <axis/client/Call.h>\n");
 
             
             Vector typeSet = new Vector();

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java?rev=394863&r1=394862&r2=394863&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java Mon Apr 17 23:52:47 2006
@@ -58,8 +58,6 @@
             writer.write("#include <axis/SoapEnvVersions.h>\n");
             writer.write("#include <axis/WSDDDefines.h>\n");
             writer.write("#include <axis/TypeMapping.h>\n");
-            writer.write("#include <axis/client/Stub.h>\n");
-            writer.write("#include <axis/client/Call.h>\n");
             writer.write("\n");
             
             Type atype;

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java?rev=394863&r1=394862&r2=394863&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java Mon Apr 17 23:52:47 2006
@@ -65,21 +65,21 @@
           // get_xxx_stub() routine
           writer.write("AXISCHANDLE get_" + classname + "_stub(const char* pchEndPointUri)\n{\n");
           writer.write("\tif(pchEndPointUri)\n");
-          writer.write("\t\treturn axiscCreateStub(pchEndPointUri, AXISC_PTHTTP1_1);\n");
+          writer.write("\t\treturn axiscStubCreate(pchEndPointUri, AXISC_PTHTTP1_1);\n");
           writer.write("\telse\n");
-          writer.write("\t\treturn axiscCreateStub(\"" 
+          writer.write("\t\treturn axiscStubCreate(\"" 
                   + wscontext.getWrapInfo().getTargetEndpointURI() 
                   + "\", AXISC_PTHTTP1_1);\n");
           writer.write("}\n\n");
           
           // destroy_xxxx_stub()
           writer.write("void destroy_" + classname + "_stub(AXISCHANDLE p)\n{\n");
-          writer.write("\taxiscDestroyStub(p);\n}\n\n");
+          writer.write("\taxiscStubDestroy(p);\n}\n\n");
 
           // get_xxxx_Status() routine
           writer.write("int get_" + classname + "_Status(AXISCHANDLE stub)\n{\n");
-          writer.write("\tAXISCHANDLE call = axiscGetCall(stub);\n");
-          writer.write("\treturn axiscGetStatusCall(call);\n");
+          writer.write("\tAXISCHANDLE call = axiscStubGetCall(stub);\n");
+          writer.write("\treturn axiscCallGetStatus(call);\n");
           writer.write("}\n");
 
           writer.write("\n");
@@ -320,7 +320,7 @@
         
         writer.write(")\n{\n");
         
-        writer.write("\tAXISCHANDLE call = axiscGetCall(stub);\n");
+        writer.write("\tAXISCHANDLE call = axiscStubGetCall(stub);\n");
         
         if (returntype != null)
         {
@@ -367,24 +367,24 @@
         writer.write ("\tconst char* pcCmplxFaultName = NULL;\n");
         writer.write("\n");
         
-        writer.write("\tif (AXISC_SUCCESS != axiscInitializeCall(call, C_DOC_PROVIDER " + ")) return ");
+        writer.write("\tif (AXISC_SUCCESS != axiscCallInitialize(call, C_DOC_PROVIDER " + ")) return ");
         if (returntype != null)
             writer.write((returntypeisarray ? "RetArray" : returntypeissimple ? "Ret" : "pReturn") + ";\n");
         else
             writer.write(";\n");
         writer.write("\n");
         
-        writer.write("\tif (NULL==axiscGetTransportPropertyCall(call,\"SOAPAction\",0))\n");
-        writer.write("\t\taxiscSetTransportPropertyCall(call,AXISC_SOAPACTION_HEADER , \""
+        writer.write("\tif (NULL==axiscCallGetTransportProperty(call,\"SOAPAction\",0))\n");
+        writer.write("\t\taxiscCallSetTransportProperty(call,AXISC_SOAPACTION_HEADER , \""
                 + minfo.getSoapAction() + "\");\n");
         writer.write("\n");
         
-        writer.write("\taxiscSetSOAPVersionCall(call, SOAP_VER_1_1);\n");
+        writer.write("\taxiscCallSetSOAPVersion(call, SOAP_VER_1_1);\n");
         //TODO check which version is it really.
         
         if( minfo.getInputMessage() != null)
         {        
-            writer.write("\taxiscSetOperationCall(call, \""
+            writer.write("\taxiscCallSetOperation(call, \""
                 + minfo.getInputMessage().getLocalPart() + "\", \""
                 + minfo.getInputMessage().getNamespaceURI() + "\");\n");
         }
@@ -403,7 +403,7 @@
     
             if ("string".equals (elementType))
             {
-                writer.write ("\taxiscSetSOAPMethodAttribute(call, \""
+                writer.write ("\taxiscCallSetSOAPMethodAttribute(call, \""
                       + param.getParamName () + "\", \"\", Value" + i + ");\n");
             }
             else if ("int".equals (elementType))
@@ -411,7 +411,7 @@
                 writer.write ("\t{\n");
                 writer.write ("\t\tchar buffer[20];\n");
                 writer.write ("\t\tsprintf(buffer,\"%d\", Value" + i + ");\n");
-                writer.write ("\t\taxiscSetSOAPMethodAttribute(call, \"" +
+                writer.write ("\t\taxiscCallSetSOAPMethodAttribute(call, \"" +
                        param.getParamName () + "\", \"\", buffer);\n");
                 writer.write ("\t}\n");
             }
@@ -419,8 +419,8 @@
         
         // new calls from stub base
         writer.write("\n");
-        writer.write ("\taxiscIncludeSecure(stub);\n");  
-        writer.write ("\taxiscApplyUserPreferences(stub);\n");
+        writer.write ("\taxiscStubIncludeSecure(stub);\n");  
+        writer.write ("\taxiscStubApplyUserPreferences(stub);\n");
         writer.write("\n");
         
         for (int i = 0; i < paramsB.size(); i++)
@@ -457,7 +457,7 @@
             }
  
             if (param.isAnyType ())
-                writer.write("\taxiscAddAnyObjectCall(call, Value" + i);
+                writer.write("\taxiscCallAddAnyObject(call, Value" + i);
             else
             {
                 String parameterName = ((ParameterInfo) paramsB.get (i)).getElementNameAsString ();
@@ -479,7 +479,7 @@
                     writer.write ("\tchar cPrefixAndParamName" + i + "[" + stringLength + "];\n");
                     writer.write ("\tsprintf( cPrefixAndParamName" + i +
                               ", \"%s:" + parameterName +
-                              "\", axiscGetNamespacePrefixCall(call,\"" +  namespace + "\"));\n");
+                              "\", axiscCallGetNamespacePrefix(call,\"" +  namespace + "\"));\n");
                 }
     
                 if (param.getType().isAttachment())
@@ -487,17 +487,17 @@
                     // TODO
                     String attchType = param.getType().getName().getLocalPart();
                     writer.write("\n\tconst AxisChar *xmlSoapNsPfx" + i + 
-                        " = axiscGetNamespacePrefixCall(call,\"" + 
+                        " = axiscCallGetNamespacePrefix(call,\"" + 
                         WrapperConstants.APACHE_XMLSOAP_NAMESPACE + "\");\n");
                     writer.write("\tchar attchType" + i + "[64];\n");
                     writer.write("\tstrcpy(attchType" + i + ", xmlSoapNsPfx" + i + ");\n");
                     writer.write("\tstrcat(attchType" + i + ", \":" + attchType + "\");\n");
                     writer.write("\tIAttribute *attrs" + i + "[2];\n");
-                    writer.write("\tattrs" + i + "[0] = axiscCreateAttributeCall(call,\"type\", \"xsi\", attchType" + i + 
+                    writer.write("\tattrs" + i + "[0] = axiscCallCreateAttribute(call,\"type\", \"xsi\", attchType" + i + 
                         ");\n");
-                    writer.write("\tattrs" + i + "[1] = axiscCreateAttributeCall(call,xmlSoapNsPfx" + i + 
+                    writer.write("\tattrs" + i + "[1] = axiscCallCreateAttribute(call,xmlSoapNsPfx" + i + 
                         ", \"xmlns\", \"http://xml.apache.org/xml-soap\");\n");
-                    writer.write("\taxiscAddAttachmentParameterCall(call, Value" + i + ", cPrefixAndParamName" + i + 
+                    writer.write("\taxiscCallAddAttachmentParameter(call, Value" + i + ", cPrefixAndParamName" + i + 
                         ", attrs" + i + ", 2");
                 }
                 else if (typeisarray)
@@ -514,14 +514,14 @@
                     {
                         // Array of simple type
                         String containedType = CUtils.getclass4qname (qname);
-                        writer.write ("\taxiscAddBasicArrayParameterCall(call,");
+                        writer.write ("\taxiscCallAddBasicArrayParameter(call,");
                         writer.write ("Value" + i + ", " +
                               CUtils.getXSDTypeForBasicType(containedType) + ", cPrefixAndParamName" + i);
                     }
                     else if (arrayType != null && arrayType.isSimpleType ())
                     {
                         String containedType = CUtils.getclass4qname (arrayType.getBaseType ());
-                        writer.write ("\taxiscAddBasicArrayParameterCall(call,");
+                        writer.write ("\taxiscCallAddBasicArrayParameter(call,");
                         writer.write ("Value" + i + ", " +
                                   CUtils.getXSDTypeForBasicType(containedType) +
                                   ", cPrefixAndParamName" + i);
@@ -530,7 +530,7 @@
                     {
                         // Array of complex type
                         String containedType = qname.getLocalPart ();
-                        writer.write ("\taxiscAddCmplxArrayParameterCall(call,");
+                        writer.write ("\taxiscCallAddCmplxArrayParameter(call,");
                         writer.write ("Value" + i +
                                   ", (void*)Axis_Serialize_" + containedType +
                                   ", (void*)Axis_Delete_" + containedType +
@@ -549,13 +549,13 @@
                             || param.isOptional()
                             || CUtils.isPointerType(paraTypeName))
                     {
-                        writer.write ("\taxiscAddParameterCall(call,");
+                        writer.write ("\taxiscCallAddParameter(call,");
                         writer.write ("(void*)Value" + i + ", cPrefixAndParamName" + i
                                   + ", " + CUtils.getXSDTypeForBasicType(paraTypeName));
                     }
                     else
                     {
-                        writer.write ("\taxiscAddParameterCall(call,");
+                        writer.write ("\taxiscCallAddParameter(call,");
                         writer.write ("(void*)&Value" + i + ", cPrefixAndParamName" + i
                                   + ", " + CUtils.getXSDTypeForBasicType(paraTypeName));
                     }
@@ -563,7 +563,7 @@
                 else
                 {
                     // Complex Type
-                    writer.write ("\taxiscAddCmplxParameterCall(call,");
+                    writer.write ("\taxiscCallAddCmplxParameter(call,");
                     writer.write ("Value" + i
                           + ", (void*)Axis_Serialize_" + paraTypeName
                           + ", (void*)Axis_Delete_" + paraTypeName
@@ -578,10 +578,10 @@
 
         writer.write("\n");
         
-        writer.write("\tif (AXISC_SUCCESS == axiscInvokeCall(call))\n\t{\n");       
+        writer.write("\tif (AXISC_SUCCESS == axiscCallInvoke(call))\n\t{\n");       
         if (minfo.getOutputMessage () != null)
         {
-            writer.write("\t\tif(AXISC_SUCCESS == axiscCheckMessageCall(call, \""
+            writer.write("\t\tif(AXISC_SUCCESS == axiscCallCheckMessage(call, \""
                 + minfo.getOutputMessage().getLocalPart() + "\", \""
                 + minfo.getOutputMessage().getNamespaceURI() + "\"))\n\t\t{\n");
         }
@@ -639,7 +639,7 @@
                     {
                         containedType = CUtils.getclass4qname(qname);
                         
-                        writer.write("\n\t\t\tOutValue" + i + " = axiscGetBasicArrayCall(call, " 
+                        writer.write("\n\t\t\tOutValue" + i + " = axiscCallGetBasicArray(call, " 
                                 + CUtils.getXSDTypeForBasicType (containedType) 
                                 + ", \"" + currentType.getParamName ()
                                 + "\", 0);\n\n");
@@ -655,7 +655,7 @@
                         writer.write("\t\t\t\telse\n");
                         writer.write("\t\t\t\t\t(" + currentParamName + ")->clear();\n");
                         
-                        writer.write("\t\t\t\taxiscGetCmplxArrayCall(call, " + currentParamName 
+                        writer.write("\t\t\t\taxiscCallGetCmplxArray(call, " + currentParamName 
                               + ", (void*) Axis_DeSerialize_" + containedType
                               + ", (void*) Axis_Create_" + containedType
                               + ", (void*) Axis_Delete_" + containedType
@@ -670,7 +670,7 @@
                         writer.write("\t\t\t\t/* Unable to return value, but will deserialize to ensure subsequent elements can be correctly processed. */\n");
                         writer.write("\t\t\t\t" + containedType + "_Array * pTemp" + i 
                               + " = new " + containedType + "_Array();\n");
-                        writer.write("\t\t\t\taxiscGetCmplxArrayCall(call, pTemp" + i 
+                        writer.write("\t\t\t\taxiscCallGetCmplxArray(call, pTemp" + i 
                               + ", (void*) Axis_DeSerialize_" + containedType
                               + ", (void*) Axis_Create_" + containedType
                               + ", (void*) Axis_Delete_" + containedType
@@ -698,7 +698,10 @@
                             xsdType += " *";
                         }
                         
-                        writer.write( "\t\t\t" + currentParaType + " pReturn" + i + " = " + CUtils.getParameterGetValueMethodName( baseTypeName, false) + "(call,  \"" + currentType.getParamName() + "\", 0);\n");
+                        writer.write( "\t\t\t" + currentParaType + " pReturn" + i + " = " 
+                                + "axiscCall"
+                                + CUtils.getParameterGetValueMethodName( baseTypeName, false) 
+                                + "(call,  \"" + currentType.getParamName() + "\", 0);\n");
                         writer.write( "\n");
                         writer.write( "\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
                         writer.write( "\t\t\t\t{\n");
@@ -726,7 +729,10 @@
                     }
                     else 
                     {
-                        writer.write( "\t\t\t" + currentParaType + " * pReturn" + i + " = " + CUtils.getParameterGetValueMethodName( baseTypeName, false) + "(call,  \"" + currentType.getParamName() + "\", 0);\n");
+                        writer.write( "\t\t\t" + currentParaType + " * pReturn" + i + " = " 
+                                + "axiscCall"
+                                + CUtils.getParameterGetValueMethodName( baseTypeName, false) 
+                                + "(call,  \"" + currentType.getParamName() + "\", 0);\n");
                         writer.write( "\n");
                         writer.write( "\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
                         writer.write( "\t\t\t{\n");
@@ -752,7 +758,7 @@
                 {
                     writer.write ("\t\t\t"
                           + currentParamName + " = *(" + currentParaType 
-                          + "*)axiscGetAnyObjectCall(call);\n");
+                          + "*)axiscCallGetAnyObject(call);\n");
                 }
                 else
                 {
@@ -762,7 +768,7 @@
 
                     writer.write ("\n\t\t\t"
                               + currentParamName + " = (" + currentParaType
-                              + "*)axiscGetCmplxObjectCall(call, (void*) Axis_DeSerialize_" + currentParaType 
+                              + "*)axiscCallGetCmplxObject(call, (void*) Axis_DeSerialize_" + currentParaType 
                               + ", (void*) Axis_Create_" + currentParaType 
                               + ", (void*) Axis_Delete_" + currentParaType + ",\"" 
                               + currentType.getElementNameAsString () + "\", 0);\n");
@@ -771,7 +777,7 @@
             
             writer.write ("\t\t}\n");
             writer.write ("\t}\n");
-            writer.write ("\taxiscUnInitializeCall(call);\n");
+            writer.write ("\taxiscCallUnInitialize(call);\n");
         }
         else if (returntype == null)
         {
@@ -779,7 +785,7 @@
                 writer.write ("\t\t\t/*not successful*/\n\t\t}\n");
 
             writer.write ("\t}\n");
-            writer.write ("\taxiscUnInitializeCall(call);\n");
+            writer.write ("\taxiscCallUnInitialize(call);\n");
         }
         else if (returntypeisarray)
         {
@@ -792,7 +798,7 @@
             if (CUtils.isSimpleType (qname))
             {
                 containedType = CUtils.getclass4qname (qname);
-                writer.write ("\t\t\tRetArray = axiscGetBasicArrayCall(call, " 
+                writer.write ("\t\t\tRetArray = axiscCallGetBasicArray(call, " 
                         + CUtils.getXSDTypeForBasicType (containedType) 
                         + ", \"" + returntype.getParamName () + "\", 0);\n");
             }
@@ -800,7 +806,7 @@
             {
                 containedType = qname.getLocalPart ();
                 writer.write("\t\t\tRetArray = (" + containedType 
-                        + "_Array *) axiscGetCmplxArrayCall(call, RetArray, (void*) Axis_DeSerialize_"
+                        + "_Array *) axiscCallGetCmplxArray(call, RetArray, (void*) Axis_DeSerialize_"
                         + containedType 
                         + ", (void*) Axis_Create_" + containedType
                           + ", (void*) Axis_Delete_" + containedType
@@ -811,7 +817,7 @@
             
             writer.write ("\t\t}\n");
             writer.write ("\t}\n");
-            writer.write ("\taxiscUnInitializeCall(call);\n");
+            writer.write ("\taxiscCallUnInitialize(call);\n");
             writer.write ("\treturn RetArray;\n");
         }
         else if (returntypeissimple)
@@ -821,12 +827,14 @@
                 if( CUtils.isPointerType( outparamType))
                 {
                     writer.write( "\t\t\t" + outparamType + " pReturn = " 
+                            + "axiscCall"
                             + CUtils.getParameterGetValueMethodName( outparamType, false) 
                             + "(call, \"" + returntype.getParamName() + "\", 0);\n");
                 }
                 else
                 {
                     writer.write( "\t\t\t" + outparamType + " * pReturn = " 
+                            + "axiscCall"
                             + CUtils.getParameterGetValueMethodName( outparamType, false) 
                             + "(call, \"" + returntype.getParamName() + "\", 0);\n");
                 }
@@ -853,10 +861,10 @@
             {
                 if (CUtils.isPointerType(outparamType))
                 {
-                    writer.write ("\t\t\t" + outparamType +
-                              " pReturn = " +
-                              CUtils.getParameterGetValueMethodName(outparamType,false) + "(call, \"" +
-                              returntype.getParamName () + "\", 0);\n");
+                    writer.write ("\t\t\t" + outparamType + " pReturn = " 
+                            + "axiscCall"
+                            + CUtils.getParameterGetValueMethodName(outparamType,false) 
+                            + "(call, \"" + returntype.getParamName () + "\", 0);\n");
                     writer.write ("\t\t\tif(pReturn)\n");
                     writer.write ("\t\t\t{\n");
                     writer.write ("\t\t\t\tRet = axiscAxisNew(XSDC_STRING, strlen( pReturn) + 1);\n");
@@ -866,9 +874,10 @@
                 }
                 else
                 {
-                    writer.write ("\t\t\t" + outparamType + " * pReturn = " +
-                              CUtils.getParameterGetValueMethodName(outparamType, false) + "(call, \"" +
-                              returntype.getSOAPElementNameAsString() + "\", 0);\n");
+                    writer.write ("\t\t\t" + outparamType + " * pReturn = " 
+                            + "axiscCall"
+                            + CUtils.getParameterGetValueMethodName(outparamType, false) 
+                            + "(call, \"" + returntype.getSOAPElementNameAsString() + "\", 0);\n");
                     writer.write ("\t\t\tif(pReturn)\n");
                     writer.write ("\t\t\t{\n");
                     
@@ -888,14 +897,14 @@
 
             }
             writer.write ("\t}\n");
-            writer.write ("\taxiscUnInitializeCall(call);\n");
+            writer.write ("\taxiscCallUnInitialize(call);\n");
             writer.write ("\treturn Ret;\n");
         }
         else if (returntype.isAnyType ())
         {
-            writer.write ("\t\t\tpReturn = (" + outparamType + "*)axiscGetAnyObject(call);\n\t\t}\n");
+            writer.write ("\t\t\tpReturn = (" + outparamType + "*)axiscCallGetAnyObject(call);\n\t\t}\n");
             writer.write ("\t}\n");
-            writer.write ("\taxiscUnInitializeCall(call);\n");
+            writer.write ("\taxiscCallUnInitialize(call);\n");
             writer.write ("\treturn pReturn;\n");
         }
         else
@@ -904,7 +913,7 @@
             {
                 String outparamTypeBase = outparamType.substring (0,outparamType.lastIndexOf("*"));
                 writer.write ("\t\t\tpReturn = (" + outparamType +
-                          ")axiscGetCmplxObjectCall(call, (void*) Axis_DeSerialize_" + outparamTypeBase +
+                          ")axiscCallGetCmplxObject(call, (void*) Axis_DeSerialize_" + outparamTypeBase +
                           ", (void*) Axis_Create_" + outparamTypeBase +
                           ", (void*) Axis_Delete_" + outparamTypeBase + ",\"" +
                           returntype.getElementNameAsString () + "\", 0);\n\t\t}\n");
@@ -912,14 +921,14 @@
             else
             {
                 writer.write ("\t\t\tpReturn = (" + outparamType
-                          + "*)axiscGetCmplxObjectCall(call, (void*) Axis_DeSerialize_" + outparamType +
+                          + "*)axiscCallGetCmplxObject(call, (void*) Axis_DeSerialize_" + outparamType +
                           ", (void*) Axis_Create_" + outparamType +
                           ", (void*) Axis_Delete_" + outparamType + ",\"" +
                           returntype.getElementNameAsString () + "\", 0);\n\t\t}\n");
             }
 
             writer.write ("\t}\n");
-            writer.write ("\taxiscUnInitializeCall(call);\n");
+            writer.write ("\taxiscCallUnInitialize(call);\n");
             writer.write ("\treturn pReturn;\n");
         }
 

Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/c/AxisBenchClient.c
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/client/c/AxisBenchClient.c?rev=394863&r1=394862&r2=394863&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/c/AxisBenchClient.c (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/c/AxisBenchClient.c Mon Apr 17 23:52:47 2006
@@ -48,7 +48,7 @@
     int request = 1;
     
 
-    axiscRegisterExceptionHandler(exceptionHandler);
+    axiscAxisRegisterExceptionHandler(exceptionHandler);
   
     if (argc>2 && strcmp(argv[1], "-e") == 0) 
         endpoint = argv[2];   
@@ -56,7 +56,7 @@
     ws = get_AxisBench_stub (endpoint);
     
     /* extend transport timeout value to 60 secs */
-    axiscSetTransportTimeout(ws, 60);
+    axiscStubSetTransportTimeout(ws, 60);
 
     ppBBDT = (BenchBasicDataType **)malloc(sizeof(BenchBasicDataType *) * 100);
 

Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/c/CalculatorDocClient.c
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/client/c/CalculatorDocClient.c?rev=394863&r1=394862&r2=394863&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/c/CalculatorDocClient.c (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/c/CalculatorDocClient.c Mon Apr 17 23:52:47 2006
@@ -25,7 +25,7 @@
     int ret = 0;
     char *uri = "http://localhost:80/axis/Calculator";
 
-    axiscRegisterExceptionHandler(exceptionHandler);
+    axiscAxisRegisterExceptionHandler(exceptionHandler);
 
     if (argc>1) 
         uri = argv[1];

Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/c/SimpleTypeArrayClient.c
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/client/c/SimpleTypeArrayClient.c?rev=394863&r1=394862&r2=394863&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/c/SimpleTypeArrayClient.c (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/c/SimpleTypeArrayClient.c Mon Apr 17 23:52:47 2006
@@ -33,7 +33,7 @@
     xsdc__int   elements[100];
     int i;
 
-    axiscRegisterExceptionHandler(exceptionHandler);
+    axiscAxisRegisterExceptionHandler(exceptionHandler);
 
     if (argc>2 && strcmp(argv[1], "-e") == 0) 
         endpoint = argv[2];   

Modified: webservices/axis/trunk/c/tests/auto_build/testcases/tests/CalculatorDocC.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/tests/CalculatorDocC.xml?rev=394863&r1=394862&r2=394863&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/tests/CalculatorDocC.xml (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/tests/CalculatorDocC.xml Mon Apr 17 23:52:47 2006
@@ -3,7 +3,7 @@
     <description>CalculatorDocC</description>
     <clientLang>c</clientLang>
     <clientCode>CalculatorDocClient.c</clientCode>
-    <wsdl>CalculatorDoc.wsdl</wsdl>
+    <wsdl>CalculatorDocC.wsdl</wsdl>
     <expected>
         <output>
             CalculatorDocC.c.out

Added: webservices/axis/trunk/c/tests/auto_build/testcases/wsdls/CalculatorDocC.wsdl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/wsdls/CalculatorDocC.wsdl?rev=394863&view=auto
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/wsdls/CalculatorDocC.wsdl (added)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/wsdls/CalculatorDocC.wsdl Mon Apr 17 23:52:47 2006
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2003-2004 The Apache Software Foundation.                      -->
+<!-- (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved                   -->
+<!--                                                                          -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License");          -->
+<!-- you may not use this file except in compliance with the License.         -->
+<!-- You may obtain a copy of the License at                                  -->
+<!--                                                                          -->
+<!--        http://www.apache.org/licenses/LICENSE-2.0                        -->
+<!--                                                                          -->
+<!-- Unless required by applicable law or agreed to in writing, software      -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS,        -->
+<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -->
+<!-- See the License for the specific language governing permissions and      -->
+<!-- limitations under the License.                                           -->
+
+<wsdl:definitions targetNamespace="http://localhost/axis/Calculator" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://localhost/axis/Calculator" xmlns:intf="http://localhost/axis/Calculator" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+  <schema elementFormDefault="qualified" targetNamespace="http://localhost/axis/Calculator" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://localhost/axis/Calculator" xmlns:intf="http://localhost/axis/Calculator" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+   <element name="add">
+    <complexType>
+     <sequence>
+      <element name="arg_0_0" type="xsd:int"/>
+      <element name="arg_1_0" type="xsd:int"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="addResponse">
+    <complexType>
+     <sequence>
+      <element name="addReturn" type="xsd:int"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="sub">
+    <complexType>
+     <sequence>
+      <element name="arg_0_1" type="xsd:int"/>
+      <element name="arg_1_1" type="xsd:int"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="subResponse">
+    <complexType>
+     <sequence>
+      <element name="subReturn" type="xsd:int"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="mul">
+    <complexType>
+     <sequence>
+      <element name="arg_0_2" type="xsd:int"/>
+      <element name="arg_1_2" type="xsd:int"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="mulResponse">
+    <complexType>
+     <sequence>
+      <element name="mulReturn" type="xsd:int"/>
+     </sequence>
+    </complexType>
+   </element>
+
+  </schema>
+ </wsdl:types>
+
+   <wsdl:message name="subResponse">
+
+      <wsdl:part element="impl:subResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="mulResponse">
+
+      <wsdl:part element="impl:mulResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="subRequest">
+
+      <wsdl:part element="impl:sub" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="mulRequest">
+
+      <wsdl:part element="impl:mul" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="addResponse">
+
+      <wsdl:part element="impl:addResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="addRequest">
+
+      <wsdl:part element="impl:add" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:portType name="Calculator">
+
+      <wsdl:operation name="add">
+
+         <wsdl:input message="impl:addRequest" name="addRequest"/>
+
+         <wsdl:output message="impl:addResponse" name="addResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="sub">
+
+         <wsdl:input message="impl:subRequest" name="subRequest"/>
+
+         <wsdl:output message="impl:subResponse" name="subResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="mul">
+
+         <wsdl:input message="impl:mulRequest" name="mulRequest"/>
+
+         <wsdl:output message="impl:mulResponse" name="mulResponse"/>
+
+      </wsdl:operation>
+
+
+   </wsdl:portType>
+
+   <wsdl:binding name="CalculatorSoapBinding" type="impl:Calculator">
+
+      <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+      <wsdl:operation name="add">
+
+         <wsdlsoap:operation soapAction="Calculator#add"/>
+
+         <wsdl:input name="addRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="addResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="sub">
+
+         <wsdlsoap:operation soapAction="Calculator#sub"/>
+
+         <wsdl:input name="subRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="subResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="mul">
+
+         <wsdlsoap:operation soapAction="Calculator#mul"/>
+
+         <wsdl:input name="mulRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="mulResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+
+   </wsdl:binding>
+
+   <wsdl:service name="Calculator">
+
+      <wsdl:port binding="impl:CalculatorSoapBinding" name="Calculator">
+
+         <wsdlsoap:address location="http://localhost/axis/Calculator"/>
+
+      </wsdl:port>
+
+   </wsdl:service>
+
+</wsdl:definitions>

Modified: webservices/axis/trunk/c/tools/org/apache/axis/tools/cbindings/CBindingGenerator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tools/org/apache/axis/tools/cbindings/CBindingGenerator.java?rev=394863&r1=394862&r2=394863&view=diff
==============================================================================
--- webservices/axis/trunk/c/tools/org/apache/axis/tools/cbindings/CBindingGenerator.java (original)
+++ webservices/axis/trunk/c/tools/org/apache/axis/tools/cbindings/CBindingGenerator.java Mon Apr 17 23:52:47 2006
@@ -25,8 +25,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
+import java.util.Hashtable;
 import java.util.*;
 
+
 import org.apache.axis.tools.common.CParsingTool;
 import org.apache.axis.tools.common.Configuration;
 import org.apache.axis.tools.common.DirectoryTree;
@@ -48,10 +50,41 @@
  */
 public class CBindingGenerator extends CParsingTool implements FileActor 
 {
+    private static Hashtable classMapping = new Hashtable();
+    
+    static{ 
+        classMapping.put("AxisCPPConfigDefaults",   "axiscConfigDefaults");
+        classMapping.put("AxisException",           "axiscException");
+        classMapping.put("BasicHandler",            "axiscBasicHandler");
+        classMapping.put("BasicNode",               "axiscBasicNode");
+        classMapping.put("IAttribute",              "axiscAttribute");
+        classMapping.put("IHandlerSoapDeSerializer","axiscHandlerSoapDeSerializer");
+        classMapping.put("IHandlerSoapSerializer",  "axiscHandlerSoapSerializer");
+        classMapping.put("IHeaderBlock",            "axiscHeaderBlock");
+        classMapping.put("IMessageData",            "axiscMessageData");
+        classMapping.put("INamespace",              "axiscNamespace");
+        classMapping.put("ISoapAttachment",         "axiscSoapAttachment");
+        classMapping.put("ISoapFault",              "axiscSoapFault");
+        classMapping.put("IWrapperSoapDeSerializer","axiscSoapDeSerializer");
+        classMapping.put("IWrapperSoapSerializer",  "axiscSoapSerializer");
+        classMapping.put("OtherFaultException",     "axiscOtherFaultException");
+        classMapping.put("SoapFaultException",      "axiscSoapFaultException");
+        classMapping.put("TypeMapping",             "axiscTypeMapping");
+     }
+    
     private CBindingGenerator(String[] args) throws Exception 
     {
         super(args);
     }
+    
+    public static String getClassMapping(String theClass)
+    {
+        String val = (String)classMapping.get(theClass);
+        if (val == null)
+            val = "axisc" + theClass;
+
+        return val;
+    }
 
     /**
      * This method is called by the DirectoryTree with two files: the
@@ -296,9 +329,7 @@
         String text = new String();
 
         // Look to see if this method is overloaded by another method
-        // in the same class or a different class. If methods in two 
-        // different classes happen to have the same name, then change
-        // their names. If methods are overloaded in the same class then
+        // in the same class. If methods are overloaded in the same class then
         // convert the longest method prototype to C. We should really 
         // superset the parameters in the two prototypes instead of
         // picking the longest one.
@@ -310,9 +341,7 @@
             while (it.hasNext()) 
             {
                 Signature s = (Signature) it.next();
-                if (!s.getTrimClassName().equals(classname))
-                    sameClass = false;
-                else 
+                if (s.getTrimClassName().equals(classname))
                 {
                     int n1 = 0;
                     int n2 = 0;
@@ -326,11 +355,14 @@
             }
         }
 
+        String classMapping = getClassMapping(classname);
+        
+        text += "AXISC_STORAGE_CLASS_INFO\n";
         if (sign.isConstructor()) 
-            text += "AXISC_STORAGE_CLASS_INFO AXISCHANDLE axiscCreate" + classname + "(";
+            text += "AXISCHANDLE " + classMapping + "Create(";
         else if (sign.isDestructor()) 
         {
-            text += "AXISC_STORAGE_CLASS_INFO void axiscDestroy" + classname + "(AXISCHANDLE ";
+            text += "void " + classMapping + "Destroy(AXISCHANDLE ";
             String prettyClass = classNamePretty(classname);
             text += Character.toLowerCase(prettyClass.charAt(0));
             text += prettyClass.substring(1);
@@ -346,17 +378,14 @@
             if (System.getProperty("os.name").equals("OS/400"))
                 retType = retType.replaceAll("const xsdc__string","const char *");
 
-            text += "AXISC_STORAGE_CLASS_INFO " + retType + " ";
-            text += "axisc";
+            text += retType + " ";
+            text += getClassMapping(classname);
             text += Character.toUpperCase(method.charAt(0));
             text += method.substring(1);
             
             String retClass = getClassFromRetType(sign);
             if ("AXISCHANDLE".equals(retType) && -1 == method.indexOf(retClass))
                 text += retClass;
-            
-            if (!sameClass)
-                text += classname;
             
             text += "(";
 



Mime
View raw message