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 na...@apache.org on 2008/08/19 06:05:13 UTC
svn commit: r686955 [3/4] - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws: ./ c/
c/literal/ cpp/ cpp/literal/ info/
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java Mon Aug 18 21:05:12 2008
@@ -52,7 +52,7 @@
public ParamWriter(WebServiceContext wscontext, Type type) throws WrapperFault
{
- super(WrapperUtils.getLanguageTypeName4Type(type));
+ super(CUtils.getLanguageTypeName4Type(type));
this.wscontext = wscontext;
this.type = type;
populateAttribList();
@@ -99,8 +99,8 @@
Type elementType = elemi.getType();
- if (CUtils.getclass4qname(elementType.getName()) != null)
- extensionBaseAttrib.setTypeName(CUtils.getclass4qname(elementType.getName()));
+ if (CUtils.getBasicTypeForQName(elementType.getName()) != null)
+ extensionBaseAttrib.setTypeName(CUtils.getBasicTypeForQName(elementType.getName()));
else
{
extensionBaseAttrib.setTypeName(elementType.getLanguageSpecificName());
@@ -136,7 +136,7 @@
this.attribs[i] = new ParameterInfo();
this.attribs[i].setParamName(attr.getName(), wscontext.getTypemap());
if (CUtils.isSimpleType(attr.getType().getName()))
- this.attribs[i].setTypeName(CUtils.getclass4qname(attr.getType().getName()));
+ this.attribs[i].setTypeName(CUtils.getBasicTypeForQName(attr.getType().getName()));
else
{
this.attribs[i].setTypeName(attr.getType().getLanguageSpecificName());
@@ -158,7 +158,7 @@
this.attribs[i].setAnyType(true);
if (CUtils.isSimpleType(elementType.getName()))
- this.attribs[i].setTypeName(CUtils.getclass4qname(elementType.getName()));
+ this.attribs[i].setTypeName(CUtils.getBasicTypeForQName(elementType.getName()));
else
{
this.attribs[i].setTypeName(elementType.getLanguageSpecificName());
@@ -177,13 +177,13 @@
if (elementType.isArray())
{
- Type arrayType = WrapperUtils.getArrayType(elementType);
+ Type arrayType = CUtils.getArrayType(elementType);
//get contained type
this.attribs[i].setArray(true);
if (CUtils.isSimpleType(arrayType.getName()))
{
- this.attribs[i].setTypeName(CUtils.getclass4qname(arrayType.getName()));
+ this.attribs[i].setTypeName(CUtils.getBasicTypeForQName(arrayType.getName()));
this.attribs[i].setSimpleType(true);
}
else
@@ -224,7 +224,7 @@
if (attrib.isSimpleType())
isPtrType = CUtils.isPointerType(attrib.getTypeName());
else
- isPtrType = CUtils.isPointerType(CUtils.getclass4qname(attrib.getType().getBaseType()));
+ isPtrType = CUtils.isPointerType(CUtils.getBasicTypeForQName(attrib.getType().getBaseType()));
if (isPtrType)
return attrib.getTypeName();
@@ -251,7 +251,7 @@
}
else if (attribs[index].getType().isSimpleType())
{
- if (!CUtils.isPointerType(CUtils.getclass4qname(attribs[index].getType().getBaseType())))
+ if (!CUtils.isPointerType(CUtils.getBasicTypeForQName(attribs[index].getType().getBaseType())))
bNillable = attribs[index].isNillable();
}
}
@@ -271,7 +271,7 @@
}
else if (attribs[index].getType().isSimpleType())
{
- if (!CUtils.isPointerType(CUtils.getclass4qname(attribs[index].getType().getBaseType())))
+ if (!CUtils.isPointerType(CUtils.getBasicTypeForQName(attribs[index].getType().getBaseType())))
bOptional = attribs[index].isOptional();
}
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java?rev=686955&r1=686954&r2=686955&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 Mon Aug 18 21:05:12 2008
@@ -78,7 +78,7 @@
* @author hemapani@opensource.lk
* @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
* @author hawkeye (hawkinsj@uk.ibm.com)
- * @author amra (amra@us.ibm.com)
+ * @author nadir amra (amra@us.ibm.com)
*/
public class WSDL2Ws
{
@@ -172,10 +172,11 @@
c_targetoutputLocation = "." + File.separator;
c_targetoutputLocation = (new File(c_targetoutputLocation)).getCanonicalPath();
- // language c or c++
+ // language c or c++ - CUtils.setLanguage MUST be invoked at the very beginning!
c_language = cmdLineArgs.getOptionBykey("l");
if (c_language == null)
c_language = "c++";
+ CUtils.setLanguage(c_language);
// generate artifacts for server, client or both?
c_targetEngine = cmdLineArgs.getOptionBykey("s");
@@ -234,14 +235,12 @@
* @throws WrapperFault
*/
public void generateWrappers() throws Exception
- {
- CUtils.setLanguage(c_language);
-
+ {
// ==================================================
// Generate types, populating the type map
// ==================================================
- c_typeMap = new TypeMap(c_language);
+ c_typeMap = new TypeMap();
Iterator it = c_symbolTable.getTypeIndex().values().iterator();
while (it.hasNext())
@@ -296,7 +295,7 @@
c_wsdlInfo.getTargetNameSpaceOfWSDL());
// Service info
- String serviceName = WrapperUtils.getClassNameFromFullyQualifiedName(portType.getQName().getLocalPart());
+ String serviceName = CUtils.getClassNameFromFullyQualifiedName(portType.getQName().getLocalPart());
ArrayList serviceMethods = processServiceMethods(portType, bindingEntry);
ServiceInfo serviceInfo = new ServiceInfo(serviceName, serviceMethods, WSDLInfo.getTargetEndPointURI(port));
@@ -873,7 +872,7 @@
return typedata;
}
- typedata = new Type(newqn, newqn.getLocalPart(), c_language);
+ typedata = new Type(newqn, newqn.getLocalPart());
if (type.getRefType().getRefType() != null)
typedata.setElementType(type.getRefType().getRefType().getQName().getLocalPart());
@@ -892,7 +891,7 @@
return typedata;
}
- typedata = new Type(type.getQName(), type.getQName().getLocalPart(), c_language);
+ typedata = new Type(type.getQName(), type.getQName().getLocalPart());
}
// Add type to type map
@@ -923,7 +922,7 @@
+ type.getQName().getLocalPart() + "=====\n");
}
else
- CUtils.setRestrictionBaseAndValues(typedata, node, c_symbolTable);
+ c_wsdlInfo.setRestrictionBaseAndValues(typedata, node);
// There can be attributes in this extended basic type
Vector attributes = CSchemaUtils.getContainedAttributeTypes(type.getNode(), c_symbolTable);
@@ -1031,8 +1030,7 @@
if (elem.getAnyElement())
{
- newSecondaryType = new Type(CUtils.anyTypeQname,
- CUtils.anyTypeQname.getLocalPart(), c_language);
+ newSecondaryType = new Type(CUtils.anyTypeQname, CUtils.anyTypeQname.getLocalPart());
}
else
{
@@ -1426,7 +1424,7 @@
String minfo_nm = minfo.getMethodname();
String type_nm = type.getLanguageSpecificName();
- String newName = WrapperUtils.capitalizeFirstCharacter(type_nm);
+ String newName = CUtils.capitalizeFirstCharacter(type_nm);
if (!minfo_nm.equals(newName))
return newName;
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java Mon Aug 18 21:05:12 2008
@@ -34,7 +34,6 @@
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
@@ -86,7 +85,7 @@
public boolean isSimpleTypeArray() throws WrapperFault
{
- QName qname = WrapperUtils.getArrayType(type).getName();
+ QName qname = CUtils.getArrayType(type).getName();
return CUtils.isSimpleType(qname);
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java Mon Aug 18 21:05:12 2008
@@ -34,7 +34,6 @@
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
@@ -73,7 +72,7 @@
writer.write("#include \"" + classname + ".h\"\n");
// include header file for the contained type
- QName qname = WrapperUtils.getArrayType(type).getName();
+ QName qname = CUtils.getArrayType(type).getName();
if (!CUtils.isSimpleType(qname))
writer.write("#include \"" + attribs[0].getTypeName() + CUtils.C_HEADER_SUFFIX + "\"\n");
this.writer.write("\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java Mon Aug 18 21:05:12 2008
@@ -161,7 +161,7 @@
String basicType = null;
if (!attribs[i].isSimpleType() && type.isSimpleType())
- basicType = CUtils.getclass4qname(type.getBaseType());
+ basicType = CUtils.getBasicTypeForQName(type.getBaseType());
else
basicType = attribs[i].getTypeName();
@@ -265,7 +265,7 @@
{
String baseTypeName = null;
if (!attribs[i].isSimpleType() && attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getclass4qname(attribs[i].getType().getBaseType());
+ baseTypeName = CUtils.getBasicTypeForQName(attribs[i].getType().getBaseType());
else
baseTypeName = attribs[i].getTypeName();
@@ -295,7 +295,7 @@
String typeName = attribs[i].getTypeName();
String baseTypeName = null;
if (attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getclass4qname (attribs[i].getType().getBaseType ());
+ baseTypeName = CUtils.getBasicTypeForQName (attribs[i].getType().getBaseType ());
else
baseTypeName = typeName;
@@ -607,7 +607,7 @@
{
String baseTypeName = null;
if (!attribs[i].isSimpleType() && attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getclass4qname(attribs[i].getType().getBaseType());
+ baseTypeName = CUtils.getBasicTypeForQName(attribs[i].getType().getBaseType());
else
baseTypeName = attribs[i].getTypeName();
@@ -651,7 +651,7 @@
Type type = attribs[i].getType();
boolean isPointerType = false;
if (type.isSimpleType())
- isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
+ isPointerType = CUtils.isPointerType(CUtils.getBasicTypeForQName(type.getBaseType()));
else
isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
@@ -666,7 +666,7 @@
writer.write(tab2 + "param->"
+ attribs[i].getParamNameAsMember() + " = "
+ "axiscSoapDeSerializer"
- + CUtils.getParameterGetValueMethodName(
+ + CUtils.getDeserializerMethodNameForType(
attribs[i].getTypeName(), attribs[i].isAttribute()) + "(pDZ, \""
+ soapTagName + "\",0);\n");
}
@@ -679,7 +679,7 @@
writer.write(tab2 + "\t" + attribs[i].getTypeName() + " * "
+ attribs[i].getParamNameAsMember() + " = "
+ "axiscSoapDeSerializer"
- + CUtils.getParameterGetValueMethodName(attribs[i].getTypeName(), attribs[i].isAttribute())
+ + CUtils.getDeserializerMethodNameForType(attribs[i].getTypeName(), attribs[i].isAttribute())
+ "(pDZ, \"" + elementNameToSearchFor + "\",0);\n");
writer.write(tab2 + "\tif (" + attribs[i].getParamNameAsMember() + " != NULL)\n");
@@ -844,7 +844,7 @@
String baseTypeName = null;
if (!attribs[i].isSimpleType() && attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getclass4qname(attribs[i].getType().getBaseType());
+ baseTypeName = CUtils.getBasicTypeForQName(attribs[i].getType().getBaseType());
else
baseTypeName = attribs[i].getTypeName();
@@ -910,7 +910,7 @@
String baseTypeName = null;
if (!attribs[i].isSimpleType() && attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getclass4qname(attribs[i].getType().getBaseType());
+ baseTypeName = CUtils.getBasicTypeForQName(attribs[i].getType().getBaseType());
else
baseTypeName = attribs[i].getTypeName();
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java Mon Aug 18 21:05:12 2008
@@ -29,7 +29,6 @@
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
import org.apache.axis.wsdl.wsdl2ws.info.ParameterInfo;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
@@ -115,7 +114,7 @@
{
ParameterInfo returnParam =
(ParameterInfo) minfo.getOutputParameterTypes().iterator().next();
- String outParamTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returnParam, wscontext);
+ String outParamTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(returnParam, wscontext);
if ((outParamTypeName.lastIndexOf ("_Array") > 0)
|| (CUtils.isSimpleType(outParamTypeName)
&& (returnParam.isNillable() || returnParam.isOptional())
@@ -140,7 +139,7 @@
writer.write(", ");
ParameterInfo fparam = (ParameterInfo) params.next();
- String paramTypeName = WrapperUtils
+ String paramTypeName = CUtils
.getClassNameFromParamInfoConsideringArrays(
fparam,
wscontext);
@@ -168,7 +167,7 @@
writer.write(", ");
ParameterInfo nparam = (ParameterInfo) params.next();
- String paramTypeName = WrapperUtils
+ String paramTypeName = CUtils
.getClassNameFromParamInfoConsideringArrays(
nparam,
wscontext);
@@ -198,7 +197,7 @@
ParameterInfo nparam = (ParameterInfo) params.next();
writer.write(
", AXISC_OUT_PARAM "
- + WrapperUtils
+ + CUtils
.getClassNameFromParamInfoConsideringArrays(
nparam,
wscontext)
@@ -235,7 +234,7 @@
if (atype.isAnonymous() && !atype.isExternalized())
continue;
- typeName = WrapperUtils.getLanguageTypeName4Type(atype);
+ typeName = CUtils.getLanguageTypeName4Type(atype);
if (null != typeName)
typeSet.add(typeName);
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java Mon Aug 18 21:05:12 2008
@@ -31,7 +31,6 @@
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.FaultInfo;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
import org.apache.axis.wsdl.wsdl2ws.info.ParameterInfo;
@@ -180,8 +179,7 @@
String outparamTypeName = null;
if (returntype != null)
{
- outparamTypeName =
- WrapperUtils.getClassNameFromParamInfoConsideringArrays(returntype, wscontext);
+ outparamTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(returntype, wscontext);
retType = wscontext.getTypemap().getType(returntype.getSchemaName());
if (retType != null)
{
@@ -221,7 +219,7 @@
writer.write(", ");
paramTypeName =
- WrapperUtils.getClassNameFromParamInfoConsideringArrays((ParameterInfo) paramsB.get(i), wscontext);
+ CUtils.getClassNameFromParamInfoConsideringArrays((ParameterInfo) paramsB.get(i), wscontext);
typeissimple = CUtils.isSimpleType(paramTypeName);
if (typeissimple
@@ -244,7 +242,7 @@
type = wscontext.getTypemap().getType(
((ParameterInfo) paramsC.get(i)).getSchemaName());
writer.write(", AXISC_OUT_PARAM "
- + WrapperUtils.getClassNameFromParamInfoConsideringArrays(
+ + CUtils.getClassNameFromParamInfoConsideringArrays(
(ParameterInfo) paramsC.get(i),wscontext) + " *OutValue" + i);
}
}
@@ -259,8 +257,8 @@
if (returntypeisarray)
{
QName qname = null;
- if (WrapperUtils.getArrayType (retType) != null)
- qname = WrapperUtils.getArrayType (retType).getName ();
+ if (CUtils.getArrayType (retType) != null)
+ qname = CUtils.getArrayType (retType).getName ();
else
qname = retType.getName ();
if (CUtils.isSimpleType (qname))
@@ -281,7 +279,7 @@
}
else
{
- String initValue = CUtils.getInitValue(outparamTypeName);
+ String initValue = CUtils.getInitValueForBasicType(outparamTypeName);
if (initValue != null)
writer.write(outparamTypeName + " Ret = " + initValue + ";\n");
else if (outparamTypeName.equals("xsdc__dateTime")
@@ -352,11 +350,11 @@
if (typeisarray)
{
//arrays
- QName qname = WrapperUtils.getArrayType(type).getName();
+ QName qname = CUtils.getArrayType(type).getName();
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getclass4qname(qname);
+ containedType = CUtils.getBasicTypeForQName(qname);
writer.write("\taxiscCallAddBasicArrayParameter(call, ");
writer.write("(Axisc_Array *)Value" + i + ", "
+ CUtils.getXSDTypeForBasicType(containedType)
@@ -452,11 +450,11 @@
// coding here.
if (typeisarray)
{
- QName qname = WrapperUtils.getArrayType(type).getName();
+ QName qname = CUtils.getArrayType(type).getName();
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getclass4qname(qname);
+ containedType = CUtils.getBasicTypeForQName(qname);
writer.write("\n\t\tAxisc_Array * pReturn" + i
+ " = axiscCallGetBasicArray(call, "
+ CUtils.getXSDTypeForBasicType (containedType)
@@ -509,7 +507,7 @@
if (CUtils.isPointerType(currentParaType))
{
- String xsdType = WrapperUtils.getClassNameFromParamInfoConsideringArrays ((ParameterInfo) paramsC.get (i), wscontext);
+ String xsdType = CUtils.getClassNameFromParamInfoConsideringArrays ((ParameterInfo) paramsC.get (i), wscontext);
if( !CUtils.isPointerType(xsdType))
xsdType += " *";
@@ -541,7 +539,7 @@
}
else
{
- writer.write( "\t\t" + currentParaType + " * pReturn" + i + " = axiscCall" + CUtils.getParameterGetValueMethodName( currentParaType, false) + "(call, \"" + currentType.getParamNameAsSOAPString() + "\", 0);\n");
+ writer.write( "\t\t" + currentParaType + " * pReturn" + i + " = axiscCall" + CUtils.getDeserializerMethodNameForType( currentParaType, false) + "(call, \"" + currentType.getParamNameAsSOAPString() + "\", 0);\n");
writer.write( "\n");
writer.write( "\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
writer.write( "\t\t{\n");
@@ -578,11 +576,11 @@
}
else if (returntypeisarray)
{
- QName qname = WrapperUtils.getArrayType(retType).getName();
+ QName qname = CUtils.getArrayType(retType).getName();
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getclass4qname(qname);
+ containedType = CUtils.getBasicTypeForQName(qname);
writer.write("\t\t\tRetArray = (" + containedType + "_Array *)axiscCallGetBasicArray(call, "
+ CUtils.getXSDTypeForBasicType(containedType) + ",\""
+ paramTagName + "\",0);\n");
@@ -611,7 +609,7 @@
writer.write(" *");
writer.write(" pReturn = axiscCall"
- + CUtils.getParameterGetValueMethodName(outparamTypeName,
+ + CUtils.getDeserializerMethodNameForType(outparamTypeName,
false) + "(call, \"" + paramTagName + "\", 0);\n\n");
writer.write("\t\t\tif( pReturn)\n");
writer.write("\t\t\t{\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java Mon Aug 18 21:05:12 2008
@@ -116,7 +116,7 @@
if (!CUtils.isSimpleType(baseType))
return;
- String baseTypeName = CUtils.getclass4qname(baseType);
+ String baseTypeName = CUtils.getBasicTypeForQName(baseType);
String langTypeName;
// User defined simple type based on another user-defined simple type
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java Mon Aug 18 21:05:12 2008
@@ -27,7 +27,6 @@
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
import org.apache.axis.wsdl.wsdl2ws.info.ParameterInfo;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
@@ -78,7 +77,7 @@
{
ParameterInfo returnParam =
(ParameterInfo) minfo.getOutputParameterTypes().iterator().next();
- String outParamTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returnParam, wscontext);
+ String outParamTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(returnParam, wscontext);
if ((outParamTypeName.lastIndexOf ("_Array") > 0)
|| (CUtils.isSimpleType(outParamTypeName)
&& (returnParam.isNillable() || returnParam.isOptional())
@@ -102,12 +101,12 @@
{
writer.write(", ");
ParameterInfo nparam = (ParameterInfo) params.next();
- String paramTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(nparam, wscontext);
+ String paramTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(nparam, wscontext);
Type type = nparam.getType();
String baseTypeName = null;
if (type.isSimpleType())
- baseTypeName = CUtils.getclass4qname (type.getBaseType ());
+ baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
else
baseTypeName = paramTypeName;
@@ -128,12 +127,12 @@
for (int j = 0; params.hasNext(); j++)
{
ParameterInfo nparam = (ParameterInfo) params.next();
- String paramType = WrapperUtils.getClassNameFromParamInfoConsideringArrays( nparam, wscontext);
+ String paramType = CUtils.getClassNameFromParamInfoConsideringArrays( nparam, wscontext);
Type type = nparam.getType();
String baseTypeName = null;
if (type.isSimpleType())
- baseTypeName = CUtils.getclass4qname (type.getBaseType ());
+ baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
else
baseTypeName = paramType;
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java Mon Aug 18 21:05:12 2008
@@ -31,7 +31,6 @@
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperConstants;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
import org.apache.axis.wsdl.wsdl2ws.info.ParameterInfo;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
@@ -78,7 +77,7 @@
retType = wscontext.getTypemap().getType(returntype.getSchemaName());
if (retType != null)
{
- outparamType = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returntype, wscontext);
+ outparamType = CUtils.getClassNameFromParamInfoConsideringArrays(returntype, wscontext);
if (retType.isSimpleType())
returntypeissimple = true;
else
@@ -133,14 +132,14 @@
{
if (type.isSimpleType ())
{
- baseTypeName = CUtils.getclass4qname (type.getBaseType ());
- paramTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
+ baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ paramTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
}
else
{
paramTypeName = type.getLanguageSpecificName ();
if (CUtils.isSimpleType (paramTypeName))
- paramTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
+ paramTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
typeisarray = (paramTypeName.lastIndexOf ("_Array") > 0);
if (!typeisarray)
@@ -183,14 +182,14 @@
{
if (type.isSimpleType ())
{ //schema defined simpleType
- baseTypeName = CUtils.getclass4qname (type.getBaseType ());
- paramTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
+ baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ paramTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
}
else
{
paramTypeName = type.getLanguageSpecificName ();
if (CUtils.isSimpleType (paramTypeName))
- paramTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
+ paramTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
typeisarray = (paramTypeName.lastIndexOf ("_Array") > 0);
if (!typeisarray)
@@ -234,9 +233,9 @@
type = wscontext.getTypemap ().getType (((ParameterInfo) paramsC.get (i)).getSchemaName ());
ParameterInfo param = (ParameterInfo) paramsC.get (i);
- String paramType = WrapperUtils.getClassNameFromParamInfoConsideringArrays (param, wscontext);
+ String paramType = CUtils.getClassNameFromParamInfoConsideringArrays (param, wscontext);
if (type.isSimpleType())
- baseTypeName = CUtils.getclass4qname(type.getBaseType());
+ baseTypeName = CUtils.getBasicTypeForQName(type.getBaseType());
else
baseTypeName = paramType;
@@ -280,8 +279,8 @@
if (returntypeisarray)
{
QName qname = null;
- if (WrapperUtils.getArrayType (retType) != null)
- qname = WrapperUtils.getArrayType (retType).getName ();
+ if (CUtils.getArrayType (retType) != null)
+ qname = CUtils.getArrayType (retType).getName ();
else
qname = retType.getName ();
if (CUtils.isSimpleType (qname))
@@ -302,7 +301,7 @@
writer.write(outparamType + "* Ret = NULL;\n");
else
{
- String initValue = CUtils.getInitValue(outparamType);
+ String initValue = CUtils.getInitValueForBasicType(outparamType);
if (initValue != null)
writer.write(outparamType + " Ret = " + initValue + ";\n");
else if (CUtils.getXSDTypeForBasicType( outparamType).equals("XSDC_DATETIME")
@@ -403,12 +402,12 @@
if (type != null)
{
if (type.isSimpleType())
- paramTypeName = CUtils.getclass4qname(type.getBaseType());
+ paramTypeName = CUtils.getBasicTypeForQName(type.getBaseType());
else
{
paramTypeName = type.getLanguageSpecificName();
if (CUtils.isSimpleType(paramTypeName))
- paramTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(param,wscontext);
+ paramTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(param,wscontext);
typeisarray = (paramTypeName.lastIndexOf("_Array") > 0);
if (!typeisarray)
@@ -473,7 +472,7 @@
}
else if (typeisarray)
{
- Type arrayType = WrapperUtils.getArrayType (type);
+ Type arrayType = CUtils.getArrayType (type);
QName qname = null;
if (arrayType != null)
@@ -484,14 +483,14 @@
if (CUtils.isSimpleType (qname))
{
// Array of simple type
- String containedType = CUtils.getclass4qname (qname);
+ String containedType = CUtils.getBasicTypeForQName (qname);
writer.write ("\t\taxiscCallAddBasicArrayParameter(call,");
writer.write ("(Axisc_Array *)Value" + i + ", " +
CUtils.getXSDTypeForBasicType(containedType) + ", cPrefixAndParamName" + i);
}
else if (arrayType != null && arrayType.isSimpleType ())
{
- String containedType = CUtils.getclass4qname (arrayType.getBaseType ());
+ String containedType = CUtils.getBasicTypeForQName (arrayType.getBaseType ());
writer.write ("\t\taxiscCallAddBasicArrayParameter(call,");
writer.write ("(Axisc_Array *)Value" + i + ", " +
CUtils.getXSDTypeForBasicType(containedType) +
@@ -606,12 +605,12 @@
{
if (type.isSimpleType ())
{
- baseTypeName = CUtils.getclass4qname (type.getBaseType ());
- currentParaType = WrapperUtils.getClassNameFromParamInfoConsideringArrays(currentType, wscontext);
+ baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ currentParaType = CUtils.getClassNameFromParamInfoConsideringArrays(currentType, wscontext);
}
else
{
- currentParaType = WrapperUtils.getClassNameFromParamInfoConsideringArrays(currentType, wscontext);
+ currentParaType = CUtils.getClassNameFromParamInfoConsideringArrays(currentType, wscontext);
typeisarray = (currentParaType.lastIndexOf("_Array") > 0);
}
@@ -633,8 +632,8 @@
if (typeisarray)
{
QName qname = null;
- if (WrapperUtils.getArrayType (type) != null)
- qname = WrapperUtils.getArrayType (type).getName ();
+ if (CUtils.getArrayType (type) != null)
+ qname = CUtils.getArrayType (type).getName ();
else
qname = type.getName ();
@@ -642,7 +641,7 @@
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getclass4qname(qname);
+ containedType = CUtils.getBasicTypeForQName(qname);
writer.write("\n\t\t\tOutValue" + i + " = axiscCallGetBasicArray(call, "
+ CUtils.getXSDTypeForBasicType (containedType)
@@ -691,7 +690,7 @@
writer.write("\t\t\t{\n"); // begin scope
if (CUtils.isPointerType(baseTypeName))
{
- String xsdType = WrapperUtils.getClassNameFromParamInfoConsideringArrays ((ParameterInfo) paramsC.get (i), wscontext);
+ String xsdType = CUtils.getClassNameFromParamInfoConsideringArrays ((ParameterInfo) paramsC.get (i), wscontext);
if( !CUtils.isPointerType(baseTypeName))
{
@@ -703,7 +702,7 @@
writer.write( "\t\t\t" + currentParaType + " pReturn" + i + " = "
+ "axiscCall"
- + CUtils.getParameterGetValueMethodName( baseTypeName, false)
+ + CUtils.getDeserializerMethodNameForType( baseTypeName, false)
+ "(call, \"" + currentType.getParamNameAsSOAPString() + "\", 0);\n");
writer.write( "\n");
writer.write( "\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
@@ -734,7 +733,7 @@
{
writer.write( "\t\t\t" + currentParaType + " * pReturn" + i + " = "
+ "axiscCall"
- + CUtils.getParameterGetValueMethodName( baseTypeName, false)
+ + CUtils.getDeserializerMethodNameForType( baseTypeName, false)
+ "(call, \"" + currentType.getParamNameAsSOAPString() + "\", 0);\n");
writer.write( "\n");
writer.write( "\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
@@ -794,14 +793,14 @@
else if (returntypeisarray)
{
QName qname = null;
- if (WrapperUtils.getArrayType (retType) != null)
- qname = WrapperUtils.getArrayType (retType).getName ();
+ if (CUtils.getArrayType (retType) != null)
+ qname = CUtils.getArrayType (retType).getName ();
else
qname = retType.getName ();
String containedType = null;
if (CUtils.isSimpleType (qname))
{
- containedType = CUtils.getclass4qname (qname);
+ containedType = CUtils.getBasicTypeForQName (qname);
writer.write ("\t\t\tRetArray =(" + containedType + "_Array *) axiscCallGetBasicArray(call, "
+ CUtils.getXSDTypeForBasicType (containedType)
+ ", \"" + returntype.getParamNameAsSOAPString () + "\", 0);\n");
@@ -827,7 +826,7 @@
if (returntype.isNillable () || returntype.isOptional() || CUtils.isPointerType(outparamType))
{
writer.write( "\t\t\tRet = axiscCall"
- + CUtils.getParameterGetValueMethodName( outparamType, false)
+ + CUtils.getDeserializerMethodNameForType( outparamType, false)
+ "(call, \"" + returntype.getParamNameAsSOAPString() + "\", 0);\n");
writer.write( "\t\t}\n");
}
@@ -835,7 +834,7 @@
{
writer.write ("\t\t\t" + outparamType + " * pReturn = "
+ "axiscCall"
- + CUtils.getParameterGetValueMethodName(outparamType, false)
+ + CUtils.getDeserializerMethodNameForType(outparamType, false)
+ "(call, \"" + returntype.getElementNameAsSOAPString() + "\", 0);\n");
writer.write ("\t\t\tif(pReturn)\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamHeaderWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamHeaderWriter.java Mon Aug 18 21:05:12 2008
@@ -34,7 +34,6 @@
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
@@ -65,7 +64,7 @@
}
//include header file for the contained type
- QName qname = WrapperUtils.getArrayType(type).getName();
+ QName qname = CUtils.getArrayType(type).getName();
if (!CUtils.isSimpleType(qname))
writer.write("#include \""+ attribs[0].getTypeName() + ".hpp\"\n");
@@ -91,7 +90,7 @@
public boolean isSimpleTypeArray() throws WrapperFault
{
- QName qname = WrapperUtils.getArrayType(type).getName();
+ QName qname = CUtils.getArrayType(type).getName();
return CUtils.isSimpleType(qname);
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java Mon Aug 18 21:05:12 2008
@@ -201,7 +201,7 @@
boolean isPointerType = false;
if (attributeType.isSimpleType())
- isPointerType = CUtils.isPointerType(CUtils.getclass4qname(attributeType.getBaseType()));
+ isPointerType = CUtils.isPointerType(CUtils.getBasicTypeForQName(attributeType.getBaseType()));
else
isPointerType = CUtils.isPointerType(getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i]));
@@ -377,7 +377,7 @@
String basicType = null;
if (!attribs[i].isSimpleType() && attrType.isSimpleType())
- basicType = CUtils.getclass4qname(attrType.getBaseType());
+ basicType = CUtils.getBasicTypeForQName(attrType.getBaseType());
else
basicType = attribs[i].getTypeName();
@@ -481,7 +481,7 @@
{
String baseTypeName = null;
if (!attribs[i].isSimpleType() && attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getclass4qname(attribs[i].getType().getBaseType());
+ baseTypeName = CUtils.getBasicTypeForQName(attribs[i].getType().getBaseType());
else
baseTypeName = attribs[i].getTypeName();
@@ -510,7 +510,7 @@
String typeName = attribs[i].getTypeName();
String baseTypeName = null;
if (attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getclass4qname (attribs[i].getType().getBaseType ());
+ baseTypeName = CUtils.getBasicTypeForQName (attribs[i].getType().getBaseType ());
else
baseTypeName = typeName;
@@ -832,7 +832,7 @@
{
String baseTypeName = null;
if (!attribs[i].isSimpleType() && attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getclass4qname(attribs[i].getType().getBaseType());
+ baseTypeName = CUtils.getBasicTypeForQName(attribs[i].getType().getBaseType());
else
baseTypeName = attribs[i].getTypeName();
@@ -874,27 +874,27 @@
Type type = attribs[i].getType();
boolean isPointerType = false;
if (type.isSimpleType())
- isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
+ isPointerType = CUtils.isPointerType(CUtils.getBasicTypeForQName(type.getBaseType()));
else
isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
String typeName = attribs[i].getTypeName();
String baseTypeName = null;
if (type.isSimpleType())
- baseTypeName = CUtils.getclass4qname (type.getBaseType ());
+ baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
else
baseTypeName = typeName;
if( isPointerType)
{
writer.write(tab2 + typeName + " pValue" + i + " = pIWSDZ->" +
- CUtils.getParameterGetValueMethodName(baseTypeName, attribs[i].isAttribute()) +
+ CUtils.getDeserializerMethodNameForType(baseTypeName, attribs[i].isAttribute()) +
"(\"" + soapTagName + "\", 0);\n");
}
else
{
writer.write(tab2 + typeName + " * pValue" + i + " = pIWSDZ->" +
- CUtils.getParameterGetValueMethodName(baseTypeName, attribs[i].isAttribute()) +
+ CUtils.getDeserializerMethodNameForType(baseTypeName, attribs[i].isAttribute()) +
"(\"" + soapTagName + "\", 0);\n");
}
@@ -1160,7 +1160,7 @@
Type type = attribs[i].getType();
boolean isPointerType = false;
if (type.isSimpleType())
- isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
+ isPointerType = CUtils.isPointerType(CUtils.getBasicTypeForQName(type.getBaseType()));
else
isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
@@ -1214,7 +1214,7 @@
Type type = attribs[i].getType();
boolean isPointerType = false;
if (type.isSimpleType())
- isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
+ isPointerType = CUtils.isPointerType(CUtils.getBasicTypeForQName(type.getBaseType()));
else
isPointerType = CUtils.isPointerType(typename);
@@ -1305,7 +1305,7 @@
{
CUtils.printMethodComment(writer, "Function used to check whether object has allowed values. Not implemented yet.");
- boolean isPtrType = CUtils.isPointerType( CUtils.getclass4qname( type.getBaseType()));
+ boolean isPtrType = CUtils.isPointerType( CUtils.getBasicTypeForQName( type.getBaseType()));
writer.write("int Check_Restrictions_" + classname + "(" + classname + " value)\n");
writer.write("{\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java Mon Aug 18 21:05:12 2008
@@ -29,7 +29,6 @@
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.FaultInfo;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
import org.apache.axis.wsdl.wsdl2ws.info.ParameterInfo;
@@ -122,7 +121,7 @@
{
ParameterInfo returnParam =
(ParameterInfo) minfo.getOutputParameterTypes().iterator().next();
- String outParamTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returnParam, wscontext);
+ String outParamTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(returnParam, wscontext);
if ((outParamTypeName.lastIndexOf ("_Array") > 0)
||(CUtils.isSimpleType(outParamTypeName)
&& (returnParam.isNillable() || returnParam.isOptional())
@@ -144,7 +143,7 @@
if (params.hasNext())
{
ParameterInfo fparam = (ParameterInfo) params.next();
- String paramTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(fparam,wscontext);
+ String paramTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(fparam,wscontext);
if ((paramTypeName.lastIndexOf ("_Array") > 0)
||(CUtils.isSimpleType(paramTypeName)
&& fparam.isNillable()
@@ -157,7 +156,7 @@
for (int j = 1; params.hasNext(); j++)
{
ParameterInfo nparam = (ParameterInfo) params.next();
- String paramTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(nparam, wscontext);
+ String paramTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(nparam, wscontext);
if ((paramTypeName.lastIndexOf ("_Array") > 0)
|| (CUtils.isSimpleType(paramTypeName)
&& nparam.isNillable()
@@ -174,7 +173,7 @@
{
ParameterInfo nparam = (ParameterInfo) params.next();
writer.write(", AXIS_OUT_PARAM "
- + WrapperUtils.getClassNameFromParamInfoConsideringArrays(nparam,wscontext)
+ + CUtils.getClassNameFromParamInfoConsideringArrays(nparam,wscontext)
+ " *OutValue"
+ j);
}
@@ -218,7 +217,7 @@
if (atype.isAnonymous() && !atype.isExternalized())
continue;
- typeName = WrapperUtils.getLanguageTypeName4Type(atype);
+ typeName = CUtils.getLanguageTypeName4Type(atype);
if (null != typeName)
typeSet.add(typeName);
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java Mon Aug 18 21:05:12 2008
@@ -41,7 +41,6 @@
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.FaultInfo;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
import org.apache.axis.wsdl.wsdl2ws.info.ParameterInfo;
@@ -213,7 +212,7 @@
if (returntype != null)
{
- outparamType = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returntype, wscontext);
+ outparamType = CUtils.getClassNameFromParamInfoConsideringArrays(returntype, wscontext);
retType = wscontext.getTypemap().getType(returntype.getSchemaName());
if (retType != null)
{
@@ -251,7 +250,7 @@
for (int i = 0; i < paramsB.size(); i++)
{
paramTypeName =
- WrapperUtils.getClassNameFromParamInfoConsideringArrays((ParameterInfo) paramsB.get(i), wscontext);
+ CUtils.getClassNameFromParamInfoConsideringArrays((ParameterInfo) paramsB.get(i), wscontext);
if (i > 0)
writer.write(", ");
@@ -276,7 +275,7 @@
{
type = wscontext.getTypemap().getType(((ParameterInfo) paramsC.get(i)).getSchemaName());
writer.write(", AXIS_OUT_PARAM "
- + WrapperUtils.getClassNameFromParamInfoConsideringArrays(
+ + CUtils.getClassNameFromParamInfoConsideringArrays(
(ParameterInfo) paramsC.get(i),wscontext) + " *OutValue" + i);
}
}
@@ -306,7 +305,7 @@
}
else
{
- String initValue = CUtils.getInitValue (outparamType);
+ String initValue = CUtils.getInitValueForBasicType (outparamType);
if (initValue != null)
writer.write (outparamType + " Ret = " + initValue + ";\n");
else if (CUtils.getXSDTypeForBasicType( outparamType).equals("XSD_DATETIME")
@@ -399,11 +398,11 @@
if (typeisarray)
{
//arrays
- QName qname = WrapperUtils.getArrayType(type).getName();
+ QName qname = CUtils.getArrayType(type).getName();
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getclass4qname(qname);
+ containedType = CUtils.getBasicTypeForQName(qname);
writer.write("\t\tm_pCall->addBasicArrayParameter( ");
writer.write("Value" + i + ", "
+ CUtils.getXSDTypeForBasicType(containedType)
@@ -500,11 +499,11 @@
// Some code need to be merged as we have some duplicated in coding here.
if (typeisarray)
{
- QName qname = WrapperUtils.getArrayType(type).getName();
+ QName qname = CUtils.getArrayType(type).getName();
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getclass4qname(qname);
+ containedType = CUtils.getBasicTypeForQName(qname);
writer.write("\n\t\t\tAxis_Array * pReturn" + i + " = m_pCall->getBasicArray( " + CUtils.getXSDTypeForBasicType (containedType)
+ ",\"" + paramTagName
+ "\", 0);\n\n");
@@ -556,13 +555,13 @@
if (CUtils.isPointerType(currentParaType))
{
- String xsdType = WrapperUtils.getClassNameFromParamInfoConsideringArrays ((ParameterInfo) paramsC.get (i), wscontext);
+ String xsdType = CUtils.getClassNameFromParamInfoConsideringArrays ((ParameterInfo) paramsC.get (i), wscontext);
if( !CUtils.isPointerType(xsdType))
xsdType += " *";
writer.write( "\t\t\t" + currentParaType + " pReturn" + i
- + " = m_pCall->" + CUtils.getParameterGetValueMethodName( currentParaType, false)
+ + " = m_pCall->" + CUtils.getDeserializerMethodNameForType( currentParaType, false)
+ "( \"" + paramTagName + "\", 0);\n");
writer.write( "\n");
writer.write( "\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
@@ -593,7 +592,7 @@
else
{
writer.write( "\t\t\t" + currentParaType + " * pReturn" + i + " = m_pCall->"
- + CUtils.getParameterGetValueMethodName( currentParaType, false)
+ + CUtils.getDeserializerMethodNameForType( currentParaType, false)
+ "( \"" + paramTagName + "\", 0);\n");
writer.write( "\n");
writer.write( "\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
@@ -631,11 +630,11 @@
}
else if (returntypeisarray)
{
- QName qname = WrapperUtils.getArrayType(retType).getName();
+ QName qname = CUtils.getArrayType(retType).getName();
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getclass4qname(qname);
+ containedType = CUtils.getBasicTypeForQName(qname);
writer.write("\t\t\t\tAxis_Array * RetAxisArray = m_pCall->getBasicArray( "
+ CUtils.getXSDTypeForBasicType(containedType) + ",\""
+ paramTagName + "\",0);\n");
@@ -662,13 +661,13 @@
if (returntype.isNillable () || CUtils.isPointerType(outparamType))
{
writer.write( "\t\t\t\tRet = m_pCall->"
- + CUtils.getParameterGetValueMethodName( outparamType, false)
+ + CUtils.getDeserializerMethodNameForType( outparamType, false)
+ "(\"" + returntype.getParamNameAsSOAPString() + "\", 0);\n");
}
else
{
writer.write ("\t\t\t\t" + outparamType + " * pReturn = m_pCall->" +
- CUtils.getParameterGetValueMethodName(outparamType, false) + "(\"" +
+ CUtils.getDeserializerMethodNameForType(outparamType, false) + "(\"" +
returntype.getElementNameAsSOAPString() + "\", 0);\n");
writer.write ("\t\t\t\tif(pReturn)\n");
writer.write ("\t\t\t\t{\n");
@@ -800,7 +799,7 @@
ParameterInfo par = (ParameterInfo) paramInfo.get (i);
paramName = par.getParamName ();
langName = par.getLangName ();
- faultType = WrapperUtils.getClassNameFromParamInfoConsideringArrays (par,wscontext);
+ faultType = CUtils.getClassNameFromParamInfoConsideringArrays (par,wscontext);
if (j > 1)
{
writer.write ("\t\t\telse if");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java Mon Aug 18 21:05:12 2008
@@ -124,7 +124,7 @@
boolean isPointerType = false;
if (type.isSimpleType())
- isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
+ isPointerType = CUtils.isPointerType(CUtils.getBasicTypeForQName(type.getBaseType()));
else
isPointerType = CUtils.isPointerType(getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i]));
@@ -167,7 +167,7 @@
if (!CUtils.isSimpleType(baseType))
return;
- String baseTypeName = CUtils.getclass4qname(baseType);
+ String baseTypeName = CUtils.getBasicTypeForQName(baseType);
String langTypeName;
// User defined simple type based on another user-defined simple type
@@ -405,7 +405,7 @@
Type type = attribs[i].getType();
boolean isPointerType;
if (type.isSimpleType())
- isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
+ isPointerType = CUtils.isPointerType(CUtils.getBasicTypeForQName(type.getBaseType()));
else
isPointerType = CUtils.isPointerType(paramType);
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java Mon Aug 18 21:05:12 2008
@@ -29,7 +29,6 @@
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.FaultInfo;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
import org.apache.axis.wsdl.wsdl2ws.info.ParameterInfo;
@@ -135,7 +134,7 @@
.iterator()
.next();
String returnTypeName = returntype.getLangName();
- String returnType = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returntype,wscontext);
+ String returnType = CUtils.getClassNameFromParamInfoConsideringArrays(returntype,wscontext);
if ((returnType.lastIndexOf ("_Array") > 0)
|| (CUtils.isSimpleType(returnTypeName)
@@ -172,7 +171,7 @@
hasInputParms = true;
ParameterInfo fparam = (ParameterInfo) params.next();
String paramTypeName = fparam.getLangName();
- String paramType = WrapperUtils.getClassNameFromParamInfoConsideringArrays(fparam,wscontext);
+ String paramType = CUtils.getClassNameFromParamInfoConsideringArrays(fparam,wscontext);
if (fparam.getType().isAttachment())
{
@@ -191,7 +190,7 @@
else
{
writer.write(
- WrapperUtils
+ CUtils
.getClassNameFromParamInfoConsideringArrays(
fparam,
wscontext)
@@ -204,7 +203,7 @@
ParameterInfo nparam = (ParameterInfo) params.next();
String paramTypeName = nparam.getLangName();
- String typeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(nparam,wscontext);
+ String typeName = CUtils.getClassNameFromParamInfoConsideringArrays(nparam,wscontext);
if (nparam.getType().isAttachment())
{
@@ -242,7 +241,7 @@
writer.write(",");
}
- String typeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(
+ String typeName = CUtils.getClassNameFromParamInfoConsideringArrays(
nparam, wscontext);
writer.write(" AXIS_OUT_PARAM "
@@ -295,7 +294,7 @@
if (!atype.isExternalized())
continue;
- typeName = WrapperUtils.getLanguageTypeName4Type(atype);
+ typeName = CUtils.getLanguageTypeName4Type(atype);
if (null != typeName)
typeSet.add(typeName);
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java Mon Aug 18 21:05:12 2008
@@ -28,7 +28,6 @@
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
import org.apache.axis.wsdl.wsdl2ws.info.ParameterInfo;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
@@ -156,7 +155,7 @@
.iterator()
.next();
String returnTypeName = returntype.getLangName();
- String returnType = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returntype,wscontext);
+ String returnType = CUtils.getClassNameFromParamInfoConsideringArrays(returntype,wscontext);
if ((returnType.lastIndexOf ("_Array") > 0)||(CUtils.isSimpleType(returntype.getLangName())
&& (returntype.isNillable()|| returntype.isOptional())
&& !(CUtils.isPointerType(returnTypeName))))
@@ -188,7 +187,7 @@
hasInputParms = true;
ParameterInfo fparam = (ParameterInfo) params.next();
String fparamTypeName = fparam.getLangName();
- String fparamType = WrapperUtils.getClassNameFromParamInfoConsideringArrays(fparam,wscontext);
+ String fparamType = CUtils.getClassNameFromParamInfoConsideringArrays(fparam,wscontext);
if (fparam.getType().isAttachment())
{
@@ -216,7 +215,7 @@
{
ParameterInfo nparam = (ParameterInfo) params.next();
String paramTypeName = nparam.getLangName();
- String paramType = WrapperUtils.getClassNameFromParamInfoConsideringArrays(nparam,wscontext);
+ String paramType = CUtils.getClassNameFromParamInfoConsideringArrays(nparam,wscontext);
if (nparam.getType().isAttachment())
{
@@ -254,7 +253,7 @@
writer.write(",");
}
- String typeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(
+ String typeName = CUtils.getClassNameFromParamInfoConsideringArrays(
nparam, wscontext);
writer.write(" AXIS_OUT_PARAM "
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java Mon Aug 18 21:05:12 2008
@@ -31,7 +31,6 @@
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.FaultInfo;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
import org.apache.axis.wsdl.wsdl2ws.info.ParameterInfo;
@@ -246,7 +245,7 @@
if (returntype != null)
{
outparamTypeName =
- WrapperUtils.getClassNameFromParamInfoConsideringArrays(
+ CUtils.getClassNameFromParamInfoConsideringArrays(
returntype,
wscontext);
retType =
@@ -310,7 +309,7 @@
{
paraTypeName = ((ParameterInfo) paramsB.get(i)).getLangName();
paramType =
- WrapperUtils.getClassNameFromParamInfoConsideringArrays(
+ CUtils.getClassNameFromParamInfoConsideringArrays(
(ParameterInfo) paramsB.get(i),
wscontext);
parameterName = ((ParameterInfo) paramsB.get(i)).getParamNameAsSOAPString();
@@ -329,7 +328,7 @@
+ " value"
+ i
+ " = pIWSDZ->"
- + CUtils.getParameterGetValueMethodName(paraTypeName, false)
+ + CUtils.getDeserializerMethodNameForType(paraTypeName, false)
+ "(\""
+ parameterName + "\",0);\n");
writer.write("\tif (value" + i + ")\n");
@@ -347,7 +346,7 @@
+ "* pValue"
+ i
+ " = pIWSDZ->"
- + CUtils.getParameterGetValueMethodName(paraTypeName, false)
+ + CUtils.getDeserializerMethodNameForType(paraTypeName, false)
+ "(\""
+ parameterName + "\",0);\n");
writer.write("\tif (pValue" + i + ")\n");
@@ -368,7 +367,7 @@
+ " value"
+ i
+ " = pIWSDZ->"
- + CUtils.getParameterGetValueMethodName(paraTypeName, false)
+ + CUtils.getDeserializerMethodNameForType(paraTypeName, false)
+ "(\""
+ parameterName + "\",0);\n");
writer.write("\tif (value" + i + ")\n");
@@ -381,7 +380,7 @@
else
{
writer.write("\n\t" + paraTypeName + " v" + i);
- String typeInitValue = CUtils.getInitValue(paraTypeName);
+ String typeInitValue = CUtils.getInitValueForBasicType(paraTypeName);
if (typeInitValue != null)
writer.write(" = " + typeInitValue);
@@ -391,7 +390,7 @@
+ " * pValue"
+ i
+ " = pIWSDZ->"
- + CUtils.getParameterGetValueMethodName(paraTypeName, false)
+ + CUtils.getDeserializerMethodNameForType(paraTypeName, false)
+ "(\""
+ parameterName + "\",0);\n");
writer.write("\tif (pValue" + i + ")\n");
@@ -409,11 +408,11 @@
!= null
&& type.isArray())
{
- QName qname = WrapperUtils.getArrayType(type).getName();
+ QName qname = CUtils.getArrayType(type).getName();
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getclass4qname(qname);
+ containedType = CUtils.getBasicTypeForQName(qname);
writer.write("\n\t" + containedType + "_Array * v" + i +" = new " + containedType + "_Array();\n");
writer.write(
@@ -481,7 +480,7 @@
for (int i = 0; i < paramsC.size(); i++)
{
ParameterInfo param = (ParameterInfo) paramsC.get(i);
- String typeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(
+ String typeName = CUtils.getClassNameFromParamInfoConsideringArrays(
(ParameterInfo) paramsC.get(i), wscontext);
writer.write("\t" + typeName);
@@ -544,11 +543,11 @@
else
if (returntypeisarray)
{
- QName qname = WrapperUtils.getArrayType(retType).getName();
+ QName qname = CUtils.getArrayType(retType).getName();
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getclass4qname(qname);
+ containedType = CUtils.getBasicTypeForQName(qname);
writer.write(
"\t\tnStatus = pIWSSZ->addOutputBasicArrayParam(ret,"
+ CUtils.getXSDTypeForBasicType(containedType)
@@ -671,11 +670,11 @@
if (returntypeisarray)
{
QName qname =
- WrapperUtils.getArrayType(retType).getName();
+ CUtils.getArrayType(retType).getName();
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getclass4qname(qname);
+ containedType = CUtils.getBasicTypeForQName(qname);
writer.write(
"\t\tpIWSSZ->addOutputBasicArrayParam((Axis_Array*)(&out"
+ i
@@ -766,7 +765,7 @@
paramName = par.getParamName();
langName = par.getLangName();
faultType =
- WrapperUtils.getClassNameFromParamInfoConsideringArrays(
+ CUtils.getClassNameFromParamInfoConsideringArrays(
par,
wscontext);
writeExceptions(faultType, faultInfoName, paramName, langName);
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java?rev=686955&r1=686954&r2=686955&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java Mon Aug 18 21:05:12 2008
@@ -34,7 +34,6 @@
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
import org.apache.axis.wsdl.wsdl2ws.info.ParameterInfo;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
@@ -72,7 +71,7 @@
{
ParameterInfo returnParam =
(ParameterInfo) minfo.getOutputParameterTypes().iterator().next();
- String outParamTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returnParam, wscontext);
+ String outParamTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(returnParam, wscontext);
if ((outParamTypeName.lastIndexOf ("_Array") > 0)
|| (CUtils.isSimpleType(outParamTypeName)
&& (returnParam.isNillable() || returnParam.isOptional())
@@ -98,12 +97,12 @@
writer.write(", ");
hasInputParms = true;
ParameterInfo nparam = (ParameterInfo) params.next();
- String paramTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(nparam, wscontext);
+ String paramTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(nparam, wscontext);
Type type = nparam.getType();
String baseTypeName = null;
if (type.isSimpleType())
- baseTypeName = CUtils.getclass4qname (type.getBaseType ());
+ baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
else
baseTypeName = paramTypeName;
@@ -124,12 +123,12 @@
for (int j = 0; params.hasNext(); j++)
{
ParameterInfo nparam = (ParameterInfo) params.next();
- String paramType = WrapperUtils.getClassNameFromParamInfoConsideringArrays( nparam, wscontext);
+ String paramType = CUtils.getClassNameFromParamInfoConsideringArrays( nparam, wscontext);
Type type = nparam.getType();
String baseTypeName = null;
if (type.isSimpleType())
- baseTypeName = CUtils.getclass4qname (type.getBaseType ());
+ baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
else
baseTypeName = paramType;