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/10/26 08:07:19 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp BeanParamWriter.java ClientStubWriter.java WrapWriter.java
susantha 2003/10/26 00:07:19
Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws WSDL2Ws.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c WrapWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
BeanParamWriter.java ClientStubWriter.java
WrapWriter.java
Log:
corrected code generation so that some compiler warnings of generated code are avoided
Revision Changes Path
1.7 +2 -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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WSDL2Ws.java 25 Oct 2003 10:23:30 -0000 1.6
+++ WSDL2Ws.java 26 Oct 2003 07:07:18 -0000 1.7
@@ -349,7 +349,8 @@
if (targetLanguage == null) targetLanguage = "c++";
if (targetEngine == null) targetEngine = "server";
if (targetoutputLocation == null) targetoutputLocation = "./";
-
+ QName serviceqname = getServiceEntry().getService().getQName();
+ servicename = serviceqname.getLocalPart();
ArrayList methods = this.getServiceInfo(this.porttype, targetLanguage);
TypeMap typeMap = this.getTypeInfo(targetLanguage);
//TODO chaeck weather the name at the WrapperConstant Doclit is right "doc"
1.9 +5 -5 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/WrapWriter.java
Index: WrapWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/WrapWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WrapWriter.java 22 Oct 2003 03:40:05 -0000 1.8
+++ WrapWriter.java 26 Oct 2003 07:07:18 -0000 1.9
@@ -281,14 +281,14 @@
}
else{
containedType = qname.getLocalPart();
- writer.write("\t"+paraTypeName+" v"+i+" = ("+paraTypeName+"&)pIWSDZ->GetArray((AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_"+containedType+
- "\n\t\t, (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_"+containedType+", (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_"+containedType+
- "\n\t\t, (AXIS_OBJECT_SIZE_FUNCT)Axis_GetSize_"+containedType+", Axis_TypeName_"+containedType+", Axis_URI_"+containedType+");\n");
+ writer.write("\t"+paraTypeName+" v"+i+" = ("+paraTypeName+"&)pIWSDZ->GetArray((void*)Axis_DeSerialize_"+containedType+
+ "\n\t\t, (void*)Axis_Create_"+containedType+", (void*)Axis_Delete_"+containedType+
+ "\n\t\t, (void*)Axis_GetSize_"+containedType+", Axis_TypeName_"+containedType+", Axis_URI_"+containedType+");\n");
}
}else{
//for complex types
- writer.write("\t"+paraTypeName+" *v"+i+" = ("+paraTypeName+"*)pIWSDZ->GetObject((AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_"+paraTypeName+
- "\n\t\t, (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_"+paraTypeName+", (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_"+paraTypeName+
+ writer.write("\t"+paraTypeName+" *v"+i+" = ("+paraTypeName+"*)pIWSDZ->GetObject((void*)Axis_DeSerialize_"+paraTypeName+
+ "\n\t\t, (void*)Axis_Create_"+paraTypeName+", (void*)Axis_Delete_"+paraTypeName+
"\n\t\t, Axis_TypeName_"+paraTypeName+", Axis_URI_"+paraTypeName+");\n");
}
}
1.9 +5 -5 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java
Index: BeanParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BeanParamWriter.java 22 Oct 2003 03:40:05 -0000 1.8
+++ BeanParamWriter.java 26 Oct 2003 07:07:18 -0000 1.9
@@ -204,14 +204,14 @@
}
else{
arrayType = qname.getLocalPart();
- writer.write("\tparam->"+attribs[i][0]+" = ("+attribs[i][1]+"&)pIWSDZ->GetArray((AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_"+arrayType+
- "\n\t\t, (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_"+arrayType+", (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_"+arrayType+
- "\n\t\t, (AXIS_OBJECT_SIZE_FUNCT)Axis_GetSize_"+arrayType+", Axis_TypeName_"+arrayType+", Axis_URI_"+arrayType+");\n");
+ writer.write("\tparam->"+attribs[i][0]+" = ("+attribs[i][1]+"&)pIWSDZ->GetArray((void*)Axis_DeSerialize_"+arrayType+
+ "\n\t\t, (void*)Axis_Create_"+arrayType+", (void*)Axis_Delete_"+arrayType+
+ "\n\t\t, (void*)Axis_GetSize_"+arrayType+", Axis_TypeName_"+arrayType+", Axis_URI_"+arrayType+");\n");
}
}else{
//if complex type
- writer.write("\tparam->"+attribs[i][0]+" = ("+attribs[i][1]+"*)pIWSDZ->GetObject((AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_"+attribs[i][1]+
- "\n\t\t, (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_"+attribs[i][1]+", (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_"+attribs[i][1]+
+ writer.write("\tparam->"+attribs[i][0]+" = ("+attribs[i][1]+"*)pIWSDZ->GetObject((void*)Axis_DeSerialize_"+attribs[i][1]+
+ "\n\t\t, (void*)Axis_Create_"+attribs[i][1]+", (void*)Axis_Delete_"+attribs[i][1]+
"\n\t\t, Axis_TypeName_"+attribs[i][1]+", Axis_URI_"+attribs[i][1]+");\n");
}
}
1.14 +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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ClientStubWriter.java 22 Oct 2003 03:40:05 -0000 1.13
+++ ClientStubWriter.java 26 Oct 2003 07:07:18 -0000 1.14
@@ -113,7 +113,7 @@
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->SetHeader(\"SOAPAction\", \""+classname+"\");\n");
+ writer.write("\tm_pCall->SetHeader(\"SOAPAction\", \""+wscontext.getSerInfo().getServicename()+"\");\n");
writer.write("\tm_pCall->SetEndpointURI(\""+wscontext.getWrapInfo().getTargetEndpointURI()+"\");\n");
writer.write("}\n\n");
}catch(IOException e){
1.10 +5 -5 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java
Index: WrapWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WrapWriter.java 22 Oct 2003 03:40:05 -0000 1.9
+++ WrapWriter.java 26 Oct 2003 07:07:18 -0000 1.10
@@ -259,14 +259,14 @@
}
else{
containedType = qname.getLocalPart();
- writer.write("\t"+paraTypeName+" v"+i+" = ("+paraTypeName+"&)pIWSDZ->GetArray((AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_"+containedType+
- "\n\t\t, (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_"+containedType+", (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_"+containedType+
- "\n\t\t, (AXIS_OBJECT_SIZE_FUNCT)Axis_GetSize_"+containedType+", Axis_TypeName_"+containedType+", Axis_URI_"+containedType+");\n");
+ writer.write("\t"+paraTypeName+" v"+i+" = ("+paraTypeName+"&)pIWSDZ->GetArray((void*)Axis_DeSerialize_"+containedType+
+ "\n\t\t, (void*)Axis_Create_"+containedType+", (void*)Axis_Delete_"+containedType+
+ "\n\t\t, (void*)Axis_GetSize_"+containedType+", Axis_TypeName_"+containedType+", Axis_URI_"+containedType+");\n");
}
}else{
//for complex types
- writer.write("\t"+paraTypeName+" *v"+i+" = ("+paraTypeName+"*)pIWSDZ->GetObject((AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_"+paraTypeName+
- "\n\t\t, (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_"+paraTypeName+", (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_"+paraTypeName+
+ writer.write("\t"+paraTypeName+" *v"+i+" = ("+paraTypeName+"*)pIWSDZ->GetObject((void*)Axis_DeSerialize_"+paraTypeName+
+ "\n\t\t, (void*)Axis_Create_"+paraTypeName+", (void*)Axis_Delete_"+paraTypeName+
"\n\t\t, Axis_TypeName_"+paraTypeName+", Axis_URI_"+paraTypeName+");\n");
}
}