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 sa...@apache.org on 2004/06/09 11:45:53 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp ClientStubHeaderWriter.java ClientStubWriter.java HeaderFileWriter.java ServiceHeaderWriter.java
samisa 2004/06/09 02:45:53
Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
ClientStubHeaderWriter.java ClientStubWriter.java
HeaderFileWriter.java ServiceHeaderWriter.java
Log:
Re applied the overwritten changes to inherit from stub base
Revision Changes Path
1.17 +6 -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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ClientStubHeaderWriter.java 7 Jun 2004 10:50:18 -0000 1.16
+++ ClientStubHeaderWriter.java 9 Jun 2004 09:45:52 -0000 1.17
@@ -57,11 +57,12 @@
* @see org.apache.axis.wsdl.wsdl2ws.cpp.HeaderFileWriter#writeAttributes()
*/
protected void writeAttributes() throws WrapperFault {
- try {
+/* try {
writer.write("private:\n\tCall* m_pCall;\n");
}catch(IOException e){
throw new WrapperFault(e);
}
+*/
}
/* (non-Javadoc)
@@ -84,7 +85,7 @@
*/
protected void writeConstructors() throws WrapperFault {
try{
- writer.write("public:\n\t"+classname+"();\n");
+ writer.write("public:\n\t"+classname+"(const char* pchEndpointUri);\n");
}catch(IOException e){
throw new WrapperFault(e);
}
@@ -159,7 +160,7 @@
*/
protected void writePreprocssorStatements() throws WrapperFault {
try{
- writer.write("#include <axis/client/Call.h>\n");
+ writer.write("#include <axis/client/Stub.h>\n");
writer.write("/*include Exception header files here*/\n");//damitha
Type atype;
Iterator types = this.wscontext.getTypemap().getTypes().iterator();
@@ -186,5 +187,7 @@
{
return "ClientStub";
}
+
+ protected String getExtendsPart(){return " :public Stub";}
}
1.38 +4 -4 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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ClientStubWriter.java 8 Jun 2004 07:03:53 -0000 1.37
+++ ClientStubWriter.java 9 Jun 2004 09:45:52 -0000 1.38
@@ -75,11 +75,11 @@
*/
protected void writeConstructors() throws WrapperFault {
try{
- writer.write(classname+"::"+classname+"()\n{\n");
- writer.write("\tm_pCall = new Call();\n");
+ writer.write(classname+"::"+classname+"(const char* pchEndpointUri)\n:Stub(pchEndpointUri)\n{\n");
+ /*writer.write("\tm_pCall = new Call();\n");
//TODO get TransportURI from WrapInfo and check what the transport is and do the following line accordingly
writer.write("\tm_pCall->setProtocol(APTHTTP);\n");
- writer.write("\tm_pCall->setEndpointURI(\""+wscontext.getWrapInfo().getTargetEndpointURI()+"\");\n");
+ writer.write("\tm_pCall->setEndpointURI(\""+wscontext.getWrapInfo().getTargetEndpointURI()+"\");\n");*/
writer.write("}\n\n");
}catch(IOException e){
throw new WrapperFault(e);
@@ -91,7 +91,7 @@
*/
protected void writeDistructors() throws WrapperFault {
try{
- writer.write(classname+"::~"+classname+"()\n{\n\tdelete m_pCall;\n}\n\n");
+ writer.write(classname+"::~"+classname+"()\n{\n}\n\n");
}catch(IOException e){
throw new WrapperFault(e);
}
1.9 +1 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HeaderFileWriter.java 7 Jun 2004 10:50:18 -0000 1.8
+++ HeaderFileWriter.java 9 Jun 2004 09:45:52 -0000 1.9
@@ -62,7 +62,7 @@
}
}
- protected String getExtendsPart(){return " ";}
+ protected abstract String getExtendsPart();//{return " ";}
protected abstract File getFilePath()throws WrapperFault;
protected abstract String getFileType(); //will return "Param", "Server" or "Client"
1.18 +3 -0 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ServiceHeaderWriter.java 7 Jun 2004 10:50:18 -0000 1.17
+++ ServiceHeaderWriter.java 9 Jun 2004 09:45:52 -0000 1.18
@@ -183,5 +183,8 @@
{
return "ServerSkeleton";
}
+
+
+ protected String getExtendsPart(){return " ";}
}