You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by su...@apache.org on 2004/01/09 05:59:14 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal BeanParamWriter.java CPPUtils.java ParamWriter.java
susantha 2004/01/08 20:59:14
Modified: c/include/axis/common Tag: CWrapperSupport Packet.h
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c Tag:
CWrapperSupport CUtils.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal Tag:
CWrapperSupport AllParamWriter.java
ArrayParamWriter.java CUtils.java ClassLoader.java
ClientStubHeaderWriter.java ParamWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal Tag:
CWrapperSupport BeanParamWriter.java CPPUtils.java
ParamWriter.java
Log:
WSDL2Ws tool improvement to generate C stubs/wrappers/skeletons for doc/lit
style wsdls
Revision Changes Path
No revision
No revision
1.1.4.8 +11 -11 ws-axis/c/include/axis/common/Packet.h
Index: Packet.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/common/Packet.h,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -u -r1.1.4.7 -r1.1.4.8
--- Packet.h 16 Dec 2003 06:33:30 -0000 1.1.4.7
+++ Packet.h 9 Jan 2004 04:59:13 -0000 1.1.4.8
@@ -140,9 +140,9 @@
* This function is provided by the transport modules. Called by Axis engine when it needs to send SOAP
* message. This function may be called several times.
* @param
- * 1st - buffer
- * 2nd - buffer id
- * 3rd - Ax_soapstream object
+ * 1st - null terminated character buffer to be sent
+ * 2nd - buffer id which identifies the buffer
+ * 3rd - Ax_soapstream object which act like a thread id
* @return
* TRANSPORT_FINISHED - Transport done and buffer is free to re-use.
* TRANSPORT_IN_PROGRESS - Transport is in progress and buffer cannot be re-used yet.
@@ -158,7 +158,7 @@
* @param
* 1st - pointer to buffer pointer to which the transport's buffer is set
* 2nd - pointer to an int to which the number of bytes read is set
- * 3rd - Ax_soapstream object
+ * 3rd - Ax_soapstream object which act like a thread id
* @return
* TRANSPORT_FINISHED - No any more message bytes to be received. If a buffer is present it is the last
* buffer.
@@ -172,8 +172,8 @@
* This function is provided by the transport modules. Called by Axis engine when it needs to say the
* transport module that the engine is no longer using the buffer and can be re-used.
* @param
- * 1st - buffer
- * 2nd - Ax_soapstream object
+ * 1st - buffer that Axis got from the transport layer.
+ * 2nd - Ax_soapstream object which act like a thread id
*/
typedef void (AXISCALL * AXIS_MODULE_CALLBACK_RELEASE_RECEIVE_BUFFER)(const char*, const void*);
@@ -184,7 +184,7 @@
* @param
* 1st - Transport information type to set
* 2nd - Information value
- * 3rd - Ax_soapstream object
+ * 3rd - Ax_soapstream object which act like a thread id
*/
typedef void (AXISCALL * AXIS_MODULE_CALLBACK_SET_TRANSPORT_INFORMATION)(AXIS_TRANSPORT_INFORMATION_TYPE, const char*, const void*);
@@ -193,7 +193,7 @@
* transport information such as http headers. This function can be called only once.
* @param
* 1st - Transport information type to get
- * 2nd - Ax_soapstream object
+ * 2nd - Ax_soapstream object which act like a thread id
*/
typedef const char* (AXISCALL * AXIS_MODULE_CALLBACK_GET_TRANSPORT_INFORMATION)(AXIS_TRANSPORT_INFORMATION_TYPE, const void*);
@@ -207,9 +207,9 @@
* Axis engine.This function should be called for each buffer if AXIS_MODULE_CALLBACK_SEND_MESSAGE_BYTES
* returned TRANSPORT_IN_PROGRESS.
* @param
- * 1st - buffer
- * 2nd - buffer id
- * 3rd - Ax_soapstream object
+ * 1st - buffer that Axis gave to the transport layer
+ * 2nd - buffer id which uniquely identifies the buffer
+ * 3rd - Ax_soapstream object which act like a thread id
*/
typedef void (AXISCALL * AXIS_ENGINE_CALLBACK_RELEASE_SEND_BUFFER)(const char*, const void*, const void*);
No revision
No revision
1.4.4.2 +1 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/CUtils.java
Index: CUtils.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/CUtils.java,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -u -r1.4.4.1 -r1.4.4.2
--- CUtils.java 15 Nov 2003 12:25:54 -0000 1.4.4.1
+++ CUtils.java 9 Jan 2004 04:59:13 -0000 1.4.4.2
@@ -100,7 +100,7 @@
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "double"), "double");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "char"), "char");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "short"), "short");
- qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "string"), "char*");
+ qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "string"), "xsd_string");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "dateTime"), "Axis_DateTime");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "date"), "Axis_Date");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "time"), "Axis_Time");
No revision
No revision
1.1.2.2 +2 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/Attic/AllParamWriter.java
Index: AllParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/Attic/AllParamWriter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AllParamWriter.java 7 Jan 2004 11:21:15 -0000 1.1.2.1
+++ AllParamWriter.java 9 Jan 2004 04:59:13 -0000 1.1.2.2
@@ -91,11 +91,11 @@
if(wscontext.getWrapInfo().getImplStyle().equals(WrapperConstants.IMPL_STYLE_STRUCT)){
if(type.isArray()){
System.out.println("Array writer called ......");
- (new org.apache.axis.wsdl.wsdl2ws.c.ArrayParamWriter(wscontext,type)).writeSource();
+ (new ArrayParamWriter(wscontext,type)).writeSource();
}
else{
System.out.println("struct writer called ......");
- (new org.apache.axis.wsdl.wsdl2ws.c.BeanParamWriter(wscontext,type)).writeSource();
+ (new BeanParamWriter(wscontext,type)).writeSource();
(new ParmHeaderFileWriter(wscontext,type)).writeSource();
}
}
1.1.2.2 +1 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/Attic/ArrayParamWriter.java
Index: ArrayParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/Attic/ArrayParamWriter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ArrayParamWriter.java 7 Jan 2004 11:21:15 -0000 1.1.2.1
+++ ArrayParamWriter.java 9 Jan 2004 04:59:13 -0000 1.1.2.2
@@ -70,7 +70,6 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
-import org.apache.axis.wsdl.wsdl2ws.cpp.CPPUtils;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
@@ -91,7 +90,7 @@
}
//include header file for the contained type
QName qname = WrapperUtils.getArrayType(type).getName();
- if (!CPPUtils.isSimpleType(qname)){
+ if (!CUtils.isSimpleType(qname)){
writer.write("#include \""+attribs[0][1]+".h\"\n\n");
}
else{
1.1.2.3 +8 -8 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/Attic/CUtils.java
Index: CUtils.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/Attic/CUtils.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- CUtils.java 8 Jan 2004 09:01:20 -0000 1.1.2.2
+++ CUtils.java 9 Jan 2004 04:59:13 -0000 1.1.2.3
@@ -91,8 +91,8 @@
class2QNamemap.put("xsd__time", new QName(WrapperConstants.SCHEMA_NAMESPACE, "time"));
class2QNamemap.put("xsd__base64Binary", new QName(WrapperConstants.SCHEMA_NAMESPACE, "base64Binary"));
class2QNamemap.put("xsd__hexBinary", new QName(WrapperConstants.SCHEMA_NAMESPACE, "hexBinary"));
- class2QNamemap.put("xsd_decimal", new QName(WrapperConstants.SCHEMA_NAMESPACE, "decimal"));
- class2QNamemap.put("xsd_boolean", new QName(WrapperConstants.SCHEMA_NAMESPACE, "boolean"));
+ class2QNamemap.put("xsd__decimal", new QName(WrapperConstants.SCHEMA_NAMESPACE, "decimal"));
+ class2QNamemap.put("xsd__boolean", new QName(WrapperConstants.SCHEMA_NAMESPACE, "boolean"));
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "int"), "int");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "byte"), "unsigned char");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "float"), "float");
@@ -100,17 +100,17 @@
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "double"), "double");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "char"), "char");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "short"), "short");
- qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "string"), "string");
+ qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "string"), "xsd__string");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "dateTime"), "xsd__dateTime");
- qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "date"), "xsd_date");
- qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "time"), "xsd_time");
+ qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "date"), "xsd__date");
+ qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "time"), "xsd__time");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "base64Binary"), "xsd__base64Binary");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "hexBinary"), "xsd__hexBinary");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "decimal"), "xsd__decimal");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "boolean"), "xsd__boolean");
type2getValueMethodName.put("int","Int");
type2getValueMethodName.put("float","Float");
- type2getValueMethodName.put("string","String");
+ type2getValueMethodName.put("xsd__string","String");
type2getValueMethodName.put("long","Long");
type2getValueMethodName.put("short","Short");
type2getValueMethodName.put("char","Char");
@@ -128,7 +128,7 @@
type2getValueMethodName.put("xsd__boolean","Boolean");
type2BasicArrayName.put("int","xsd__int_Array");
type2BasicArrayName.put("float","xsd__float_Array");
- type2BasicArrayName.put("string","xsd__string_Array");
+ type2BasicArrayName.put("xsd__string","xsd__string_Array");
type2BasicArrayName.put("long","xsd__long_Array");
type2BasicArrayName.put("short","xsd__short_Array");
type2BasicArrayName.put("char","xsd__byte_Array");
@@ -212,5 +212,5 @@
return arrayName;
}
return null;
- }
+ }
}
1.1.2.2 +2 -3 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/Attic/ClassLoader.java
Index: ClassLoader.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/Attic/ClassLoader.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ClassLoader.java 7 Jan 2004 11:21:15 -0000 1.1.2.1
+++ ClassLoader.java 9 Jan 2004 04:59:13 -0000 1.1.2.2
@@ -69,7 +69,6 @@
import org.apache.axis.wsdl.wsdl2ws.SourceWriter;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
-import org.apache.axis.wsdl.wsdl2ws.cpp.CPPUtils;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
public class ClassLoader implements SourceWriter{
@@ -82,7 +81,7 @@
}
public void writeSource() throws WrapperFault {
- String wrappername = classname + CPPUtils.WRAPPER_NAME_APPENDER;
+ String wrappername = classname + CUtils.WRAPPER_NAME_APPENDER;
try{
this.writer = new BufferedWriter(new FileWriter(getFilePath(), false));
writer.write("/*This file is automatically generated by the Axis C++ Wrapper Class Generator\n");
@@ -137,7 +136,7 @@
if(targetOutputLocation.endsWith("/"))
targetOutputLocation = targetOutputLocation.substring(0, targetOutputLocation.length() - 1);
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + CPPUtils.CLASS_LODER_APPENDER + ".c";
+ String fileName = targetOutputLocation + "/" + classname + CUtils.CLASS_LODER_APPENDER + ".c";
return new File(fileName);
}
1.1.2.2 +3 -4 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/Attic/ClientStubHeaderWriter.java
Index: ClientStubHeaderWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/Attic/ClientStubHeaderWriter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ClientStubHeaderWriter.java 7 Jan 2004 11:21:15 -0000 1.1.2.1
+++ ClientStubHeaderWriter.java 9 Jan 2004 04:59:13 -0000 1.1.2.2
@@ -68,7 +68,6 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
-import org.apache.axis.wsdl.wsdl2ws.cpp.CPPUtils;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
import org.apache.axis.wsdl.wsdl2ws.info.ParameterInfo;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
@@ -132,7 +131,7 @@
writer.write("extern void ");
else {
String outparam = minfo.getReturnType().getLangName();
- isSimpleType = CPPUtils.isSimpleType(outparam);
+ isSimpleType = CUtils.isSimpleType(outparam);
writer.write("extern "+WrapperUtils.getClassNameFromParamInfoConsideringArrays(minfo.getReturnType(),wscontext)+" ");
}
writer.write(minfo.getMethodname()+"(");
@@ -141,12 +140,12 @@
Iterator params = minfo.getParameterTypes().iterator();
if(params.hasNext()){
ParameterInfo fparam = (ParameterInfo)params.next();
- isSimpleType = CPPUtils.isSimpleType(fparam.getLangName());
+ isSimpleType = CUtils.isSimpleType(fparam.getLangName());
writer.write(WrapperUtils.getClassNameFromParamInfoConsideringArrays(fparam,wscontext)+" Value"+0);
}
for(int j =1; params.hasNext();j++){
ParameterInfo nparam = (ParameterInfo)params.next();
- isSimpleType = CPPUtils.isSimpleType(nparam.getLangName());
+ isSimpleType = CUtils.isSimpleType(nparam.getLangName());
writer.write(","+WrapperUtils.getClassNameFromParamInfoConsideringArrays(nparam,wscontext)+" Value"+j);
}
writer.write(");\n");
1.1.2.2 +32 -37 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/Attic/ParamWriter.java
Index: ParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/Attic/ParamWriter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ParamWriter.java 7 Jan 2004 11:21:15 -0000 1.1.2.1
+++ ParamWriter.java 9 Jan 2004 04:59:13 -0000 1.1.2.2
@@ -66,16 +66,14 @@
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.Iterator;
import javax.xml.namespace.QName;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
-import org.apache.axis.wsdl.wsdl2ws.cpp.CPPUtils;
-import org.apache.axis.wsdl.wsdl2ws.c.CUtils;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
+import org.apache.axis.wsdl.wsdl2ws.info.TypeMap;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
public abstract class ParamWriter extends BasicFileWriter{
@@ -113,14 +111,14 @@
/* genarate the arrtibs array */
public String[][] getAttribList(String Qualifiedname) throws WrapperFault {
- String[][] attribs;
- ArrayList attribfeilds = new ArrayList();
+ String[][] attribs;
+ ArrayList attribfeilds = new ArrayList();
ArrayList elementfeilds = new ArrayList();
- Iterator names = type.getAttributeNames();
- while (names.hasNext()){
+ Iterator names = type.getAttributeNames();
+ while (names.hasNext()){
attribfeilds.add(names.next());
- }
+ }
names = type.getElementnames();
while (names.hasNext()){
@@ -128,36 +126,38 @@
}
- //get all the fields
-
- attribs = new String[attribfeilds.size()+elementfeilds.size()][];
- for (int i = 0; i < attribfeilds.size(); i++) {
- //[variablename,typename,typeQNameURI,typeQNamelocalpart,attributeTypeURI,attributeTypeLocalpart]
- attribs[i] = new String[6];
- attribs[i][0] = ((String) attribfeilds.get(i));
+ //get all the fields
+ int intAttrFieldSz = attribfeilds.size();
+ int intEleFieldSz = elementfeilds.size();
+ attribs = new String[intAttrFieldSz+intEleFieldSz][];
+
+ for (int i = 0 ; i < intAttrFieldSz; i++) {
+ //[variablename,typename,typeQNameURI,typeQNamelocalpart,attributeTypeURI,attributeTypeLocalpart]
+ attribs[i] = new String[6];
+ attribs[i][0] = ((String) attribfeilds.get(i));
- Type attribType = type.getTypForAttribName(attribs[i][0]);
+ Type attribType = type.getTypForAttribName(attribs[i][0]);
- if(CPPUtils.isSimpleType(attribType.getName()))
- attribs[i][1] = CPPUtils.getclass4qname(attribType.getName());
- else
- attribs[i][1] = attribType.getLanguageSpecificName();
+ if(CUtils.isSimpleType(attribType.getName()))
+ attribs[i][1] = CUtils.getclass4qname(attribType.getName());
+ else
+ attribs[i][1] = attribType.getLanguageSpecificName();
- attribs[i][2] = attribType.getName().getNamespaceURI();
- attribs[i][3] = attribType.getName().getLocalPart();
+ attribs[i][2] = attribType.getName().getNamespaceURI();
+ attribs[i][3] = attribType.getName().getLocalPart();
- attribs[i][4] = null;
+ attribs[i][4] = null;
attribs[i][5] = null;
- }
-
- for (int i = attribfeilds.size(); i < elementfeilds.size()+attribfeilds.size(); i++) {
+ }
+
+ for (int i = intAttrFieldSz ; i < intAttrFieldSz+intEleFieldSz; i++) {
attribs[i] = new String[6];
attribs[i][0] = ((String) elementfeilds.get(i));
Type elementType = type.getElementForElementName(attribs[i][0]).getType();
- if(CPPUtils.isSimpleType(elementType.getName()))
- attribs[i][1] = CPPUtils.getclass4qname(elementType.getName());
+ if(CUtils.isSimpleType(elementType.getName()))
+ attribs[i][1] = CUtils.getclass4qname(elementType.getName());
else
attribs[i][1] = elementType.getLanguageSpecificName();
@@ -171,26 +171,21 @@
attribs[i][4] = null;
attribs[i][5] = null;
}
- }
-
-
- return attribs;
+ }
+ return attribs;
}
protected String getCorrectParmNameConsideringArraysAndComplexTypes(QName name,String classname)throws WrapperFault{
//System.out.println(name);
Type t = wscontext.getTypemap().getType(name);
- if(!CUtils.isSimpleType(name)){ //array or complex types
+ if(!TypeMap.isSimpleType(name)){ //array or complex types
if (t.isArray()){
return t.getLanguageSpecificName();
}
else{
return classname+"*"; //All complex types will be pointers
}
- }else if (name != null){
- return CUtils.getclass4qname(name);
- }
- else
+ }else
return classname;
}
No revision
No revision
1.1.2.2 +1 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/Attic/BeanParamWriter.java
Index: BeanParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/Attic/BeanParamWriter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BeanParamWriter.java 7 Jan 2004 11:21:16 -0000 1.1.2.1
+++ BeanParamWriter.java 9 Jan 2004 04:59:14 -0000 1.1.2.2
@@ -184,7 +184,7 @@
if(CPPUtils.isSimpleType(attribs[i][1])){
//if symple type
//TODO deserialize from attribute if this is an attribute
- writer.write("\tparam->"+attribs[i][0]+" = pIWSDZ->"+CPPUtils.getParameterGetValueMethodName(attribs[i][1], false)+";\n");
+ writer.write("\tparam->"+attribs[i][0]+" = pIWSDZ->"+CPPUtils.getParameterGetValueMethodName(attribs[i][1], false)+"(\""+attribs[i][0]+"\",0);\n");
}else if((t = wscontext.getTypemap().getType(new QName(attribs[i][2],attribs[i][3])))!= null && t.isArray()){
//if Array
QName qname = WrapperUtils.getArrayType(t).getName();
1.1.2.2 +7 -7 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/Attic/CPPUtils.java
Index: CPPUtils.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/Attic/CPPUtils.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- CPPUtils.java 7 Jan 2004 11:21:16 -0000 1.1.2.1
+++ CPPUtils.java 9 Jan 2004 04:59:14 -0000 1.1.2.2
@@ -90,8 +90,8 @@
class2QNamemap.put("xsd__time", new QName(WrapperConstants.SCHEMA_NAMESPACE, "time"));
class2QNamemap.put("xsd__base64Binary", new QName(WrapperConstants.SCHEMA_NAMESPACE, "base64Binary"));
class2QNamemap.put("xsd__hexBinary", new QName(WrapperConstants.SCHEMA_NAMESPACE, "hexBinary"));
- class2QNamemap.put("xsd_decimal", new QName(WrapperConstants.SCHEMA_NAMESPACE, "decimal"));
- class2QNamemap.put("xsd_boolean", new QName(WrapperConstants.SCHEMA_NAMESPACE, "boolean"));
+ class2QNamemap.put("xsd__decimal", new QName(WrapperConstants.SCHEMA_NAMESPACE, "decimal"));
+ class2QNamemap.put("xsd__boolean", new QName(WrapperConstants.SCHEMA_NAMESPACE, "boolean"));
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "int"), "int");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "byte"), "unsigned char");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "float"), "float");
@@ -99,17 +99,17 @@
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "double"), "double");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "char"), "char");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "short"), "short");
- qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "string"), "string");
+ qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "string"), "xsd__string");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "dateTime"), "xsd__dateTime");
- qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "date"), "xsd_date");
- qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "time"), "xsd_time");
+ qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "date"), "xsd__date");
+ qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "time"), "xsd__time");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "base64Binary"), "xsd__base64Binary");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "hexBinary"), "xsd__hexBinary");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "decimal"), "xsd__decimal");
qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "boolean"), "xsd__boolean");
type2getValueMethodName.put("int","Int");
type2getValueMethodName.put("float","Float");
- type2getValueMethodName.put("string","String");
+ type2getValueMethodName.put("xsd__string","String");
type2getValueMethodName.put("long","Long");
type2getValueMethodName.put("short","Short");
type2getValueMethodName.put("char","Char");
@@ -127,7 +127,7 @@
type2getValueMethodName.put("xsd__boolean","Boolean");
type2BasicArrayName.put("int","xsd__int_Array");
type2BasicArrayName.put("float","xsd__float_Array");
- type2BasicArrayName.put("string","xsd__string_Array");
+ type2BasicArrayName.put("xsd__string","xsd__string_Array");
type2BasicArrayName.put("long","xsd__long_Array");
type2BasicArrayName.put("short","xsd__short_Array");
type2BasicArrayName.put("char","xsd__byte_Array");
1.1.2.2 +0 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/Attic/ParamWriter.java
Index: ParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/Attic/ParamWriter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ParamWriter.java 7 Jan 2004 11:21:16 -0000 1.1.2.1
+++ ParamWriter.java 9 Jan 2004 04:59:14 -0000 1.1.2.2
@@ -66,7 +66,6 @@
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.Iterator;
import javax.xml.namespace.QName;