axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal BeanParamWriter.java ParmHeaderFileWriter.java
Date Mon, 11 Oct 2004 08:32:50 GMT
samisa      2004/10/11 01:32:50

  Modified:    c/src/wsdl/org/apache/axis/wsdl/wsdl2ws CUtils.java
                        ParamWriter.java
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
                        BeanParamWriter.java ParmHeaderFileWriter.java
  Log:
  Modifications to fix AXISCPP-96.
  Added support for NCName.
  Eliminated exit on null.
  
  Revision  Changes    Path
  1.24      +7 -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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- CUtils.java	8 Oct 2004 11:28:22 -0000	1.23
  +++ CUtils.java	11 Oct 2004 08:32:50 -0000	1.24
  @@ -75,6 +75,7 @@
   		class2QNamemap.put("xsd__unsignedLong", new QName(WrapperConstants.SCHEMA_NAMESPACE,
"unsignedLong"));
   		class2QNamemap.put("xsd__unsignedShort", new QName(WrapperConstants.SCHEMA_NAMESPACE,
"unsignedShort"));
   		class2QNamemap.put("xsd__QName", new QName(WrapperConstants.SCHEMA_NAMESPACE, "QName"));
  +		class2QNamemap.put("xsd__NCName", new QName(WrapperConstants.SCHEMA_NAMESPACE, "NCName"));
   		class2QNamemap.put("xsd__NMTOKEN", new QName(WrapperConstants.SCHEMA_NAMESPACE,"NMTOKEN"));
   
   		qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "int"), "int");
  @@ -99,6 +100,7 @@
   		qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "unsignedLong"), "xsd__unsignedLong");
   		qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "unsignedShort"), "xsd__unsignedShort");
   		qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "QName"), "xsd__QName");
  +		qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "NCName"), "xsd__NCName");
   		qname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "NMTOKEN"), "xsd__NMTOKEN");
   		
   		/* TODO:
  @@ -127,6 +129,7 @@
   		qname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "unsignedLong"), "xsd__unsignedLong");
   		qname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "unsignedShort"), "xsd__unsignedShort");
   		qname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "QName"), "xsd__QName");
	
  +		qname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "NCName"), "xsd__NCName");
	
   
   
   		/* TODO:
  @@ -155,6 +158,7 @@
   		type2getValueMethodName.put("xsd__boolean","Boolean");
   		type2getValueMethodName.put("xsd__anyURI","String");
   		type2getValueMethodName.put("xsd__QName","String");
  +		type2getValueMethodName.put("xsd__NCName","String");
   		type2getValueMethodName.put("xsd__NMTOKEN","String");
   		type2BasicArrayName.put("int","xsd__int_Array");
   		type2BasicArrayName.put("float","xsd__float_Array");
  @@ -176,6 +180,7 @@
   		type2BasicArrayName.put("xsd__boolean","xsd__boolean_Array");
   		type2BasicArrayName.put("xsd__anyURI","xsd__anyURI_Array");
   		type2BasicArrayName.put("xsd__QName","xsd__QName_Array");
  +		type2BasicArrayName.put("xsd__NCName","xsd__NCName_Array");
   		type2BasicArrayName.put("xsd__NMTOKEN","xsd__NMTOKEN_Array");
   		basicType2EnumMap.put("int","XSD_INT");
   		basicType2EnumMap.put("float","XSD_FLOAT");
  @@ -197,6 +202,7 @@
   		basicType2EnumMap.put("xsd__boolean","XSD_BOOLEAN");
   		basicType2EnumMap.put("xsd__anyURI","XSD_ANYURI");
   		basicType2EnumMap.put("xsd__QName","XSD_QNAME");
  +		basicType2EnumMap.put("xsd__NCName","XSD_NCNAME");
   		basicType2EnumMap.put("xsd__NMTOKEN","XSD_NMTOKEN");
   
   
  @@ -223,6 +229,7 @@
   		initValues.put("xsd__unsignedLong", "0"); 
   		initValues.put("xsd__unsignedShort", "0"); 
   		initValues.put("xsd__QName", "NULL"); 
  +		initValues.put("xsd__NCName", "NULL"); 
   		initValues.put("xsd__NMTOKEN", "NULL"); 
   	}
   	
  
  
  
  1.12      +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java
  
  Index: ParamWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ParamWriter.java	20 Aug 2004 13:03:39 -0000	1.11
  +++ ParamWriter.java	11 Oct 2004 08:32:50 -0000	1.12
  @@ -82,7 +82,7 @@
   			extensionBaseAttrib.setTypeName(CUtils.getclass4qname(elemi.getType().getName()));
   			extensionBaseAttrib.setType(elemi.getType());
   			extensionBaseAttrib.setElementName(elemi.getName());
  - 		}
  + 		} 
   		ArrayList attribfeilds = new ArrayList();
   		ArrayList elementfeilds = new ArrayList();
   
  
  
  
  1.31      +2 -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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- BeanParamWriter.java	7 Oct 2004 07:54:21 -0000	1.30
  +++ BeanParamWriter.java	11 Oct 2004 08:32:50 -0000	1.31
  @@ -149,7 +149,7 @@
   			}
   		}
   		writer.write("\tpSZ->serialize(\">\", 0);\n");
  -		if (extensionBaseAttrib != null){
  +		if (extensionBaseAttrib != null && extensionBaseAttrib.getTypeName() != null){
   			writer.write("\tpSZ->serializeAsChardata((void*)&(param->"+extensionBaseAttrib.getParamName()+"),
"+CUtils.getXSDTypeForBasicType(extensionBaseAttrib.getTypeName())+");\n");
   		}
   		writer.write("\t/* then serialize elements if any*/\n");
  @@ -256,7 +256,7 @@
   					"\n\t\t, \""+ soapTagName +"\", Axis_URI_"+attribs[i].getTypeName()+");\n");				
   			}		
   		}
  -		if (extensionBaseAttrib != null){
  +		if (extensionBaseAttrib != null && extensionBaseAttrib.getTypeName() != null){
   			writer.write("\tpIWSDZ->getChardataAs((void*)&(param->"+extensionBaseAttrib.getParamName()+"),
"+CUtils.getXSDTypeForBasicType(extensionBaseAttrib.getTypeName())+");\n");
   		}
   		writer.write("\treturn pIWSDZ->getStatus();\n");
  
  
  
  1.20      +1 -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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ParmHeaderFileWriter.java	8 Sep 2004 06:41:15 -0000	1.19
  +++ ParmHeaderFileWriter.java	11 Oct 2004 08:32:50 -0000	1.20
  @@ -151,7 +151,7 @@
   			  for(int i=0;i<attribs.length;i++){
   				  writer.write("\t"+getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])+"
"+attribs[i].getParamName()+";\n");
   			  }    
  -			  if (extensionBaseAttrib != null)
  +			  if (extensionBaseAttrib != null && getCorrectParmNameConsideringArraysAndComplexTypes(extensionBaseAttrib)
!= null)
   			  	writer.write("\t"+getCorrectParmNameConsideringArraysAndComplexTypes(extensionBaseAttrib)+"
"+extensionBaseAttrib.getParamName()+";\n");
   		  } catch (IOException e) {
   			   throw new WrapperFault(e);
  
  
  

Mime
View raw message