You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2007/01/29 03:29:55 UTC
svn commit: r500923 - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp:
ClientStubWriter.java literal/ClientStubWriter.java
Author: nadiramra
Date: Sun Jan 28 18:29:54 2007
New Revision: 500923
URL: http://svn.apache.org/viewvc?view=rev&rev=500923
Log:
Try to make consistent with literal class so that we can remove duplication.
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java?view=diff&rev=500923&r1=500922&r2=500923
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java Sun Jan 28 18:29:54 2007
@@ -210,6 +210,7 @@
boolean returntypeissimple = false;
boolean returntypeisarray = false;
String outparamType = null;
+
if (returntype != null)
{
outparamType = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returntype, wscontext);
@@ -221,14 +222,17 @@
returntypeissimple = true;
}
}
+
writer.write("\n/*\n");
writer.write(" * This method wrap the service method " + methodName + "\n");
writer.write(" */\n");
+
//method signature
String paramTypeName;
boolean typeisarray = false;
boolean typeissimple = false;
Type type;
+
if (returntype == null)
writer.write("void");
else if (returntypeissimple
@@ -311,11 +315,11 @@
}
}
- writer.write("\tconst char *\tpcCmplxFaultName = NULL;\n\n");
- writer.write("\ttry\n\t{");
- writer.write("\n\t\tif( AXIS_SUCCESS != m_pCall->initialize( CPP_RPC_PROVIDER"
- + "))\n\t\t{\n\t\t\treturn ");
-
+ writer.write("\tconst char* pcCmplxFaultName = NULL;\n\n");
+ writer.write("\ttry\n\t{\n");
+
+ writer.write("\t\tif (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER" + "))\n");
+ writer.write("\t\t\treturn ");
if (returntype != null)
{
if (returntypeisarray)
@@ -330,12 +334,12 @@
}
else
writer.write(";\n");
-
- writer.write("\t\t}\n\n");
+ writer.write("\n");
writer.write("\t\tif( NULL == m_pCall->getTransportProperty( \"SOAPAction\", false))\n");
writer.write("\t\t\tm_pCall->setTransportProperty( SOAPACTION_HEADER,\"" + minfo.getSoapAction() + "\");\n");
writer.write("\n");
+
writer.write("\t\tm_pCall->setSOAPVersion( SOAP_VER_1_1);\n");
//TODO check which version is it really.
@@ -349,8 +353,8 @@
//new calls from stub base
writer.write("\n");
- writer.write ("\tincludeSecure();\n");
- writer.write ("\tapplyUserPreferences();\n");
+ writer.write ("\t\tincludeSecure();\n");
+ writer.write ("\t\tapplyUserPreferences();\n");
writer.write("\n");
for (int i = 0; i < paramsB.size(); i++)
@@ -597,7 +601,8 @@
+ ",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"" + currentType.getParamName()
+ "\",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t0);\n");
}
- }
+ } // end for-loop for paramsC
+
writer.write("\t\t\t}\n");
writer.write("\t\t}\n\n");
writer.write("\t\tm_pCall->unInitialize();\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java?view=diff&rev=500923&r1=500922&r2=500923
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java Sun Jan 28 18:29:54 2007
@@ -318,10 +318,11 @@
}
}
- writer.write ("\tconst char* pcCmplxFaultName = NULL;\n");
+ writer.write ("\tconst char* pcCmplxFaultName = NULL;\n\n");
writer.write ("\ttry\n\t{\n");
- writer.write("\tif (AXIS_SUCCESS != m_pCall->initialize(CPP_DOC_PROVIDER" + ")) return ");
+ writer.write("\tif (AXIS_SUCCESS != m_pCall->initialize(CPP_DOC_PROVIDER" + "))\n");
+ writer.write("\t\treturn ");
if (returntype != null)
writer.write ((returntypeisarray ? "RetArray" : returntypeissimple ? "Ret" : "pReturn") + ";\n");
else
@@ -719,7 +720,7 @@
+ ", (void*) Axis_Delete_" + currentParaType + ",\""
+ currentType.getElementNameAsString () + "\", 0);\n");
}
- }
+ } // end for-loop for paramsC
writer.write ("\t\t}\n");
writer.write ("\t}\n");
@@ -1003,12 +1004,5 @@
writer.write ("\t\t}\n");
writer.write ("\t}\n");
writer.write ("}\n");
- }
-
- /* (non-Javadoc)
- * @see org.apache.axis.wsdl.wsdl2ws.cpp.CPPClassWriter#writeGlobalCodes()
- */
- protected void writeGlobalCodes () throws WrapperFault
- {
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org