Author: prestonf
Date: Fri Mar 3 06:58:17 2006
New Revision: 382844
URL: http://svn.apache.org/viewcvs?rev=382844&view=rev
Log:
Make changes in accordance with comments in AXISCPP-610.
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java?rev=382844&r1=382843&r2=382844&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
(original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
Fri Mar 3 06:58:17 2006
@@ -59,8 +59,6 @@
import org.apache.axis.wsdl.wsdl2ws.info.WrapperInfo;
import org.w3c.dom.Node;
-import sun.security.action.GetLongAction;
-
/**
* This this the main class for the WSDL2Ws Tool. This class reuses the code
in the
* Axis java implementations to parse the WSDL file.
@@ -505,52 +503,63 @@
Iterator paramlist;
paramlist = op.getInput().getMessage().getParts().values().iterator();
- Part part = (Part) paramlist.next();
- QName minfoqname;
- element = symbolTable.getElement(part.getElementName());
- if (element == null)
- {
- // the part reference a type.
- qname = symbolTable.getType(part.getTypeName()).getQName();
- minfoqname = symbolTable.getType(part.getTypeName()).getQName();
- }
- else
- {
- qname = element.getRefType().getQName();
- minfoqname = element.getQName();
+
+ Part part = null;
+
+ if( paramlist.hasNext())
+ {
+ part = (Part) paramlist.next();
+ }
+
+ if( part != null)
+ {
+ QName minfoqname;
+ element = symbolTable.getElement(part.getElementName());
+
+ if (element == null)
+ {
+ // the part reference a type.
+ qname = symbolTable.getType(part.getTypeName()).getQName();
+ minfoqname =
symbolTable.getType(part.getTypeName()).getQName();
+ }
+ else
+ {
+ qname = element.getRefType().getQName();
+ minfoqname = element.getQName();
+ }
+
+ minfo.setInputMessage(minfoqname);
+
+ if (qname != null)
+ {
+ type = this.typeMap.getType(qname);
+ boolean wrapped = wsdlWrappingStyle;
+
+ if (type == null)
+ {
+ throw new WrapperFault(
+ "unregistered type " + qname + " referred");
+ }
+
+ if (wrapped)
+ {
+ //get inner attributes and elements and add them as
parameters
+ addInputElementsToMethodInfo(minfo, type);
+ addInputAttributesToMethodInfo(minfo, type);
+ }
+ else
+ { // for non-wrapped style wsdl's
+ String elementName = (String)
element.getQName().getLocalPart();
+ pinfo = new ParameterInfo(type, elementName);
+ pinfo.setElementName(type.getName());
+ if (type.getName().equals(CUtils.anyTypeQname))
+ {
+ pinfo.setAnyType(true);
+ }
+ minfo.addInputParameter(pinfo);
+ }
+ }
}
- minfo.setInputMessage(minfoqname);
-
- if (qname != null)
- {
- type = this.typeMap.getType(qname);
- boolean wrapped = wsdlWrappingStyle;
-
- if (type == null)
- {
- throw new WrapperFault(
- "unregistered type " + qname + " referred");
- }
-
- if (wrapped)
- {
- //get inner attributes and elements and add them as parameters
- addInputElementsToMethodInfo(minfo, type);
- addInputAttributesToMethodInfo(minfo, type);
- }
- else
- { // for non-wrapped style wsdl's
- String elementName = (String)
element.getQName().getLocalPart();
- pinfo = new ParameterInfo(type, elementName);
- pinfo.setElementName(type.getName());
- if (type.getName().equals(CUtils.anyTypeQname))
- {
- pinfo.setAnyType(true);
- }
- minfo.addInputParameter(pinfo);
- }
- }
-
}
/**
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java?rev=382844&r1=382843&r2=382844&view=diff
==============================================================================
---
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
(original)
+++
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
Fri Mar 3 06:58:17 2006
@@ -524,12 +524,16 @@
writer.write ("\t}\n");
writer.write ("\tm_pCall->setSOAPVersion(SOAP_VER_1_1);\n");
//TODO check which version is it really.
- writer.write ("\tm_pCall->setOperation(\""
- + minfo.getInputMessage ().getLocalPart ()
- + "\", \""
- + minfo.getInputMessage ().getNamespaceURI ()
- + "\");\n");
-
+
+ if( minfo.getInputMessage() != null)
+ {
+ writer.write( "\tm_pCall->setOperation(\"" +
+ minfo.getInputMessage().getLocalPart() +
+ "\", \"" +
+ minfo.getInputMessage().getNamespaceURI() +
+ "\");\n");
+ }
+
// Add attributes to soap method
for (int i = 0; i < paramsB.size (); i++)
{
