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 sa...@apache.org on 2004/08/27 03:24:59 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal BeanParamWriter.java
samisa 2004/08/26 18:24:59
Modified: c/src/wsdl build.xml
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws CUtils.java
WSDL2Ws.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
ClientStubWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
BeanParamWriter.java
Log:
Fixed few more of '>' (ANON_TOKEN) and also resolved the Null pointer problem.
Modified the ant build file to generate debug info
Revision Changes Path
1.4 +1 -1 ws-axis/c/src/wsdl/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 11 Aug 2004 12:53:05 -0000 1.3
+++ build.xml 27 Aug 2004 01:24:59 -0000 1.4
@@ -57,7 +57,7 @@
<!-- Compiles the source directory -->
<!-- =================================================================== -->
<target name="compile" depends="init">
- <javac srcdir="${src}" destdir="${classes}" listfiles="true">
+ <javac srcdir="${src}" destdir="${classes}" listfiles="true" debug="true">
<classpath refid="cp"/>
</javac>
</target>
1.21 +0 -6 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CUtils.java 23 Aug 2004 05:09:06 -0000 1.20
+++ CUtils.java 27 Aug 2004 01:24:59 -0000 1.21
@@ -260,15 +260,9 @@
}
public static String getXSDTypeForBasicType(String stype){
String enumName;
- //Samisa 23/08/2004
- System.out.println( "Could not find the type " + stype );
- //Samisa
if((enumName = (String)basicType2EnumMap.get(stype))!= null){
return enumName;
}
- //Samisa 23/08/2004
- System.out.println( "Could not find the type " + stype );
- //Samisa
return null;
}
public static String getCmplxArrayNameforType(QName qname){
1.37 +4 -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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- WSDL2Ws.java 20 Aug 2004 13:03:39 -0000 1.36
+++ WSDL2Ws.java 27 Aug 2004 01:24:59 -0000 1.37
@@ -553,7 +553,10 @@
if (CUtils.isBasicType(qn)) return null;
QName newqn = new QName(type.getQName().getNamespaceURI(), qn.getLocalPart()+"_Array");
typedata = new Type(newqn, newqn.getLocalPart(), true, targetLanguage);
- typedata.setElementType(type.getRefType().getRefType().getQName().getLocalPart());
+ if( type.getRefType().getRefType() != null )
+ typedata.setElementType(type.getRefType().getRefType().getQName().getLocalPart());
+ else
+ typedata.setElementType(type.getRefType().getQName().getLocalPart());
typeMap.addType(newqn, typedata);
}else {
typedata = new Type(type.getQName(), type.getQName().getLocalPart(), true, targetLanguage);
1.52 +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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ClientStubWriter.java 27 Aug 2004 00:22:40 -0000 1.51
+++ ClientStubWriter.java 27 Aug 2004 01:24:59 -0000 1.52
@@ -322,7 +322,7 @@
writer.write("\t\t\t\t" + currentParamName + " = ("+currentParaType+"&)m_pCall->getBasicArray("+CUtils.getXSDTypeForBasicType(containedType)+", \""+currentType.getParamName()+"\", 0);\n");
}
else{
- //containedType = qname.getLocalPart();
+ containedType = qname.getLocalPart();
writer.write("\t\t\t\t" + currentParamName + " = ("+currentParaType+"&)m_pCall->getCmplxArray((void*) Axis_DeSerialize_"+containedType);
writer.write("\t\t\t\t, (void*) Axis_Create_"+containedType+", (void*) Axis_Delete_"+containedType+", (void*) Axis_GetSize_"+containedType+", \""+currentType.getParamName()+"\", Axis_URI_"+containedType+");\n");
}
1.24 +4 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java
Index: BeanParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- BeanParamWriter.java 23 Aug 2004 00:45:31 -0000 1.23
+++ BeanParamWriter.java 27 Aug 2004 01:24:59 -0000 1.24
@@ -156,7 +156,8 @@
arrayType = attribs[i].getTypeName();
writer.write("\tpSZ->serializeCmplxArray((Axis_Array*)(¶m->"+attribs[i].getParamName()+"),\n");
writer.write("\t\t(void*) Axis_Serialize_"+arrayType+", (void*) Axis_Delete_"+arrayType+", (void*) Axis_GetSize_"+arrayType+",\n");
- writer.write("\t\t\""+attribs[i].getElementName().getLocalPart()+"\", Axis_URI_"+arrayType+");\n");
+ //writer.write("\t\t\""+attribs[i].getElementName().getLocalPart()+"\", Axis_URI_"+arrayType+");\n");
+ writer.write("\t\t\""+attribs[i].getElementNameAsString()+"\", Axis_URI_"+arrayType+");\n");
}
}
else if (attribs[i].isSimpleType()){
@@ -210,7 +211,8 @@
arrayType = attribs[i].getTypeName();
writer.write("\tarray = pIWSDZ->getCmplxArray((void*)Axis_DeSerialize_"+arrayType+
"\n\t\t, (void*)Axis_Create_"+arrayType+", (void*)Axis_Delete_"+arrayType+
- "\n\t\t, (void*)Axis_GetSize_"+arrayType+", \""+attribs[i].getElementName().getLocalPart()+"\", Axis_URI_"+arrayType+");\n");
+ // "\n\t\t, (void*)Axis_GetSize_"+arrayType+", \""+attribs[i].getElementName().getLocalPart()+"\", Axis_URI_"+arrayType+");\n");
+ "\n\t\t, (void*)Axis_GetSize_"+arrayType+", \""+attribs[i].getElementNameAsString()+"\", Axis_URI_"+arrayType+");\n");
writer.write("\tparam->"+attribs[i].getParamName()+" = ("+attribs[i].getTypeName()+"_Array&)array;\n");
}
}else if(attribs[i].isSimpleType()){