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 su...@apache.org on 2003/09/30 15:14:26 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/rpc RPCWebServiceGenarator.java
susantha 2003/09/30 06:14:26
Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws
SourceWriterFactory.java WrapperConstants.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/rpc
RPCWebServiceGenarator.java
Log:
Updated WSDL2WS code to create C client side Stubs.
Revision Changes Path
1.3 +9 -6 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/SourceWriterFactory.java
Index: SourceWriterFactory.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/SourceWriterFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SourceWriterFactory.java 25 Sep 2003 04:40:45 -0000 1.2
+++ SourceWriterFactory.java 30 Sep 2003 13:14:26 -0000 1.3
@@ -55,7 +55,6 @@
package org.apache.axis.wsdl.wsdl2ws;
-import org.apache.axis.wsdl.wsdl2ws.cpp.ClassLoader;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
/**
* Genarate a SourceFactory depend on the reqirements.
@@ -75,10 +74,6 @@
return new org.apache.axis.wsdl.wsdl2ws.cpp.ServiceWriter(wscontext);
else if(genaratorType == WrapperConstants.GENERATOR_SERVICE_HPP)
return new org.apache.axis.wsdl.wsdl2ws.cpp.ServiceHeaderWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_CPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.ClientStubWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_HPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.ClientStubHeaderWriter(wscontext);
//C
else if(genaratorType == WrapperConstants.GENERATOR_PARAM_C_ALL)
return new org.apache.axis.wsdl.wsdl2ws.c.AllParamWriter(wscontext);
@@ -88,9 +83,17 @@
return new org.apache.axis.wsdl.wsdl2ws.c.WrapHeaderWriter(wscontext);
else if(genaratorType == WrapperConstants.GENERATOR_SERVICE_C)
return new org.apache.axis.wsdl.wsdl2ws.c.ServiceWriter(wscontext);
+ else if(genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_C_WRAPPER)
+ return new org.apache.axis.wsdl.wsdl2ws.c.ClientStubWrapperWriter(wscontext);
//Common to C & C++
+ else if((genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_HPP)||
+ (genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_H))
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.ClientStubHeaderWriter(wscontext);
+ else if((genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_CPP)||
+ (genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_C))
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.ClientStubWriter(wscontext);
else if(genaratorType == WrapperConstants.GENERATOR_CLASSLOADER_CPP)
- return new ClassLoader(wscontext);
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.ClassLoader(wscontext);
throw new WrapperFault("Source writer type not found");
}
}
1.3 +1 -0 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperConstants.java
Index: WrapperConstants.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WrapperConstants.java 25 Sep 2003 04:40:45 -0000 1.2
+++ WrapperConstants.java 30 Sep 2003 13:14:26 -0000 1.3
@@ -112,6 +112,7 @@
public static final int GENERATOR_WRAPPER_H = 25;
public static final int GENERATOR_CLIENT_STUB_H = 26;
public static final int GENERATOR_PARAM_C_ALL = 27 ;
+ public static final int GENERATOR_CLIENT_STUB_C_WRAPPER = 28;
1.3 +11 -9 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/rpc/RPCWebServiceGenarator.java
Index: RPCWebServiceGenarator.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/rpc/RPCWebServiceGenarator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RPCWebServiceGenarator.java 25 Sep 2003 04:40:46 -0000 1.2
+++ RPCWebServiceGenarator.java 30 Sep 2003 13:14:26 -0000 1.3
@@ -100,16 +100,18 @@
(new Genarator(WrapperConstants.GENERATOR_PARAM_CPP_ALL, wscontext)).genarate();
}
}else if(WrapperConstants.LANGUAGE_C.equalsIgnoreCase(language)){
- //if(WrapperConstants.SERVER.equals(wscontext.getWrapInfo().getTargetEngine())){
- (new Genarator(WrapperConstants.GENERATOR_WRAPPER_C, wscontext)).genarate();
- (new Genarator(WrapperConstants.GENERATOR_WRAPPER_H, wscontext)).genarate();
- //}else{
- //(new Genarator(WrapperConstants.GENERATOR_CLIENT_WRAPPER_C, wscontext)).genarate();
- //(new Genarator(WrapperConstants.GENERATOR_CLIENT_WRAPPER_H, wscontext)).genarate();
- //}
- (new Genarator(WrapperConstants.GENERATOR_SERVICE_C, wscontext)).genarate();
+ if(WrapperConstants.SERVER.equals(wscontext.getWrapInfo().getTargetEngine())){
+ (new Genarator(WrapperConstants.GENERATOR_WRAPPER_C, wscontext)).genarate();
+ (new Genarator(WrapperConstants.GENERATOR_WRAPPER_H, wscontext)).genarate();
+ (new Genarator(WrapperConstants.GENERATOR_SERVICE_C, wscontext)).genarate();
+ (new Genarator(WrapperConstants.GENERATOR_PARAM_C_ALL, wscontext)).genarate();
+ (new Genarator(WrapperConstants.GENERATOR_CLASSLOADER_CPP, wscontext)).genarate();
+ }else{
+ (new Genarator(WrapperConstants.GENERATOR_CLIENT_STUB_C, wscontext)).genarate();
+ (new Genarator(WrapperConstants.GENERATOR_CLIENT_STUB_H, wscontext)).genarate();
(new Genarator(WrapperConstants.GENERATOR_PARAM_C_ALL, wscontext)).genarate();
- (new Genarator(WrapperConstants.GENERATOR_CLASSLOADER_CPP, wscontext)).genarate();
+ (new Genarator(WrapperConstants.GENERATOR_CLIENT_STUB_C_WRAPPER, wscontext)).genarate();
+ }
}
else{
throw new WrapperFault("Unsupported Language"+language);