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 di...@apache.org on 2004/11/09 11:26:23 UTC
cvs commit: ws-axis/c/tests/auto_build/testcases/client/cpp AxisBenchClient.cpp CalculatorClient.cpp CalculatorDocClient.cpp ComplexTypeAllClient.cpp EnumerationClient.cpp ExceptionTestClient.cpp ExceptionTestDocClient.cpp ExtensibilityQueryClient.cpp FaultMappingClient.cpp FaultMappingDocClient.cpp InteropTestRound1Client.cpp InteropTestRound1DocClient.cpp LargeReturningStringClient.cpp ManyTypeRefRootClient.cpp MathOpsClient.cpp MathOpsDocClient.cpp RecurseTypesClient.cpp RpcHttpHeaderTest1Client.cpp RpcHttpHeaderTest2Client.cpp RpcHttpHeaderTest3Client.cpp RpcHttpHeaderTest4Client.cpp RpcHttpHeaderTest5Client.cpp RpcHttpHeaderTest7Client.cpp RpcHttpHeaderTest8Client.cpp RpcSoapHeaderTest10Client.cpp RpcSoapHeaderTest1Client.cpp RpcSoapHeaderTest2Client.cpp RpcSoapHeaderTest3Client.cpp RpcSoapHeaderTest4Client.cpp RpcSoapHeaderTest5Client.cpp RpcSoapHeaderTest6Client.cpp RpcSoapHeaderTest8Client.cpp RpcSoapHeaderTest9Client.cpp SimpleArrayClient.cpp SimpleArrayDocClient.cpp SimpleRefClient.cpp SimpleRefDocClient.cpp SimpleTypeArrayClient.cpp SimpleTypeInnerUnboundedClient.cpp SimpleTypeInnerUnboundedInOutputClient.cpp TradeServicesClient.cpp inquire_v2Client.cpp
dicka 2004/11/09 02:26:23
Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws CUtils.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c
ArrayParamWriter.java CFileWriter.java
ClassLoader.java ClientStubHeaderWriter.java
ClientStubWriter.java ParamCFileWriter.java
ParmHeaderFileWriter.java ServiceWriter.java
WrapWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal
ClientStubHeaderWriter.java ParamCFileWriter.java
ParmHeaderFileWriter.java ServiceWriter.java
WrapWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
ArrayParamWriter.java CPPClassWriter.java
ClassLoader.java ClientStubHeaderWriter.java
ClientStubWriter.java ExceptionHeaderWriter.java
ExceptionWriter.java HeaderFileWriter.java
ParamCPPFileWriter.java ParmHeaderFileWriter.java
ServiceHeaderWriter.java ServiceWriter.java
WrapHeaderWriter.java WrapWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
AllParamWriter.java ClientStubHeaderWriter.java
ClientStubWriter.java ParamCPPFileWriter.java
ParmHeaderFileWriter.java ServiceHeaderWriter.java
c/tests/auto_build/testcases/client/cpp AxisBenchClient.cpp
CalculatorClient.cpp CalculatorDocClient.cpp
ComplexTypeAllClient.cpp EnumerationClient.cpp
ExceptionTestClient.cpp ExceptionTestDocClient.cpp
ExtensibilityQueryClient.cpp FaultMappingClient.cpp
FaultMappingDocClient.cpp
InteropTestRound1Client.cpp
InteropTestRound1DocClient.cpp
LargeReturningStringClient.cpp
ManyTypeRefRootClient.cpp MathOpsClient.cpp
MathOpsDocClient.cpp RecurseTypesClient.cpp
RpcHttpHeaderTest1Client.cpp
RpcHttpHeaderTest2Client.cpp
RpcHttpHeaderTest3Client.cpp
RpcHttpHeaderTest4Client.cpp
RpcHttpHeaderTest5Client.cpp
RpcHttpHeaderTest7Client.cpp
RpcHttpHeaderTest8Client.cpp
RpcSoapHeaderTest10Client.cpp
RpcSoapHeaderTest1Client.cpp
RpcSoapHeaderTest2Client.cpp
RpcSoapHeaderTest3Client.cpp
RpcSoapHeaderTest4Client.cpp
RpcSoapHeaderTest5Client.cpp
RpcSoapHeaderTest6Client.cpp
RpcSoapHeaderTest8Client.cpp
RpcSoapHeaderTest9Client.cpp SimpleArrayClient.cpp
SimpleArrayDocClient.cpp SimpleRefClient.cpp
SimpleRefDocClient.cpp SimpleTypeArrayClient.cpp
SimpleTypeInnerUnboundedClient.cpp
SimpleTypeInnerUnboundedInOutputClient.cpp
TradeServicesClient.cpp inquire_v2Client.cpp
Log:
Produce .hpp header files when generating C++ stubs in WSDL2Ws.
Submitted by: Adrian Dick
Revision Changes Path
1.26 +9 -0 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java
Index: CUtils.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- CUtils.java 4 Nov 2004 10:42:33 -0000 1.25
+++ CUtils.java 9 Nov 2004 10:26:19 -0000 1.26
@@ -41,6 +41,15 @@
public static final String WRAPPER_METHOD_APPENDER = "Wrapped";
public static final QName anyTypeQname = new QName("http://ws.apache.org/axisc/types","AnyType");
+ // File suffix for C++ Class files
+ public static final String CPP_CLASS_SUFFIX = ".cpp";
+ // File suffix for C++ Header files
+ public static final String CPP_HEADER_SUFFIX = ".hpp";
+ // File suffix for C Source files
+ public static final String C_FILE_SUFFIX = ".c";
+ // File suffix fr C Header files
+ public static final String C_HEADER_SUFFIX = ".h";
+
/* This type mapping only maps simple types the mapping for
complex types are done with in the type class */
private static Hashtable class2QNamemap = new Hashtable();
1.14 +7 -3 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
Index: ArrayParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ArrayParamWriter.java 5 Nov 2004 15:18:43 -0000 1.13
+++ ArrayParamWriter.java 9 Nov 2004 10:26:19 -0000 1.14
@@ -99,7 +99,10 @@
if (!CUtils.isSimpleType(qname))
{
writer.write(
- "#include \"" + attribs[0].getTypeName() + ".h\"\n\n");
+ "#include \""
+ + attribs[0].getTypeName()
+ + CUtils.C_HEADER_SUFFIX
+ + "\"\n\n");
}
else
{
@@ -149,7 +152,8 @@
}
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + ".h";
+ String fileName =
+ targetOutputLocation + "/" + classname + CUtils.C_HEADER_SUFFIX;
if (useServiceName)
{
@@ -159,7 +163,7 @@
+ this.wscontext.getSerInfo().getServicename()
+ "_"
+ classname
- + ".h";
+ + CUtils.C_HEADER_SUFFIX;
}
return new File(fileName);
1.8 +6 -4 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/CFileWriter.java
Index: CFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/CFileWriter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CFileWriter.java 8 Nov 2004 11:04:35 -0000 1.7
+++ CFileWriter.java 9 Nov 2004 10:26:19 -0000 1.8
@@ -27,6 +27,7 @@
import java.io.IOException;
import org.apache.axis.wsdl.wsdl2ws.BasicFileWriter;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
@@ -105,7 +106,8 @@
}
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + ".c";
+ String fileName =
+ targetOutputLocation + "/" + classname + CUtils.C_FILE_SUFFIX;
if (useServiceName)
{
@@ -116,13 +118,13 @@
+ serviceName
+ "_"
+ classname
- + ".c";
+ + CUtils.C_FILE_SUFFIX;
this.wscontext.addGeneratedFile(
- serviceName + "_" + classname + ".c");
+ serviceName + "_" + classname + CUtils.C_FILE_SUFFIX);
}
else
{
- this.wscontext.addGeneratedFile(classname + ".c");
+ this.wscontext.addGeneratedFile(classname + CUtils.C_FILE_SUFFIX);
}
return new File(fileName);
1.12 +109 -62 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClassLoader.java
Index: ClassLoader.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClassLoader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ClassLoader.java 8 Sep 2004 06:41:10 -0000 1.11
+++ ClassLoader.java 9 Nov 2004 10:26:19 -0000 1.12
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
@@ -36,66 +35,114 @@
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
-public class ClassLoader implements SourceWriter{
- private Writer writer;
- private WebServiceContext wscontext;
- private String classname;
- public ClassLoader(WebServiceContext wscontext) throws WrapperFault {
- this.wscontext = wscontext;
- this.classname = WrapperUtils.getClassNameFromFullyQualifiedName(wscontext.getSerInfo().getQualifiedServiceName());
- }
-
- public void writeSource() throws WrapperFault {
- String wrappername = classname + CUtils.WRAPPER_NAME_APPENDER;
- try{
- this.writer = new BufferedWriter(new FileWriter(getFilePath(), false));
- writer.write("/*\n");
- writer.write(" * This file was auto-generated by the Axis C++ Web Service Generator (WSDL2Ws)\n");
- writer.write(" * This file contains the two export functions of the Web service Dynamic Library \n");
- writer.write(" */\n\n");
- writer.write("#include <malloc.h>\n");
- writer.write("#include \""+wrappername+".h\"\n\n");
- writer.write("static BasicHandlerFunctions "+wrappername+"_functions = {\n");
- writer.write("\t"+wrappername+"_Invoke,\n");
- writer.write("\t"+wrappername+"_OnFault,\n");
- writer.write("\t"+wrappername+"_Init,\n");
- writer.write("\t"+wrappername+"_Fini,\n");
- writer.write("\t"+wrappername+"_GetType,\n");
- writer.write("\t"+wrappername+"_GetBindingStyle\n};\n");
- writer.write("STORAGE_CLASS_INFO\n");
- writer.write("int GetClassInstance(BasicHandler **inst){\n");
- writer.write("\t*inst = malloc(sizeof(BasicHandler));\n");
- writer.write("\t(*inst)->_object = 0; /* instantiate and provide the context object if needed */\n");
- writer.write("\t(*inst)->_functions = &"+wrappername+"_functions;\n");
- writer.write("\treturn (*inst)->_functions->init((*inst)->_object);\n");
- writer.write("}\n\n");
- writer.write("STORAGE_CLASS_INFO\n");
- writer.write("int DestroyInstance(BasicHandler *inst){\n");
- writer.write("\tif (inst){\n");
- writer.write("\t\tinst->_functions->fini(inst->_object);\n");
- writer.write("\t\t/* destroy the context object set to inst->_object if any here */\n");
- writer.write("\t\tfree(inst);\n");
- writer.write("\t\treturn AXIS_SUCCESS;\n");
- writer.write("\t}\n");
- writer.write("\treturn AXIS_FAIL;\n");
- writer.write("}\n");
- writer.flush();
- writer.close();
- if (WSDL2Ws.verbose)
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
- }catch(IOException e){
- throw new WrapperFault(e);
- }
- }
-
- protected File getFilePath() throws WrapperFault {
- String targetOutputLocation = this.wscontext.getWrapInfo().getTargetOutputLocation();
- if(targetOutputLocation.endsWith("/"))
- targetOutputLocation = targetOutputLocation.substring(0, targetOutputLocation.length() - 1);
- new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + CUtils.CLASS_LOADER_APPENDER + ".c";
- this.wscontext.addGeneratedFile(classname + CUtils.CLASS_LOADER_APPENDER + ".c");
- return new File(fileName);
- }
+public class ClassLoader implements SourceWriter
+{
+ private Writer writer;
+ private WebServiceContext wscontext;
+ private String classname;
+
+ /**
+ * @param wscontext
+ * @throws WrapperFault
+ */
+ public ClassLoader(WebServiceContext wscontext) throws WrapperFault
+ {
+ this.wscontext = wscontext;
+ this.classname =
+ WrapperUtils.getClassNameFromFullyQualifiedName(
+ wscontext.getSerInfo().getQualifiedServiceName());
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.wsdl.wsdl2ws.SourceWriter#writeSource()
+ */
+ public void writeSource() throws WrapperFault
+ {
+ String wrappername = classname + CUtils.WRAPPER_NAME_APPENDER;
+ try
+ {
+ this.writer =
+ new BufferedWriter(new FileWriter(getFilePath(), false));
+ writer.write("/*\n");
+ writer.write(
+ " * This file was auto-generated by the Axis C++ Web Service Generator (WSDL2Ws)\n");
+ writer.write(
+ " * This file contains the two export functions of the Web service Dynamic Library \n");
+ writer.write(" */\n\n");
+ writer.write("#include <malloc.h>\n");
+ writer.write(
+ "#include \""
+ + wrappername
+ + CUtils.C_HEADER_SUFFIX
+ + "\"\n\n");
+ writer.write(
+ "static BasicHandlerFunctions "
+ + wrappername
+ + "_functions = {\n");
+ writer.write("\t" + wrappername + "_Invoke,\n");
+ writer.write("\t" + wrappername + "_OnFault,\n");
+ writer.write("\t" + wrappername + "_Init,\n");
+ writer.write("\t" + wrappername + "_Fini,\n");
+ writer.write("\t" + wrappername + "_GetType,\n");
+ writer.write("\t" + wrappername + "_GetBindingStyle\n};\n");
+ writer.write("STORAGE_CLASS_INFO\n");
+ writer.write("int GetClassInstance(BasicHandler **inst){\n");
+ writer.write("\t*inst = malloc(sizeof(BasicHandler));\n");
+ writer.write(
+ "\t(*inst)->_object = 0; /* instantiate and provide the context object if needed */\n");
+ writer.write(
+ "\t(*inst)->_functions = &" + wrappername + "_functions;\n");
+ writer.write(
+ "\treturn (*inst)->_functions->init((*inst)->_object);\n");
+ writer.write("}\n\n");
+ writer.write("STORAGE_CLASS_INFO\n");
+ writer.write("int DestroyInstance(BasicHandler *inst){\n");
+ writer.write("\tif (inst){\n");
+ writer.write("\t\tinst->_functions->fini(inst->_object);\n");
+ writer.write(
+ "\t\t/* destroy the context object set to inst->_object if any here */\n");
+ writer.write("\t\tfree(inst);\n");
+ writer.write("\t\treturn AXIS_SUCCESS;\n");
+ writer.write("\t}\n");
+ writer.write("\treturn AXIS_FAIL;\n");
+ writer.write("}\n");
+ writer.flush();
+ writer.close();
+ if (WSDL2Ws.verbose)
+ System.out.println(
+ getFilePath().getAbsolutePath() + " created.....");
+ }
+ catch (IOException e)
+ {
+ throw new WrapperFault(e);
+ }
+ }
+
+ /**
+ * @return
+ * @throws WrapperFault
+ */
+ protected File getFilePath() throws WrapperFault
+ {
+ String targetOutputLocation =
+ this.wscontext.getWrapInfo().getTargetOutputLocation();
+ if (targetOutputLocation.endsWith("/"))
+ {
+ targetOutputLocation =
+ targetOutputLocation.substring(
+ 0,
+ targetOutputLocation.length() - 1);
+ }
+ new File(targetOutputLocation).mkdirs();
+ String fileName =
+ targetOutputLocation
+ + "/"
+ + classname
+ + CUtils.CLASS_LOADER_APPENDER
+ + CUtils.C_FILE_SUFFIX;
+ this.wscontext.addGeneratedFile(
+ classname + CUtils.CLASS_LOADER_APPENDER + CUtils.C_FILE_SUFFIX);
+ return new File(fileName);
+ }
}
1.21 +2 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java
Index: ClientStubHeaderWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ClientStubHeaderWriter.java 8 Nov 2004 11:04:35 -0000 1.20
+++ ClientStubHeaderWriter.java 9 Nov 2004 10:26:19 -0000 1.21
@@ -26,6 +26,7 @@
import java.util.HashSet;
import java.util.Iterator;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
@@ -206,7 +207,7 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + ".h\"\n");
+ writer.write("#include \"" + itr.next().toString() + CUtils.C_HEADER_SUFFIX+"\"\n");
}
writer.write("\n");
}
1.28 +2 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java
Index: ClientStubWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ClientStubWriter.java 8 Nov 2004 11:04:35 -0000 1.27
+++ ClientStubWriter.java 9 Nov 2004 10:26:19 -0000 1.28
@@ -133,7 +133,8 @@
{
try
{
- writer.write("#include \"" + classname + ".h\"\n\n");
+ writer.write(
+ "#include \"" + classname + CUtils.C_HEADER_SUFFIX + "\"\n\n");
}
catch (IOException e)
{
1.12 +9 -3 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java
Index: ParamCFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ParamCFileWriter.java 5 Nov 2004 15:57:05 -0000 1.11
+++ ParamCFileWriter.java 9 Nov 2004 10:26:19 -0000 1.12
@@ -27,6 +27,7 @@
import java.io.FileWriter;
import java.io.IOException;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
@@ -100,8 +101,9 @@
targetOutputLocation.length() - 1);
}
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + this.classname + ".c";
- this.wscontext.addGeneratedFile(classname + ".c");
+ String fileName =
+ targetOutputLocation + "/" + this.classname + CUtils.C_FILE_SUFFIX;
+ this.wscontext.addGeneratedFile(classname + CUtils.C_FILE_SUFFIX);
return new File(fileName);
}
@@ -113,7 +115,11 @@
try
{
writer.write("#include <malloc.h>\n");
- writer.write("#include \"" + this.classname + ".h\"\n");
+ writer.write(
+ "#include \""
+ + this.classname
+ + CUtils.C_HEADER_SUFFIX
+ + "\"\n");
writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
}
catch (IOException e)
1.18 +9 -3 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java
Index: ParmHeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ParmHeaderFileWriter.java 5 Nov 2004 15:57:05 -0000 1.17
+++ ParmHeaderFileWriter.java 9 Nov 2004 10:26:19 -0000 1.18
@@ -29,6 +29,7 @@
import java.util.HashSet;
import java.util.Iterator;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
@@ -159,7 +160,8 @@
targetOutputLocation.length() - 1);
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + ".h";
+ String fileName =
+ targetOutputLocation + "/" + classname + CUtils.C_HEADER_SUFFIX;
if (useServiceName)
{
@@ -169,7 +171,7 @@
+ this.wscontext.getSerInfo().getServicename()
+ "_"
+ classname
- + ".h";
+ + CUtils.C_HEADER_SUFFIX;
}
return new File(fileName);
@@ -203,7 +205,11 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + ".h\"\n");
+ writer.write(
+ "#include \""
+ + itr.next().toString()
+ + CUtils.C_HEADER_SUFFIX
+ + "\"\n");
}
writer.write("/*Local name and the URI for the type*/\n");
writer.write(
1.18 +6 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ServiceWriter.java
Index: ServiceWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ServiceWriter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ServiceWriter.java 8 Nov 2004 11:04:35 -0000 1.17
+++ ServiceWriter.java 9 Nov 2004 10:26:19 -0000 1.18
@@ -26,6 +26,7 @@
import java.util.HashSet;
import java.util.Iterator;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
@@ -184,7 +185,11 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + ".h\"\n");
+ writer.write(
+ "#include \""
+ + itr.next().toString()
+ + CUtils.C_HEADER_SUFFIX
+ + "\"\n");
}
writer.write("\n");
}
1.32 +7 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/WrapWriter.java
Index: WrapWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/WrapWriter.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- WrapWriter.java 8 Nov 2004 11:04:36 -0000 1.31
+++ WrapWriter.java 9 Nov 2004 10:26:19 -0000 1.32
@@ -134,7 +134,8 @@
try
{
writer.write("#include <string.h>\n");
- writer.write("#include \"" + classname + ".h\"\n");
+ writer.write(
+ "#include \"" + classname + CUtils.C_HEADER_SUFFIX + "\"\n");
//As there is no service header file for C the header files for types should be included here itself
Type atype;
Iterator types = this.wscontext.getTypemap().getTypes().iterator();
@@ -144,7 +145,11 @@
atype = (Type) types.next();
LangTypeName = WrapperUtils.getLanguageTypeName4Type(atype);
if (null != LangTypeName)
- writer.write("#include \"" + LangTypeName + ".h\"\n");
+ writer.write(
+ "#include \""
+ + LangTypeName
+ + CUtils.C_HEADER_SUFFIX
+ + "\"\n");
}
writer.write("\n");
}
1.19 +6 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java
Index: ClientStubHeaderWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ClientStubHeaderWriter.java 8 Nov 2004 11:04:37 -0000 1.18
+++ ClientStubHeaderWriter.java 9 Nov 2004 10:26:20 -0000 1.19
@@ -23,6 +23,7 @@
import java.util.Iterator;
import java.util.Vector;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
@@ -67,7 +68,11 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + ".h\"\n");
+ writer.write(
+ "#include \""
+ + itr.next().toString()
+ + CUtils.C_HEADER_SUFFIX
+ + "\"\n");
}
writer.write("\n");
}
1.13 +6 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ParamCFileWriter.java
Index: ParamCFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ParamCFileWriter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ParamCFileWriter.java 5 Nov 2004 15:57:05 -0000 1.12
+++ ParamCFileWriter.java 9 Nov 2004 10:26:20 -0000 1.13
@@ -26,6 +26,7 @@
import java.io.FileWriter;
import java.io.IOException;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
@@ -96,7 +97,11 @@
writer.write("#include <malloc.h>\n");
writer.write("#include <memory.h>\n");
writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
- writer.write("#include \"" + this.classname + ".h\"\n");
+ writer.write(
+ "#include \""
+ + this.classname
+ + CUtils.C_HEADER_SUFFIX
+ + "\"\n");
}
catch (IOException e)
{
1.20 +5 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ParmHeaderFileWriter.java
Index: ParmHeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ParmHeaderFileWriter.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ParmHeaderFileWriter.java 5 Nov 2004 15:57:05 -0000 1.19
+++ ParmHeaderFileWriter.java 9 Nov 2004 10:26:20 -0000 1.20
@@ -288,7 +288,11 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + ".h\"\n");
+ writer.write(
+ "#include \""
+ + itr.next().toString()
+ + CUtils.C_HEADER_SUFFIX
+ + "\"\n");
}
writer.write("/*Local name and the URI for the type*/\n");
writer.write(
1.14 +6 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ServiceWriter.java
Index: ServiceWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ServiceWriter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ServiceWriter.java 5 Nov 2004 15:57:05 -0000 1.13
+++ ServiceWriter.java 9 Nov 2004 10:26:20 -0000 1.14
@@ -25,6 +25,7 @@
import java.util.HashSet;
import java.util.Iterator;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
@@ -61,7 +62,11 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + ".h\"\n");
+ writer.write(
+ "#include \""
+ + itr.next().toString()
+ + CUtils.C_HEADER_SUFFIX
+ + "\"\n");
}
writer.write("\n");
}
1.23 +6 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/WrapWriter.java
Index: WrapWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/WrapWriter.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- WrapWriter.java 5 Nov 2004 15:57:05 -0000 1.22
+++ WrapWriter.java 9 Nov 2004 10:26:20 -0000 1.23
@@ -56,7 +56,8 @@
{
try
{
- writer.write("#include \"" + classname + ".h\"\n");
+ writer.write(
+ "#include \"" + classname + CUtils.C_HEADER_SUFFIX + "\"\n");
//As there is no service header file for C the header files for types should be included here itself
Type atype;
Iterator types = this.wscontext.getTypemap().getTypes().iterator();
@@ -66,7 +67,10 @@
if (atype.getLanguageSpecificName().startsWith(">"))
continue;
writer.write(
- "#include \"" + atype.getLanguageSpecificName() + ".h\"\n");
+ "#include \""
+ + atype.getLanguageSpecificName()
+ + CUtils.C_HEADER_SUFFIX
+ + "\"\n");
}
writer.write("\n");
}
1.18 +3 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java
Index: ArrayParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ArrayParamWriter.java 4 Nov 2004 14:06:23 -0000 1.17
+++ ArrayParamWriter.java 9 Nov 2004 10:26:20 -0000 1.18
@@ -134,7 +134,8 @@
}
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + ".h";
+ String fileName =
+ targetOutputLocation + "/" + classname + CUtils.CPP_HEADER_SUFFIX;
if (useServiceName)
{
@@ -144,7 +145,7 @@
+ this.wscontext.getSerInfo().getServicename()
+ "_"
+ classname
- + ".h";
+ + CUtils.CPP_HEADER_SUFFIX;
}
return new File(fileName);
1.8 +5 -4 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/CPPClassWriter.java
Index: CPPClassWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/CPPClassWriter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CPPClassWriter.java 5 Nov 2004 11:03:49 -0000 1.7
+++ CPPClassWriter.java 9 Nov 2004 10:26:20 -0000 1.8
@@ -28,6 +28,7 @@
import java.io.IOException;
import org.apache.axis.wsdl.wsdl2ws.BasicFileWriter;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
@@ -90,7 +91,7 @@
targetOutputLocation.length() - 1);
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + ".cpp";
+ String fileName = targetOutputLocation + "/" + classname + CUtils.CPP_CLASS_SUFFIX;
if (useServiceName)
{
@@ -101,13 +102,13 @@
+ serviceName
+ "_"
+ classname
- + ".cpp";
+ + CUtils.CPP_CLASS_SUFFIX;
this.wscontext.addGeneratedFile(
- serviceName + "_" + classname + ".cpp");
+ serviceName + "_" + classname + CUtils.CPP_CLASS_SUFFIX);
}
else
{
- this.wscontext.addGeneratedFile(classname + ".cpp");
+ this.wscontext.addGeneratedFile(classname + CUtils.CPP_CLASS_SUFFIX);
}
return new File(fileName);
1.15 +9 -3 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClassLoader.java
Index: ClassLoader.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClassLoader.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ClassLoader.java 26 Oct 2004 10:51:47 -0000 1.14
+++ ClassLoader.java 9 Nov 2004 10:26:20 -0000 1.15
@@ -61,7 +61,11 @@
writer.write(
" * This file contains the two export functions of the Web service Dynamic Library \n");
writer.write(" */\n\n");
- writer.write("#include \"" + wrappername + ".h\" \n");
+ writer.write(
+ "#include \""
+ + wrappername
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\" \n");
writer.write("extern \"C\" {\n");
writer.write("STORAGE_CLASS_INFO\n");
writer.write("int GetClassInstance(BasicHandler **inst)\n");
@@ -109,19 +113,21 @@
String targetOutputLocation =
this.wscontext.getWrapInfo().getTargetOutputLocation();
if (targetOutputLocation.endsWith("/"))
+ {
targetOutputLocation =
targetOutputLocation.substring(
0,
targetOutputLocation.length() - 1);
+ }
new File(targetOutputLocation).mkdirs();
String fileName =
targetOutputLocation
+ "/"
+ classname
+ CUtils.CLASS_LOADER_APPENDER
- + ".cpp";
+ + CUtils.CPP_CLASS_SUFFIX;
this.wscontext.addGeneratedFile(
- classname + CUtils.CLASS_LOADER_APPENDER + ".cpp");
+ classname + CUtils.CLASS_LOADER_APPENDER + CUtils.CPP_CLASS_SUFFIX);
return new File(fileName);
}
1.31 +12 -3 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java
Index: ClientStubHeaderWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ClientStubHeaderWriter.java 5 Nov 2004 09:44:20 -0000 1.30
+++ ClientStubHeaderWriter.java 9 Nov 2004 10:26:20 -0000 1.31
@@ -26,6 +26,7 @@
import java.util.HashSet;
import java.util.Iterator;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.FaultInfo;
@@ -212,7 +213,9 @@
writer.write(
"#include \""
+ wscontext.getSerInfo().getServicename()
- + "_AxisClientException.h\"\n");
+ + "_AxisClientException"
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n");
writer.write("#include <axis/ISoapFault.hpp>\n");
Type atype;
Iterator types = this.wscontext.getTypemap().getTypes().iterator();
@@ -234,7 +237,11 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + ".h\"\n");
+ writer.write(
+ "#include \""
+ + itr.next().toString()
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n");
}
//Method to print the Fault Exception headers
//writeFaultHeaders();
@@ -268,7 +275,9 @@
writer.write(
"#include \"Axis"
+ faultInfoName.toString()
- + "Exception.h\"\n");
+ + "Exception"
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n");
}
writer.write("\n");
}
1.63 +7 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
Index: ClientStubWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ClientStubWriter.java 5 Nov 2004 11:03:49 -0000 1.62
+++ ClientStubWriter.java 9 Nov 2004 10:26:20 -0000 1.63
@@ -161,11 +161,16 @@
+ getServiceName()
+ "_"
+ classname
- + ".h\"\n\n");
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n\n");
}
else
{
- writer.write("#include \"" + classname + ".h\"\n\n");
+ writer.write(
+ "#include \""
+ + classname
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n\n");
}
writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
writer.write("using namespace std;\n\n ");
1.14 +12 -3 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionHeaderWriter.java
Index: ExceptionHeaderWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionHeaderWriter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ExceptionHeaderWriter.java 4 Nov 2004 16:22:34 -0000 1.13
+++ ExceptionHeaderWriter.java 9 Nov 2004 10:26:20 -0000 1.14
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.Iterator;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.info.FaultInfo;
@@ -68,7 +69,11 @@
}
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + faultInfoName + ".h";
+ String fileName =
+ targetOutputLocation
+ + "/"
+ + faultInfoName
+ + CUtils.CPP_HEADER_SUFFIX;
if (useServiceName)
{
@@ -78,7 +83,7 @@
+ this.wscontext.getSerInfo().getServicename()
+ "_"
+ faultInfoName
- + ".h";
+ + CUtils.CPP_HEADER_SUFFIX;
}
return new File(fileName);
@@ -233,7 +238,11 @@
{
ParameterInfo par = (ParameterInfo) paramInfo.get(j);
langName = par.getLangName();
- writer.write("#include \"" + langName + ".h\"\n\n");
+ writer.write(
+ "#include \""
+ + langName
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n\n");
}
}
}
1.13 +20 -6 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java
Index: ExceptionWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ExceptionWriter.java 5 Nov 2004 12:04:43 -0000 1.12
+++ ExceptionWriter.java 9 Nov 2004 10:26:20 -0000 1.13
@@ -24,6 +24,7 @@
import java.io.IOException;
import org.apache.axis.wsdl.wsdl2ws.BasicFileWriter;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
@@ -74,7 +75,11 @@
}
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + faultInfoName + ".cpp";
+ String fileName =
+ targetOutputLocation
+ + "/"
+ + faultInfoName
+ + CUtils.CPP_CLASS_SUFFIX;
if (useServiceName)
{
@@ -84,14 +89,18 @@
+ this.getServiceName()
+ "_"
+ faultInfoName
- + ".cpp";
+ + CUtils.CPP_CLASS_SUFFIX;
this.wscontext.addGeneratedFile(
- this.getServiceName() + "_" + faultInfoName + ".cpp");
+ this.getServiceName()
+ + "_"
+ + faultInfoName
+ + CUtils.CPP_CLASS_SUFFIX);
}
else
{
- this.wscontext.addGeneratedFile(faultInfoName + ".cpp");
+ this.wscontext.addGeneratedFile(
+ faultInfoName + CUtils.CPP_CLASS_SUFFIX);
}
return new File(fileName);
}
@@ -115,11 +124,16 @@
+ getServiceName()
+ "_"
+ faultInfoName
- + ".h\"\n\n");
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n\n");
}
else
{
- writer.write("#include \"" + faultInfoName + ".h\"\n\n");
+ writer.write(
+ "#include \""
+ + faultInfoName
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n\n");
}
writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
}
1.14 +4 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/HeaderFileWriter.java
Index: HeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/HeaderFileWriter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- HeaderFileWriter.java 4 Nov 2004 16:22:34 -0000 1.13
+++ HeaderFileWriter.java 9 Nov 2004 10:26:20 -0000 1.14
@@ -27,6 +27,7 @@
import java.io.FileWriter;
import java.io.IOException;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.BasicFileWriter;
import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
@@ -130,7 +131,8 @@
}
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + ".h";
+ String fileName =
+ targetOutputLocation + "/" + classname + CUtils.CPP_HEADER_SUFFIX;
if (useServiceName)
{
@@ -140,7 +142,7 @@
+ this.getServiceName()
+ "_"
+ classname
- + ".h";
+ + CUtils.CPP_HEADER_SUFFIX;
}
return new File(fileName);
1.15 +12 -5 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java
Index: ParamCPPFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ParamCPPFileWriter.java 4 Nov 2004 14:06:23 -0000 1.14
+++ ParamCPPFileWriter.java 9 Nov 2004 10:26:20 -0000 1.15
@@ -27,6 +27,7 @@
import java.io.FileWriter;
import java.io.IOException;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
@@ -92,7 +93,8 @@
targetOutputLocation.length() - 1);
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + ".cpp";
+ String fileName =
+ targetOutputLocation + "/" + classname + CUtils.CPP_CLASS_SUFFIX;
if (useServiceName)
{
@@ -103,13 +105,14 @@
+ serviceName
+ "_"
+ classname
- + ".cpp";
+ + CUtils.CPP_CLASS_SUFFIX;
this.wscontext.addGeneratedFile(
- serviceName + "_" + classname + ".cpp");
+ serviceName + "_" + classname + CUtils.CPP_CLASS_SUFFIX);
}
else
{
- this.wscontext.addGeneratedFile(classname + ".cpp");
+ this.wscontext.addGeneratedFile(
+ classname + CUtils.CPP_CLASS_SUFFIX);
}
return new File(fileName);
@@ -119,7 +122,11 @@
{
try
{
- writer.write("#include \"" + this.classname + ".h\"\n");
+ writer.write(
+ "#include \""
+ + this.classname
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n");
writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
}
catch (IOException e)
1.24 +9 -3 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java
Index: ParmHeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ParmHeaderFileWriter.java 4 Nov 2004 14:06:23 -0000 1.23
+++ ParmHeaderFileWriter.java 9 Nov 2004 10:26:20 -0000 1.24
@@ -29,6 +29,7 @@
import java.util.HashSet;
import java.util.Iterator;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
@@ -162,7 +163,8 @@
}
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + ".h";
+ String fileName =
+ targetOutputLocation + "/" + classname + CUtils.CPP_HEADER_SUFFIX;
if (useServiceName)
{
@@ -172,7 +174,7 @@
+ this.wscontext.getSerInfo().getServicename()
+ "_"
+ classname
- + ".h";
+ + CUtils.CPP_HEADER_SUFFIX;
}
return new File(fileName);
@@ -203,7 +205,11 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + ".h\"\n");
+ writer.write(
+ "#include \""
+ + itr.next().toString()
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n");
}
//Local name and the URI for the type
1.30 +11 -3 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java
Index: ServiceHeaderWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ServiceHeaderWriter.java 4 Nov 2004 16:22:34 -0000 1.29
+++ ServiceHeaderWriter.java 9 Nov 2004 10:26:20 -0000 1.30
@@ -26,6 +26,7 @@
import java.util.HashSet;
import java.util.Iterator;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.FaultInfo;
@@ -59,7 +60,8 @@
writer.write(
" * "
+ classname
- + ".h: interface for the "
+ + CUtils.CPP_HEADER_SUFFIX
+ + ": interface for the "
+ classname
+ "class.\n");
writer.write(" *\n");
@@ -230,7 +232,11 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + ".h\"\n");
+ writer.write(
+ "#include \""
+ + itr.next().toString()
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n");
}
//writeFaultHeaders();
writer.write("\n");
@@ -263,7 +269,9 @@
writer.write(
"#include \"Axis"
+ faultInfoName.toString()
- + "Exception.h\"\n");
+ + "Exception"
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n");
}
}
writer.write("\n");
1.21 +6 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java
Index: ServiceWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ServiceWriter.java 5 Nov 2004 11:03:49 -0000 1.20
+++ ServiceWriter.java 9 Nov 2004 10:26:20 -0000 1.21
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.Iterator;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
@@ -209,7 +210,11 @@
{
try
{
- writer.write("#include \"" + classname + ".h\"\n\n");
+ writer.write(
+ "#include \""
+ + classname
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n\n");
}
catch (IOException e)
{
1.25 +9 -4 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java
Index: WrapHeaderWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- WrapHeaderWriter.java 4 Nov 2004 17:01:03 -0000 1.24
+++ WrapHeaderWriter.java 9 Nov 2004 10:26:20 -0000 1.25
@@ -34,7 +34,7 @@
public class WrapHeaderWriter extends HeaderFileWriter
{
- protected String bindingStyle;
+ protected String bindingStyle;
protected ArrayList methods;
public WrapHeaderWriter(WebServiceContext wscontext) throws WrapperFault
{
@@ -108,7 +108,9 @@
writer.write("\tint AXISCALL init();\n");
writer.write("\tint AXISCALL fini();\n");
writer.write(
- "\tAXIS_BINDING_STYLE AXISCALL getBindingStyle(){return "+bindingStyle+";};\n");
+ "\tAXIS_BINDING_STYLE AXISCALL getBindingStyle(){return "
+ + bindingStyle
+ + ";};\n");
writer.write(
"private:/*Methods corresponding to the web service methods*/\n");
MethodInfo minfo;
@@ -137,7 +139,8 @@
writer.write(
"#include \""
+ CUtils.getWebServiceNameFromWrapperName(classname)
- + ".h\"\n");
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n");
writer.write("#include <axis/server/WrapperClassHandler.hpp>\n");
writer.write("#include <axis/server/IMessageData.hpp>\n");
writer.write("#include <axis/server/GDefine.hpp>\n");
@@ -173,7 +176,9 @@
writer.write(
"#include \"Axis"
+ faultInfoName.toString()
- + "Exception.h\"\n");
+ + "Exception"
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n");
}
}
writer.write("\n");
1.36 +5 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java
Index: WrapWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- WrapWriter.java 5 Nov 2004 11:03:49 -0000 1.35
+++ WrapWriter.java 9 Nov 2004 10:26:20 -0000 1.36
@@ -153,7 +153,11 @@
{
try
{
- writer.write("#include \"" + classname + ".h\"\n\n");
+ writer.write(
+ "#include \""
+ + classname
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n\n");
}
catch (IOException e)
{
1.13 +6 -3 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/AllParamWriter.java
Index: AllParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/AllParamWriter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AllParamWriter.java 28 Oct 2004 14:14:53 -0000 1.12
+++ AllParamWriter.java 9 Nov 2004 10:26:21 -0000 1.13
@@ -60,7 +60,8 @@
targetOutputLocation.length() - 1);
}
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + filename + ".h";
+ String fileName =
+ targetOutputLocation + "/" + filename + CUtils.CPP_HEADER_SUFFIX;
return new File(fileName);
}
@@ -122,7 +123,8 @@
System.out.println(
"Creating an empty "
+ qname.getLocalPart()
- + ".h file\n");
+ + CUtils.CPP_HEADER_SUFFIX
+ + " file\n");
BufferedWriter bw = null;
@@ -137,7 +139,8 @@
bw.write(
"// Header file for "
+ qname.getLocalPart()
- + ".h\n");
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\n");
bw.flush();
bw.close();
}
1.26 +9 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java
Index: ClientStubHeaderWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ClientStubHeaderWriter.java 4 Nov 2004 16:22:35 -0000 1.25
+++ ClientStubHeaderWriter.java 9 Nov 2004 10:26:21 -0000 1.26
@@ -31,6 +31,7 @@
import java.util.HashSet;
import java.util.Iterator;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
@@ -163,7 +164,9 @@
writer.write(
"#include \""
+ wscontext.getSerInfo().getServicename()
- + "_AxisClientException.h\"\n");
+ + "_AxisClientException"
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n");
Type atype;
Iterator types = this.wscontext.getTypemap().getTypes().iterator();
HashSet typeSet = new HashSet();
@@ -199,7 +202,11 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + ".h\"\n");
+ writer.write(
+ "#include \""
+ + itr.next().toString()
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n");
}
// Method to print the Fault Exception headers
//writeFaultHeaders();
1.55 +9 -3 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
Index: ClientStubWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ClientStubWriter.java 5 Nov 2004 11:03:49 -0000 1.54
+++ ClientStubWriter.java 9 Nov 2004 10:26:21 -0000 1.55
@@ -44,7 +44,8 @@
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
-public class ClientStubWriter extends org.apache.axis.wsdl.wsdl2ws.cpp.ClientStubWriter
+public class ClientStubWriter
+ extends org.apache.axis.wsdl.wsdl2ws.cpp.ClientStubWriter
{
public ClientStubWriter(WebServiceContext wscontext) throws WrapperFault
{
@@ -147,11 +148,16 @@
+ getServiceName()
+ "_"
+ classname
- + ".h\"\n\n");
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n\n");
}
else
{
- writer.write("#include \"" + classname + ".h\"\n\n");
+ writer.write(
+ "#include \""
+ + classname
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n\n");
}
writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
}
1.17 +88 -56 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParamCPPFileWriter.java
Index: ParamCPPFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParamCPPFileWriter.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ParamCPPFileWriter.java 4 Nov 2004 14:06:24 -0000 1.16
+++ ParamCPPFileWriter.java 9 Nov 2004 10:26:21 -0000 1.17
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
@@ -28,65 +27,98 @@
import java.io.FileWriter;
import java.io.IOException;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
-public abstract class ParamCPPFileWriter extends ParamWriter{
- public ParamCPPFileWriter(WebServiceContext wscontext,Type type)throws WrapperFault{
- super(wscontext,type);
- }
-
- protected void writeConstructors()throws WrapperFault{}
- protected void writeDestructors() throws WrapperFault {}
- protected abstract void writeRestrictionCheckerFunction() throws WrapperFault;
-
- public void writeSource()throws WrapperFault{
- try{
- this.writer = new BufferedWriter(new FileWriter(getFilePath(), false));
- writeClassComment();
- writePreprocessorStatements();
- if (type.isSimpleType()){
- writeRestrictionCheckerFunction();
- }
- else{
- writeGlobalCodes();
- writeAttributes();
- writeConstructors();
- writeDestructors();
- writeMethods();
- }
- writer.flush();
- writer.close();
- if (WSDL2Ws.verbose)
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
- } catch (IOException e) {
- e.printStackTrace();
- throw new WrapperFault(e);
- }
- }
-
- protected void writeMethods()throws WrapperFault{}
- protected abstract void writeGlobalCodes()throws WrapperFault;
- protected File getFilePath() throws WrapperFault {
- String targetOutputLocation = this.wscontext.getWrapInfo().getTargetOutputLocation();
- if(targetOutputLocation.endsWith("/"))
- targetOutputLocation = targetOutputLocation.substring(0, targetOutputLocation.length() - 1);
- new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + this.classname + ".cpp";
- this.wscontext.addGeneratedFile(classname + ".cpp");
- return new File(fileName);
- }
-
- protected void writePreprocessorStatements()throws WrapperFault{
- try {
- writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
- writer.write("#include \""+this.classname + ".h\"\n");
- } catch (IOException e) {
- e.printStackTrace();
- throw new WrapperFault(e);
- }
- }
+public abstract class ParamCPPFileWriter extends ParamWriter
+{
+ public ParamCPPFileWriter(WebServiceContext wscontext, Type type)
+ throws WrapperFault
+ {
+ super(wscontext, type);
+ }
+
+ protected void writeConstructors() throws WrapperFault
+ {}
+ protected void writeDestructors() throws WrapperFault
+ {}
+ protected abstract void writeRestrictionCheckerFunction()
+ throws WrapperFault;
+
+ public void writeSource() throws WrapperFault
+ {
+ try
+ {
+ this.writer =
+ new BufferedWriter(new FileWriter(getFilePath(), false));
+ writeClassComment();
+ writePreprocessorStatements();
+ if (type.isSimpleType())
+ {
+ writeRestrictionCheckerFunction();
+ }
+ else
+ {
+ writeGlobalCodes();
+ writeAttributes();
+ writeConstructors();
+ writeDestructors();
+ writeMethods();
+ }
+ writer.flush();
+ writer.close();
+ if (WSDL2Ws.verbose)
+ System.out.println(
+ getFilePath().getAbsolutePath() + " created.....");
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ throw new WrapperFault(e);
+ }
+ }
+
+ protected void writeMethods() throws WrapperFault
+ {}
+ protected abstract void writeGlobalCodes() throws WrapperFault;
+ protected File getFilePath() throws WrapperFault
+ {
+ String targetOutputLocation =
+ this.wscontext.getWrapInfo().getTargetOutputLocation();
+ if (targetOutputLocation.endsWith("/"))
+ targetOutputLocation =
+ targetOutputLocation.substring(
+ 0,
+ targetOutputLocation.length() - 1);
+ new File(targetOutputLocation).mkdirs();
+ String fileName =
+ targetOutputLocation
+ + "/"
+ + this.classname
+ + CUtils.CPP_CLASS_SUFFIX;
+ this.wscontext.addGeneratedFile(classname + CUtils.CPP_CLASS_SUFFIX);
+ return new File(fileName);
+ }
+
+ protected void writePreprocessorStatements() throws WrapperFault
+ {
+ try
+ {
+ writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
+ writer.write(
+ "#include \""
+ + this.classname
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n");
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ throw new WrapperFault(e);
+ }
+ }
}
1.26 +9 -4 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java
Index: ParmHeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ParmHeaderFileWriter.java 4 Nov 2004 16:22:35 -0000 1.25
+++ ParmHeaderFileWriter.java 9 Nov 2004 10:26:21 -0000 1.26
@@ -357,7 +357,7 @@
{
return this.getFilePath(false);
}
-
+
protected File getFilePath(boolean useServiceName) throws WrapperFault
{
String targetOutputLocation =
@@ -371,7 +371,8 @@
}
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + ".h";
+ String fileName =
+ targetOutputLocation + "/" + classname + CUtils.CPP_HEADER_SUFFIX;
if (useServiceName)
{
@@ -381,7 +382,7 @@
+ this.wscontext.getSerInfo().getServicename()
+ "_"
+ classname
- + ".h";
+ + CUtils.CPP_HEADER_SUFFIX;
}
return new File(fileName);
@@ -410,7 +411,11 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + ".h\"\n");
+ writer.write(
+ "#include \""
+ + itr.next().toString()
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n");
}
//Local name and the URI for the type
1.20 +6 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ServiceHeaderWriter.java
Index: ServiceHeaderWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ServiceHeaderWriter.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ServiceHeaderWriter.java 4 Nov 2004 16:22:35 -0000 1.19
+++ ServiceHeaderWriter.java 9 Nov 2004 10:26:21 -0000 1.20
@@ -25,6 +25,7 @@
import java.util.HashSet;
import java.util.Iterator;
+import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
@@ -87,7 +88,11 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + ".h\"\n");
+ writer.write(
+ "#include \""
+ + itr.next().toString()
+ + CUtils.CPP_HEADER_SUFFIX
+ + "\"\n");
}
//writeFaultHeaders();
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/AxisBenchClient.cpp
Index: AxisBenchClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/AxisBenchClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AxisBenchClient.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ AxisBenchClient.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -1,4 +1,4 @@
-#include "AxisBench.h"
+#include "AxisBench.hpp"
#include <iostream>
#include <fstream>
#include <time.h>
1.6 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/CalculatorClient.cpp
Index: CalculatorClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/CalculatorClient.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CalculatorClient.cpp 28 Oct 2004 09:51:40 -0000 1.5
+++ CalculatorClient.cpp 9 Nov 2004 10:26:21 -0000 1.6
@@ -1,4 +1,4 @@
-#include "Calculator.h"
+#include "Calculator.hpp"
#include <axis/AxisGenException.hpp>
#include <ctype.h>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/CalculatorDocClient.cpp
Index: CalculatorDocClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/CalculatorDocClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CalculatorDocClient.cpp 28 Oct 2004 09:51:40 -0000 1.3
+++ CalculatorDocClient.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -1,4 +1,4 @@
-#include "Calculator.h"
+#include "Calculator.hpp"
#include <axis/AxisGenException.hpp>
#include <ctype.h>
1.5 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/ComplexTypeAllClient.cpp
Index: ComplexTypeAllClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/ComplexTypeAllClient.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ComplexTypeAllClient.cpp 5 Nov 2004 09:47:10 -0000 1.4
+++ ComplexTypeAllClient.cpp 9 Nov 2004 10:26:21 -0000 1.5
@@ -1,5 +1,5 @@
#include <axis/server/AxisException.hpp>
-#include "operations.h"
+#include "operations.hpp"
#include <stdlib.h> // For malloc(), calloc(), strdup() and free()
#include <iostream>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/EnumerationClient.cpp
Index: EnumerationClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/EnumerationClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EnumerationClient.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ EnumerationClient.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -1,5 +1,5 @@
-#include "EnumerationWS.h"
+#include "EnumerationWS.hpp"
#include <stdlib.h> // For malloc(), calloc(), strdup() and free()
#include <iostream>
#include <fstream>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/ExceptionTestClient.cpp
Index: ExceptionTestClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/ExceptionTestClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExceptionTestClient.cpp 28 Oct 2004 09:51:40 -0000 1.3
+++ ExceptionTestClient.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -1,4 +1,4 @@
-#include "MathOps.h"
+#include "MathOps.hpp"
#include <axis/server/AxisException.hpp>
#include <ctype.h>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/ExceptionTestDocClient.cpp
Index: ExceptionTestDocClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/ExceptionTestDocClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExceptionTestDocClient.cpp 28 Oct 2004 09:51:40 -0000 1.3
+++ ExceptionTestDocClient.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -1,4 +1,4 @@
-#include "MathOps.h"
+#include "MathOps.hpp"
#include <axis/server/AxisException.hpp>
#include <ctype.h>
1.3 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/ExtensibilityQueryClient.cpp
Index: ExtensibilityQueryClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/ExtensibilityQueryClient.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExtensibilityQueryClient.cpp 30 Aug 2004 07:19:22 -0000 1.2
+++ ExtensibilityQueryClient.cpp 9 Nov 2004 10:26:21 -0000 1.3
@@ -1,4 +1,4 @@
-#include "ExtensibilityQueryPortType.h"
+#include "ExtensibilityQueryPortType.hpp"
int main(int argc, char* argv[])
{
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/FaultMappingClient.cpp
Index: FaultMappingClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/FaultMappingClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FaultMappingClient.cpp 28 Oct 2004 09:51:40 -0000 1.3
+++ FaultMappingClient.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -1,4 +1,4 @@
-#include "MathOps.h"
+#include "MathOps.hpp"
#include <axis/server/AxisException.hpp>
#include <ctype.h>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/FaultMappingDocClient.cpp
Index: FaultMappingDocClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/FaultMappingDocClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FaultMappingDocClient.cpp 28 Oct 2004 09:51:40 -0000 1.3
+++ FaultMappingDocClient.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -1,4 +1,4 @@
-#include "MathOps.h"
+#include "MathOps.hpp"
#include <axis/server/AxisException.hpp>
#include <ctype.h>
1.3 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/InteropTestRound1Client.cpp
Index: InteropTestRound1Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/InteropTestRound1Client.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InteropTestRound1Client.cpp 5 Nov 2004 09:47:10 -0000 1.2
+++ InteropTestRound1Client.cpp 9 Nov 2004 10:26:21 -0000 1.3
@@ -3,7 +3,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#define ARRAYSIZE 2
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/InteropTestRound1DocClient.cpp
Index: InteropTestRound1DocClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/InteropTestRound1DocClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InteropTestRound1DocClient.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ InteropTestRound1DocClient.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -3,7 +3,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#define ARRAYSIZE 2
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/LargeReturningStringClient.cpp
Index: LargeReturningStringClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/LargeReturningStringClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LargeReturningStringClient.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ LargeReturningStringClient.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -1,5 +1,5 @@
-#include "LargeReturningString.h"
+#include "LargeReturningString.hpp"
#include <stdlib.h> // For malloc(), calloc(), strdup() and free()
#include <iostream>
#include <fstream>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/ManyTypeRefRootClient.cpp
Index: ManyTypeRefRootClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/ManyTypeRefRootClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ManyTypeRefRootClient.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ ManyTypeRefRootClient.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -1,4 +1,4 @@
-#include "ManyTypeRefRoot.h"
+#include "ManyTypeRefRoot.hpp"
#include <stdlib.h> // For malloc(), calloc(), strdup() and free()
#include <iostream>
#include <fstream>
1.3 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/MathOpsClient.cpp
Index: MathOpsClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/MathOpsClient.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MathOpsClient.cpp 28 Oct 2004 09:51:40 -0000 1.2
+++ MathOpsClient.cpp 9 Nov 2004 10:26:21 -0000 1.3
@@ -1,4 +1,4 @@
-#include "MathOps.h"
+#include "MathOps.hpp"
#include <axis/server/AxisException.hpp>
#include <ctype.h>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/MathOpsDocClient.cpp
Index: MathOpsDocClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/MathOpsDocClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MathOpsDocClient.cpp 28 Oct 2004 09:51:40 -0000 1.3
+++ MathOpsDocClient.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -1,4 +1,4 @@
-#include "MathOps.h"
+#include "MathOps.hpp"
#include <axis/server/AxisException.hpp>
#include <ctype.h>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RecurseTypesClient.cpp
Index: RecurseTypesClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RecurseTypesClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RecurseTypesClient.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RecurseTypesClient.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -1,4 +1,4 @@
-#include "RecurseTypesWS.h"
+#include "RecurseTypesWS.hpp"
#include <stdlib.h> // For malloc(), calloc(), strdup() and free()
#include <iostream>
#include <fstream>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest1Client.cpp
Index: RpcHttpHeaderTest1Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest1Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcHttpHeaderTest1Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcHttpHeaderTest1Client.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/AxisException.hpp>
#include <stdio.h>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest2Client.cpp
Index: RpcHttpHeaderTest2Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest2Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcHttpHeaderTest2Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcHttpHeaderTest2Client.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/AxisException.hpp>
#define ARRAYSIZE 2
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest3Client.cpp
Index: RpcHttpHeaderTest3Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest3Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcHttpHeaderTest3Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcHttpHeaderTest3Client.cpp 9 Nov 2004 10:26:21 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/AxisException.hpp>
#define ARRAYSIZE 2
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest4Client.cpp
Index: RpcHttpHeaderTest4Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest4Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcHttpHeaderTest4Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcHttpHeaderTest4Client.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/AxisException.hpp>
#define ARRAYSIZE 2
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest5Client.cpp
Index: RpcHttpHeaderTest5Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest5Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcHttpHeaderTest5Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcHttpHeaderTest5Client.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/AxisException.hpp>
#define ARRAYSIZE 2
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest7Client.cpp
Index: RpcHttpHeaderTest7Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest7Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcHttpHeaderTest7Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcHttpHeaderTest7Client.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/AxisException.hpp>
#define ARRAYSIZE 2
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest8Client.cpp
Index: RpcHttpHeaderTest8Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest8Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcHttpHeaderTest8Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcHttpHeaderTest8Client.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/AxisException.hpp>
#define ARRAYSIZE 2
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest10Client.cpp
Index: RpcSoapHeaderTest10Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest10Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcSoapHeaderTest10Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcSoapHeaderTest10Client.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/IHeaderBlock.hpp>
#include <axis/server/AxisException.hpp>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest1Client.cpp
Index: RpcSoapHeaderTest1Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest1Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcSoapHeaderTest1Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcSoapHeaderTest1Client.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/IHeaderBlock.hpp>
#include <axis/server/AxisException.hpp>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest2Client.cpp
Index: RpcSoapHeaderTest2Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest2Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcSoapHeaderTest2Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcSoapHeaderTest2Client.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/IHeaderBlock.hpp>
#include <axis/server/AxisException.hpp>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest3Client.cpp
Index: RpcSoapHeaderTest3Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest3Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcSoapHeaderTest3Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcSoapHeaderTest3Client.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/IHeaderBlock.hpp>
#include <axis/server/AxisException.hpp>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest4Client.cpp
Index: RpcSoapHeaderTest4Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest4Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcSoapHeaderTest4Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcSoapHeaderTest4Client.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/IHeaderBlock.hpp>
#include <axis/server/AxisException.hpp>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest5Client.cpp
Index: RpcSoapHeaderTest5Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest5Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcSoapHeaderTest5Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcSoapHeaderTest5Client.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "../../gen_src/rpc/InteropTestPortType.h"
+#include "../../gen_src/rpc/InteropTestPortType.hpp"
#include <axis/server/IHeaderBlock.hpp>
#include <axis/server/AxisException.hpp>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest6Client.cpp
Index: RpcSoapHeaderTest6Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest6Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcSoapHeaderTest6Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcSoapHeaderTest6Client.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/IHeaderBlock.hpp>
#include <axis/server/AxisException.hpp>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest8Client.cpp
Index: RpcSoapHeaderTest8Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest8Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcSoapHeaderTest8Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcSoapHeaderTest8Client.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/IHeaderBlock.hpp>
#include <axis/server/AxisException.hpp>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest9Client.cpp
Index: RpcSoapHeaderTest9Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/RpcSoapHeaderTest9Client.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RpcSoapHeaderTest9Client.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ RpcSoapHeaderTest9Client.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -26,7 +26,7 @@
#include <string>
using namespace std;
-#include "InteropTestPortType.h"
+#include "InteropTestPortType.hpp"
#include <axis/server/IHeaderBlock.hpp>
#include <axis/server/AxisException.hpp>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleArrayClient.cpp
Index: SimpleArrayClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleArrayClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleArrayClient.cpp 28 Oct 2004 09:51:40 -0000 1.3
+++ SimpleArrayClient.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -3,7 +3,7 @@
#include <string>
using namespace std;
-#include "ArrayTestPortType.h"
+#include "ArrayTestPortType.hpp"
#include <axis/AxisGenException.hpp>
#define ARRAYSIZE 2
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleArrayDocClient.cpp
Index: SimpleArrayDocClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleArrayDocClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleArrayDocClient.cpp 28 Oct 2004 09:51:40 -0000 1.3
+++ SimpleArrayDocClient.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -3,7 +3,7 @@
#include <string>
using namespace std;
-#include "ArrayTestPortType.h"
+#include "ArrayTestPortType.hpp"
#include <axis/AxisGenException.hpp>
#define ARRAYSIZE 2
1.5 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleRefClient.cpp
Index: SimpleRefClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleRefClient.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SimpleRefClient.cpp 28 Oct 2004 09:51:40 -0000 1.4
+++ SimpleRefClient.cpp 9 Nov 2004 10:26:22 -0000 1.5
@@ -3,7 +3,7 @@
#include <string>
using namespace std;
-#include "RefTestPortType.h"
+#include "RefTestPortType.hpp"
#include <axis/AxisGenException.hpp>
#define ARRAYSIZE 2
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleRefDocClient.cpp
Index: SimpleRefDocClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleRefDocClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleRefDocClient.cpp 28 Oct 2004 09:51:40 -0000 1.3
+++ SimpleRefDocClient.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -3,7 +3,7 @@
#include <string>
using namespace std;
-#include "RefTestPortType.h"
+#include "RefTestPortType.hpp"
#include <axis/AxisGenException.hpp>
#define ARRAYSIZE 2
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleTypeArrayClient.cpp
Index: SimpleTypeArrayClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleTypeArrayClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleTypeArrayClient.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ SimpleTypeArrayClient.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -1,4 +1,4 @@
-#include "SimpleTypeArrayWS.h"
+#include "SimpleTypeArrayWS.hpp"
#include <stdlib.h> // For malloc(), calloc(), strdup() and free()
#include <iostream>
#include <fstream>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleTypeInnerUnboundedClient.cpp
Index: SimpleTypeInnerUnboundedClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleTypeInnerUnboundedClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleTypeInnerUnboundedClient.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ SimpleTypeInnerUnboundedClient.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -1,4 +1,4 @@
-#include "SimpleTypeInnerUnboundedWS.h"
+#include "SimpleTypeInnerUnboundedWS.hpp"
#include <stdlib.h> // For malloc(), calloc(), strdup() and free()
#include <iostream>
#include <fstream>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleTypeInnerUnboundedInOutputClient.cpp
Index: SimpleTypeInnerUnboundedInOutputClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleTypeInnerUnboundedInOutputClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleTypeInnerUnboundedInOutputClient.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ SimpleTypeInnerUnboundedInOutputClient.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -1,4 +1,4 @@
-#include "SimpleTypeInnerUnboundedInOutputWS.h"
+#include "SimpleTypeInnerUnboundedInOutputWS.hpp"
#include <stdlib.h> // For malloc(), calloc(), strdup() and free()
#include <iostream>
#include <fstream>
1.4 +1 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/TradeServicesClient.cpp
Index: TradeServicesClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/TradeServicesClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TradeServicesClient.cpp 5 Nov 2004 09:47:10 -0000 1.3
+++ TradeServicesClient.cpp 9 Nov 2004 10:26:22 -0000 1.4
@@ -10,7 +10,7 @@
//
//
#include <stdio.h>
-#include "operations.h"
+#include "operations.hpp"
#include <stdlib.h> // For malloc(), calloc(), strdup() and free()
#include <iostream>
#include <fstream>
1.3 +2 -2 ws-axis/c/tests/auto_build/testcases/client/cpp/inquire_v2Client.cpp
Index: inquire_v2Client.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/inquire_v2Client.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- inquire_v2Client.cpp 28 Oct 2004 09:51:40 -0000 1.2
+++ inquire_v2Client.cpp 9 Nov 2004 10:26:22 -0000 1.3
@@ -30,8 +30,8 @@
#include <axis/server/AxisException.hpp>
using namespace std;
-#include "Inquire.h"
-#include "InquireService_AxisClientException.h"
+#include "Inquire.hpp"
+#include "InquireService_AxisClientException.hpp"
#define ARRAYSIZE 1