You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by na...@apache.org on 2006/05/01 05:48:55 UTC
svn commit: r398516 - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c:
ArrayParamHeaderWriter.java HeaderFileWriter.java ParmHeaderFileWriter.java
literal/ClientStubHeaderWriter.java
Author: nadiramra
Date: Sun Apr 30 20:48:54 2006
New Revision: 398516
URL: http://svn.apache.org/viewcvs?rev=398516&view=rev
Log:
C support fixes/enhancements.
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/HeaderFileWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java?rev=398516&r1=398515&r2=398516&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java Sun Apr 30 20:48:54 2006
@@ -56,7 +56,7 @@
this.writer.write("#if !defined(__" + classname.toUpperCase() + "_H__INCLUDED_)\n");
this.writer.write("#define __" + classname.toUpperCase() + "_H__INCLUDED_\n\n");
-
+
if (attribs.length != 1)
{
System.out.println("Array " + classname + " contains unexpected no of variables");
@@ -65,10 +65,12 @@
writer.write("#include <axis/Axis.h>\n");
writer.write("#include <axis/AxisUserAPI.h>\n\n");
+
+ this.writer.write("#ifdef __cplusplus\n extern \"C\" {\n#endif\n\n");
writeArrayClassDefinition();
- this.writer.write("\n");
+ this.writer.write("\n#ifdef __cplusplus\n }\n#endif\n\n");
this.writer.write("#endif /* !defined(__" + classname.toUpperCase() + "_H__INCLUDED_)*/\n");
writer.flush();
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/HeaderFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/HeaderFileWriter.java?rev=398516&r1=398515&r2=398516&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/HeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/HeaderFileWriter.java Sun Apr 30 20:48:54 2006
@@ -64,11 +64,14 @@
//includes
writePreprocessorStatements();
+ this.writer.write("\n#ifdef __cplusplus\n extern \"C\" {\n#endif\n\n");
+
//class
writeAttributes();
writeMethods();
- this.writer.write("\n\n");
+ this.writer.write("\n");
+ this.writer.write("#ifdef __cplusplus\n }\n#endif\n\n");
this.writer.write("#endif /* !defined(__" + classname.toUpperCase() + "_H__INCLUDED_) */\n");
//cleanup
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=398516&r1=398515&r2=398516&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 Sun Apr 30 20:48:54 2006
@@ -73,12 +73,14 @@
else
{
writePreprocessorStatements();
+ this.writer.write("\n#ifdef __cplusplus\n extern \"C\" {\n#endif\n\n");
this.writer.write("typedef struct " + classname + "Tag {\n");
this.writer.write("\n");
writeAttributes();
this.writer.write("\n");
this.writer.write("} " + classname + ";\n\n");
writeFunctionPrototypes();
+ this.writer.write("\n#ifdef __cplusplus\n }\n#endif\n");
}
writer.write("\n");
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=398516&r1=398515&r2=398516&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 Sun Apr 30 20:48:54 2006
@@ -54,13 +54,19 @@
try
{
writer.write("\n");
+ writer.write("/* ****************************************************** */\n");
writer.write("/* --- Functions relating to web service client proxy --- */\n");
+ writer.write("/* ****************************************************** */\n");
+ writer.write("\n");
writer.write("extern AXISCHANDLE get_" + classname + "_stub(const char* pchEndPointUri);\n");
writer.write("extern void destroy_" + classname + "_stub(AXISCHANDLE pStub);\n");
writer.write("extern int get_" + classname + "_Status(AXISCHANDLE pStub);\n");
writer.write("\n");
- writer.write("/* --- Functions relating to web service methods --- */\n");
+ writer.write("/* ****************************************************** */\n");
+ writer.write("/* --- Functions relating to web service methods --- */\n");
+ writer.write("/* ****************************************************** */\n");
+ writer.write("\n");
for (int i = 0; i < methods.size(); i++)
{