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 wh...@apache.org on 2004/10/27 12:34:11 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal ClientStubHeaderWriter.java ClientStubWriter.java ParamCPPFileWriter.java ParmHeaderFileWriter.java ServiceHeaderWriter.java WrapHeaderWriter.java
whitlock 2004/10/27 03:34:11
Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws WSDL2Ws.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
ArrayParamWriter.java ClientStubHeaderWriter.java
ClientStubWriter.java ExceptionHeaderWriter.java
ExceptionWriter.java ParamCPPFileWriter.java
ParmHeaderFileWriter.java ServiceHeaderWriter.java
WrapHeaderWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
ClientStubHeaderWriter.java ClientStubWriter.java
ParamCPPFileWriter.java ParmHeaderFileWriter.java
ServiceHeaderWriter.java WrapHeaderWriter.java
Log:
Rename external C++ headers to .hpp
Revision Changes Path
1.44 +8 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
Index: WSDL2Ws.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- WSDL2Ws.java 25 Oct 2004 15:27:49 -0000 1.43
+++ WSDL2Ws.java 27 Oct 2004 10:34:10 -0000 1.44
@@ -798,6 +798,13 @@
return;
}
+ String lang = data.getOptionBykey("l");
+ if ("c".equals(lang)) {
+ System.err.println("Generation of C stubs is not currently supported");
+ usage();
+ return;
+ }
+
WSDL2Ws.makeSystem = data.getOptionBykey("m");
try {
@@ -806,7 +813,7 @@
gen.genarateWrappers(
null,
data.getOptionBykey("o"),
- data.getOptionBykey("l"),
+ "c++",
data.getOptionBykey("i"),
data.getOptionBykey("s"),
data.getOptionBykey("c"),
1.15 +1 -1 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ArrayParamWriter.java 26 Oct 2004 10:51:47 -0000 1.14
+++ ArrayParamWriter.java 27 Oct 2004 10:34:10 -0000 1.15
@@ -86,7 +86,7 @@
}
else
{
- writer.write("#include <axis/server/AxisUserAPI.h>\n\n");
+ writer.write("#include <axis/server/AxisUserAPI.hpp>\n\n");
}
writeArrayStruct();
this.writer.write(
1.25 +4 -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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ClientStubHeaderWriter.java 16 Aug 2004 09:22:50 -0000 1.24
+++ ClientStubHeaderWriter.java 27 Oct 2004 10:34:10 -0000 1.25
@@ -92,7 +92,8 @@
protected void writeClassComment() throws WrapperFault {
try{
writer.write("/*\n");
- writer.write(" * This file was auto-generated by the Axis C++ Web Service " +
"Generator (WSDL2Ws)\n");
+ writer.write(" * This file was auto-generated by the Axis C++ Web Service " +
+ "Generator (WSDL2Ws)\n");
writer.write(" * This file contains Client Stub Class for remote web service \n");
writer.write(" */\n\n");
}catch(IOException e){
@@ -180,9 +181,9 @@
*/
protected void writePreprocssorStatements() throws WrapperFault {
try{
- writer.write("#include <axis/client/Stub.h>\n");
+ writer.write("#include <axis/client/Stub.hpp>\n");
writer.write("#include \"" + wscontext.getSerInfo().getServicename() + "_AxisClientException.h\"\n");
- writer.write("#include <axis/ISoapFault.h>\n");
+ writer.write("#include <axis/ISoapFault.hpp>\n");
Type atype;
Iterator types = this.wscontext.getTypemap().getTypes().iterator();
HashSet typeSet = new HashSet();
1.56 +1 -1 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.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ClientStubWriter.java 18 Oct 2004 12:12:11 -0000 1.55
+++ ClientStubWriter.java 27 Oct 2004 10:34:10 -0000 1.56
@@ -147,7 +147,7 @@
{
writer.write("#include \""+classname+".h\"\n\n");
}
- writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
+ writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
writer.write("using namespace std;\n\n ");
}catch(IOException e){
1.9 +2 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ExceptionHeaderWriter.java 18 Oct 2004 12:12:11 -0000 1.8
+++ ExceptionHeaderWriter.java 27 Oct 2004 10:34:11 -0000 1.9
@@ -85,8 +85,8 @@
try{
writer.write("#include <string>\n");
writer.write("#include <exception>\n");
- writer.write("#include <axis/server/AxisException.h>\n");
- writer.write("#include <axis/ISoapFault.h>\n");
+ writer.write("#include <axis/server/AxisException.hpp>\n");
+ writer.write("#include <axis/ISoapFault.hpp>\n");
getLangName();
writer.write("using namespace std;\n");
writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
1.9 +3 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ExceptionWriter.java 18 Oct 2004 12:12:11 -0000 1.8
+++ ExceptionWriter.java 27 Oct 2004 10:34:11 -0000 1.9
@@ -88,7 +88,7 @@
{
writer.write("#include \""+faultInfoName+".h\"\n\n");
}
- writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
+ writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
}catch(IOException e){
throw new WrapperFault(e);
}
@@ -99,7 +99,8 @@
writer.write("/*\n");
writer.write(" * This file was auto-generated by the Axis C++ Web Service " +
"Generator (WSDL2Ws)\n");
- writer.write(" * This file contains implementations of the "+getServiceName()+" Exception " +
"class of the web service.\n");
+ writer.write(" * This file contains implementations of the "+getServiceName()+" Exception " +
+ "class of the web service.\n");
writer.write(" */\n\n");
}catch(IOException e){
1.11 +1 -1 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ParamCPPFileWriter.java 8 Sep 2004 06:41:15 -0000 1.10
+++ ParamCPPFileWriter.java 27 Oct 2004 10:34:11 -0000 1.11
@@ -95,7 +95,7 @@
try {
writer.write("#include <malloc.h>\n");
writer.write("#include \""+this.classname + ".h\"\n");
- writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
+ writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
} catch (IOException e) {
e.printStackTrace();
throw new WrapperFault(e);
1.20 +1 -1 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ParmHeaderFileWriter.java 12 Oct 2004 06:45:55 -0000 1.19
+++ ParmHeaderFileWriter.java 27 Oct 2004 10:34:11 -0000 1.20
@@ -128,7 +128,7 @@
try{
Type atype;
Iterator types = this.wscontext.getTypemap().getTypes().iterator();
- writer.write("#include <axis/server/AxisUserAPI.h>\n");
+ writer.write("#include <axis/server/AxisUserAPI.hpp>\n");
writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
HashSet typeSet = new HashSet();
for (int i=0;i<attribs.length; i++)
1.24 +2 -2 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ServiceHeaderWriter.java 16 Aug 2004 09:22:50 -0000 1.23
+++ ServiceHeaderWriter.java 27 Oct 2004 10:34:11 -0000 1.24
@@ -180,8 +180,8 @@
Type atype;
Iterator types = this.wscontext.getTypemap().getTypes().iterator();
HashSet typeSet = new HashSet();
- writer.write("#include <axis/server/AxisUserAPI.h>\n");
- writer.write("#include \"AxisServiceException.h\" \n\n");
+ writer.write("#include <axis/server/AxisUserAPI.hpp>\n");
+ writer.write("#include \"AxisServiceException.hpp\" \n\n");
String typeName = null;
while(types.hasNext()){
atype = (Type)types.next();
1.19 +5 -5 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- WrapHeaderWriter.java 16 Aug 2004 09:22:51 -0000 1.18
+++ WrapHeaderWriter.java 27 Oct 2004 10:34:11 -0000 1.19
@@ -134,11 +134,11 @@
protected void writePreprocssorStatements() throws WrapperFault {
try{
writer.write("#include \""+CUtils.getWebServiceNameFromWrapperName(classname)+".h\"\n");
- writer.write("#include <axis/server/WrapperClassHandler.h>\n");
- writer.write("#include <axis/server/IMessageData.h>\n");
- writer.write("#include <axis/server/GDefine.h>\n");
- writer.write("#include <axis/server/AxisWrapperAPI.h>\n");
- writer.write("#include \"AxisServiceException.h\" \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");
+ writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n");
+ writer.write("#include \"AxisServiceException.hpp\" \n");
writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
//writeFaultHeaders();
1.20 +4 -3 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ClientStubHeaderWriter.java 19 Aug 2004 12:54:54 -0000 1.19
+++ ClientStubHeaderWriter.java 27 Oct 2004 10:34:11 -0000 1.20
@@ -93,7 +93,8 @@
protected void writeClassComment() throws WrapperFault {
try{
writer.write("/*\n");
- writer.write(" * This file was auto-generated by the Axis C++ Web Service " +
"Generator (WSDL2Ws)\n");
+ writer.write(" * This file was auto-generated by the Axis C++ Web Service " +
+ "Generator (WSDL2Ws)\n");
writer.write(" * This file contains Client Stub Class for remote web service \n");
writer.write(" */\n\n");
}catch(IOException e){
@@ -181,8 +182,8 @@
*/
protected void writePreprocssorStatements() throws WrapperFault {
try{
- writer.write("#include <axis/client/Stub.h>\n");
- writer.write("#include <axis/ISoapFault.h>\n");
+ writer.write("#include <axis/client/Stub.hpp>\n");
+ writer.write("#include <axis/ISoapFault.hpp>\n");
writer.write("#include \"" + wscontext.getSerInfo().getServicename() + "_AxisClientException.h\"\n");
Type atype;
Iterator types = this.wscontext.getTypemap().getTypes().iterator();
1.47 +1 -1 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ClientStubWriter.java 26 Oct 2004 10:51:47 -0000 1.46
+++ ClientStubWriter.java 27 Oct 2004 10:34:11 -0000 1.47
@@ -220,7 +220,7 @@
{
writer.write("#include \"" + classname + ".h\"\n\n");
}
- writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
+ writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
}
catch (IOException e)
{
1.14 +1 -1 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ParamCPPFileWriter.java 8 Sep 2004 06:41:15 -0000 1.13
+++ ParamCPPFileWriter.java 27 Oct 2004 10:34:11 -0000 1.14
@@ -83,7 +83,7 @@
protected void writePreprocssorStatements()throws WrapperFault{
try {
writer.write("#include <malloc.h>\n");
- writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
+ writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
writer.write("#include \""+this.classname + ".h\"\n");
} catch (IOException e) {
e.printStackTrace();
1.21 +1 -1 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ParmHeaderFileWriter.java 11 Oct 2004 08:32:50 -0000 1.20
+++ ParmHeaderFileWriter.java 27 Oct 2004 10:34:11 -0000 1.21
@@ -206,7 +206,7 @@
try{
Type atype;
Iterator types = this.wscontext.getTypemap().getTypes().iterator();
- writer.write("#include <axis/server/AxisUserAPI.h>\n");
+ writer.write("#include <axis/server/AxisUserAPI.hpp>\n");
writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
HashSet typeSet = new HashSet();
for (int i=0;i<attribs.length; i++)
1.14 +2 -2 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ServiceHeaderWriter.java 16 Aug 2004 09:22:52 -0000 1.13
+++ ServiceHeaderWriter.java 27 Oct 2004 10:34:11 -0000 1.14
@@ -174,8 +174,8 @@
Type atype;
Iterator types = this.wscontext.getTypemap().getTypes().iterator();
HashSet typeSet = new HashSet();
- writer.write("#include <axis/server/AxisUserAPI.h>\n");
- writer.write("#include \"AxisServiceException.h\" \n\n");
+ writer.write("#include <axis/server/AxisUserAPI.hpp>\n");
+ writer.write("#include \"AxisServiceException.hpp\" \n\n");
while(types.hasNext()){
atype = (Type)types.next();
if (atype.getLanguageSpecificName().startsWith(">")) continue;
1.15 +5 -5 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapHeaderWriter.java
Index: WrapHeaderWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapHeaderWriter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WrapHeaderWriter.java 16 Aug 2004 09:22:52 -0000 1.14
+++ WrapHeaderWriter.java 27 Oct 2004 10:34:11 -0000 1.15
@@ -130,11 +130,11 @@
protected void writePreprocssorStatements() throws WrapperFault {
try{
writer.write("#include \""+CUtils.getWebServiceNameFromWrapperName(classname)+".h\"\n");
- writer.write("#include <axis/server/WrapperClassHandler.h>\n");
- writer.write("#include <axis/server/IMessageData.h>\n");
- writer.write("#include <axis/server/GDefine.h>\n");
- writer.write("#include <axis/server/AxisWrapperAPI.h>\n");
- writer.write("#include \"AxisServiceException.h\" \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");
+ writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n");
+ writer.write("#include \"AxisServiceException.hpp\" \n");
writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
//writeFaultHeaders();