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/23 07:09:07 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal ParmHeaderFileWriter.java
samisa 2004/08/22 22:09:07
Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws CUtils.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
ParmHeaderFileWriter.java
Log:
Added the hack by Dirk to solve the namespace prefix problem
Revision Changes Path
1.20 +13 -0 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CUtils.java 4 Jul 2004 12:49:17 -0000 1.19
+++ CUtils.java 23 Aug 2004 05:09:06 -0000 1.20
@@ -125,6 +125,7 @@
qname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "unsignedShort"), "xsd__unsignedShort");
qname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "QName"), "xsd__QName");
+
/* TODO:
* Another strange issue from Axis 1.1 runtime when base64binary is in input/output operations.
*/
@@ -259,9 +260,15 @@
}
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){
@@ -360,6 +367,12 @@
/*if (value != null) {
v.add(value);
}*/
+ //Samisa 23/08/2004
+ // HACK wollsch
+ if (value.indexOf(':')>0) {
+ value=value.substring(value.indexOf(':')+1,value.length());
+ }
+ //Samisa
v.add(new QName(value, enumKind.getLocalPart()));
}
}
1.18 +7 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java
Index: ParmHeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ParmHeaderFileWriter.java 20 Aug 2004 13:03:39 -0000 1.17
+++ ParmHeaderFileWriter.java 23 Aug 2004 05:09:06 -0000 1.18
@@ -85,7 +85,10 @@
for(int i=1; i<restrictionData.size();i++){
QName value = (QName)restrictionData.elementAt(i);
if ("enumeration".equals(value.getLocalPart())){
+ //writer.write("static const "+classname+" "+classname+"_"+value.getNamespaceURI()+" = \""+ value.getNamespaceURI()+"\";\n");
+ //Samisa 23/08/2004
writer.write("static const "+classname+" "+classname+"_"+value.getNamespaceURI()+" = \""+ value.getNamespaceURI()+"\";\n");
+ //Samisa
}else if("maxLength".equals(value.getLocalPart())){
writer.write("static const int "+classname+"_MaxLength = "+value.getNamespaceURI()+";\n");
}else if("minLength".equals(value.getLocalPart())){
@@ -126,7 +129,10 @@
for(int i=1; i<restrictionData.size();i++){
QName value = (QName)restrictionData.elementAt(i);
if ("enumeration".equals(value.getLocalPart())){
- writer.write("static const "+classname+" "+classname+"_"+value.getNamespaceURI()+" = "+ value.getNamespaceURI()+";\n");
+ //writer.write("static const "+classname+" "+classname+"_"+value.getNamespaceURI()+" = "+ value.getNamespaceURI()+";\n");
+ //Samisa 23/08/2004
+ writer.write("static const "+classname+" "+classname+"_"+value.getNamespaceURI()+" = \""+ value.getNamespaceURI()+"\";\n");
+ //Samisa
}
}
}