axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hawk...@apache.org
Subject cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info TypeMap.java
Date Wed, 09 Feb 2005 17:34:47 GMT
hawkeye     2005/02/09 09:34:47

  Modified:    c/src/wsdl/org/apache/axis/wsdl/wsdl2ws CUtils.java
               c/include/axis TypeMapping.hpp AxisUserAPI.hpp AxisUserAPI.h
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info TypeMap.java
  Log:
  Removed excess types from TypeMapping.h
  
  Revision  Changes    Path
  1.29      +14 -14    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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- CUtils.java	21 Jan 2005 17:27:58 -0000	1.28
  +++ CUtils.java	9 Feb 2005 17:34:46 -0000	1.29
  @@ -91,7 +91,7 @@
   		class2QNamemapCpp.put("xsd__unsignedLong", new QName(WrapperConstants.SCHEMA_NAMESPACE,
"unsignedLong"));
   		class2QNamemapCpp.put("xsd__unsignedShort", new QName(WrapperConstants.SCHEMA_NAMESPACE,
"unsignedShort"));
   		class2QNamemapCpp.put("xsd__QName", new QName(WrapperConstants.SCHEMA_NAMESPACE,			"QName"));
  -		class2QNamemapCpp.put("xsd__NCName", new QName(WrapperConstants.SCHEMA_NAMESPACE,			"NCName"));
  +//		class2QNamemapCpp.put("xsd__NCName", new QName(WrapperConstants.SCHEMA_NAMESPACE,	
	"NCName"));
   		class2QNamemapCpp.put("xsd__NMTOKEN", new QName(WrapperConstants.SCHEMA_NAMESPACE,		
"NMTOKEN"));
   
   		class2QNamemapC.put("xsdc__int",new QName(WrapperConstants.SCHEMA_NAMESPACE,				"int"));
  @@ -117,7 +117,7 @@
   		class2QNamemapC.put("xsdc__unsignedLong", new QName(WrapperConstants.SCHEMA_NAMESPACE,
"unsignedLong"));
   		class2QNamemapC.put("xsdc__unsignedShort", new QName(WrapperConstants.SCHEMA_NAMESPACE,
"unsignedShort"));
   		class2QNamemapC.put("xsdc__QName", new QName(WrapperConstants.SCHEMA_NAMESPACE,			"QName"));
  -		class2QNamemapC.put("xsdc__NCName", new QName(WrapperConstants.SCHEMA_NAMESPACE,			"NCName"));
  +//		class2QNamemapC.put("xsdc__NCName", new QName(WrapperConstants.SCHEMA_NAMESPACE,		
"NCName"));
   		class2QNamemapC.put("xsdc__NMTOKEN", new QName(WrapperConstants.SCHEMA_NAMESPACE,			"NMTOKEN"));
   
   		qname2classmapCpp.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "int"),				"xsd__int");
  @@ -142,7 +142,7 @@
   		qname2classmapCpp.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "unsignedLong"),	"xsd__unsignedLong");
   		qname2classmapCpp.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "unsignedShort"),
"xsd__unsignedShort");
   		qname2classmapCpp.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "QName"),			"xsd__QName");
  -		qname2classmapCpp.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "NCName"),			"xsd__NCName");
  +//		qname2classmapCpp.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "NCName"),			"xsd__NCName");
   		qname2classmapCpp.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "NMTOKEN"),			"xsd__NMTOKEN");
   		
   		qname2classmapC.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "int"),				"xsdc__int");
  @@ -167,7 +167,7 @@
   		qname2classmapC.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "unsignedLong"),	"xsdc__unsignedLong");
   		qname2classmapC.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "unsignedShort"),	"xsdc__unsignedShort");
   		qname2classmapC.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "QName"),			"xsdc__QName");
  -		qname2classmapC.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "NCName"),			"xsdc__NCName");
  +//		qname2classmapC.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "NCName"),			"xsdc__NCName");
   		qname2classmapC.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "NMTOKEN"),			"xsdc__NMTOKEN");
   		
   		/* TODO:
  @@ -196,7 +196,7 @@
   		qname2classmapCpp.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "unsignedLong"),
"xsd__unsignedLong");
   		qname2classmapCpp.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "unsignedShort"),
"xsd__unsignedShort");
   		qname2classmapCpp.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "QName"),			"xsd__QName");
	
  -		qname2classmapCpp.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "NCName"),			"xsd__NCName");
	
  +//		qname2classmapCpp.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "NCName"),			"xsd__NCName");
	
   
   
   		/* TODO:
  @@ -230,7 +230,7 @@
   		qname2classmapC.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "unsignedLong"),	"xsdc__unsignedLong");
   		qname2classmapC.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "unsignedShort"),	"xsdc__unsignedShort");
   		qname2classmapC.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "QName"),			"xsdc__QName");
	
  -		qname2classmapC.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "NCName"),			"xsdc__NCName");
	
  +//		qname2classmapC.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "NCName"),			"xsdc__NCName");
	
   
   
   		/* TODO:
  @@ -259,7 +259,7 @@
   		type2getValueMethodNameCpp.put("xsd__boolean",			"Boolean");
   		type2getValueMethodNameCpp.put("xsd__anyURI",			"String");
   		type2getValueMethodNameCpp.put("xsd__QName",			"String");
  -		type2getValueMethodNameCpp.put("xsd__NCName",			"String");
  +//		type2getValueMethodNameCpp.put("xsd__NCName",			"String");
   		type2getValueMethodNameCpp.put("xsd__NMTOKEN",			"String");
   		
   		type2getValueMethodNameC.put("xsdc__int",				"Int");
  @@ -283,7 +283,7 @@
   		type2getValueMethodNameC.put("xsdc__boolean",			"Boolean");
   		type2getValueMethodNameC.put("xsdc__anyURI",			"String");
   		type2getValueMethodNameC.put("xsdc__QName",			"String");
  -		type2getValueMethodNameC.put("xsdc__NCName",			"String");
  +//		type2getValueMethodNameC.put("xsdc__NCName",			"String");
   		type2getValueMethodNameC.put("xsdc__NMTOKEN",			"String");
   		
   		type2BasicArrayNameCpp.put("xsd__int",					"xsd__int_Array");
  @@ -306,7 +306,7 @@
   		type2BasicArrayNameCpp.put("xsd__boolean",				"xsd__boolean_Array");
   		type2BasicArrayNameCpp.put("xsd__anyURI",				"xsd__anyURI_Array");
   		type2BasicArrayNameCpp.put("xsd__QName",				"xsd__QName_Array");
  -		type2BasicArrayNameCpp.put("xsd__NCName",				"xsd__NCName_Array");
  +//		type2BasicArrayNameCpp.put("xsd__NCName",				"xsd__NCName_Array");
   		type2BasicArrayNameCpp.put("xsd__NMTOKEN",				"xsd__NMTOKEN_Array");
   		
   		type2BasicArrayNameC.put("xsdc__int",					"xsdc__int_Array");
  @@ -329,7 +329,7 @@
   		type2BasicArrayNameC.put("xsdc__boolean",				"xsdc__boolean_Array");
   		type2BasicArrayNameC.put("xsdc__anyURI",				"xsdc__anyURI_Array");
   		type2BasicArrayNameC.put("xsdc__QName",				"xsdc__QName_Array");
  -		type2BasicArrayNameC.put("xsdc__NCName",				"xsdc__NCName_Array");
  +//		type2BasicArrayNameC.put("xsdc__NCName",				"xsdc__NCName_Array");
   		type2BasicArrayNameC.put("xsdc__NMTOKEN",				"xsdc__NMTOKEN_Array");
   		
   		basicType2EnumMapCpp.put("xsd__int",					"XSD_INT");
  @@ -352,7 +352,7 @@
   		basicType2EnumMapCpp.put("xsd__boolean",				"XSD_BOOLEAN");
   		basicType2EnumMapCpp.put("xsd__anyURI",				"XSD_ANYURI");
   		basicType2EnumMapCpp.put("xsd__QName",					"XSD_QNAME");
  -		basicType2EnumMapCpp.put("xsd__NCName",				"XSD_NCNAME");
  +//		basicType2EnumMapCpp.put("xsd__NCName",				"XSD_NCNAME");
   		basicType2EnumMapCpp.put("xsd__NMTOKEN",				"XSD_NMTOKEN");
   
   		basicType2EnumMapC.put("xsdc__int",					"XSD_INT");
  @@ -375,7 +375,7 @@
   		basicType2EnumMapC.put("xsdc__boolean",				"XSD_BOOLEAN");
   		basicType2EnumMapC.put("xsdc__anyURI",				"XSD_ANYURI");
   		basicType2EnumMapC.put("xsdc__QName",					"XSD_QNAME");
  -		basicType2EnumMapC.put("xsdc__NCName",				"XSD_NCNAME");
  +//		basicType2EnumMapC.put("xsdc__NCName",				"XSD_NCNAME");
   		basicType2EnumMapC.put("xsdc__NMTOKEN",				"XSD_NMTOKEN");
   
   
  @@ -401,7 +401,7 @@
   		initValuesCpp.put("xsd__unsignedLong",		"0"); 
   		initValuesCpp.put("xsd__unsignedShort",	"0"); 
   		initValuesCpp.put("xsd__QName",			"NULL"); 
  -		initValuesCpp.put("xsd__NCName",			"NULL"); 
  +		//initValuesCpp.put("xsd__NCName",			"NULL"); 
   		initValuesCpp.put("xsd__NMTOKEN",			"NULL"); 
   		
   		initValuesC.put("xsdc__int",				"0"); 
  @@ -426,7 +426,7 @@
   		initValuesC.put("xsdc__unsignedLong",		"0"); 
   		initValuesC.put("xsdc__unsignedShort",	"0"); 
   		initValuesC.put("xsdc__QName",			"NULL"); 
  -		initValuesC.put("xsdc__NCName",			"NULL"); 
  +//		initValuesC.put("xsdc__NCName",			"NULL"); 
   		initValuesC.put("xsdc__NMTOKEN",			"NULL"); 
   	}
   	
  
  
  
  1.4       +5 -2      ws-axis/c/include/axis/TypeMapping.hpp
  
  Index: TypeMapping.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/TypeMapping.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TypeMapping.hpp	23 Dec 2004 09:14:26 -0000	1.3
  +++ TypeMapping.hpp	9 Feb 2005 17:34:46 -0000	1.4
  @@ -38,12 +38,15 @@
                   XSD_DATETIME, XSD_TIME, XSD_DATE, \
                   XSD_YEARMONTH, XSD_YEAR, XSD_MONTHDAY, XSD_DAY, \
                   XSD_MONTH, XSD_HEXBINARY, \
  -                XSD_BASE64BINARY, XSD_ANYURI, XSD_QNAME, XSD_NCNAME, XSD_NOTATION, \
  +                XSD_BASE64BINARY, XSD_ANYURI, XSD_QNAME,  XSD_NOTATION, \
                   XSD_INTEGER, \
  -                XSD_ARRAY, USER_TYPE, ACCESSOR, XSD_NMTOKEN, XSD_ANY
  +                XSD_ARRAY, USER_TYPE,  XSD_NMTOKEN, XSD_ANY
   } XSDTYPE;
   
   /**
  + * REMOVED from XSDTYPETag-> ACCESSOR, XSD_NCNAME,
  + */
  +/**
    *  @class TypeMapping
    *  @brief interface for the TypeMapping class.
    *
  
  
  
  1.3       +2 -2      ws-axis/c/include/axis/AxisUserAPI.hpp
  
  Index: AxisUserAPI.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/AxisUserAPI.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AxisUserAPI.hpp	23 Nov 2004 15:48:56 -0000	1.2
  +++ AxisUserAPI.hpp	9 Feb 2005 17:34:46 -0000	1.3
  @@ -96,7 +96,7 @@
    * @typedef xsd__NCName
    * Axis C++ defined type for xml basic type NCName
    */
  -typedef AxisChar * xsd__NCName;
  +//typedef AxisChar * xsd__NCName;
   /**
    * @typedef xsd__dateTime
    * Axis C++ defined type for xml basic type dateTime
  @@ -201,7 +201,7 @@
   AXIS_DEFINED_ARRAY(xsd__double)
   AXIS_DEFINED_ARRAY(xsd__boolean)
   AXIS_DEFINED_ARRAY(xsd__QName)
  -AXIS_DEFINED_ARRAY(xsd__NCName)
  +//AXIS_DEFINED_ARRAY(xsd__NCName)
   AXIS_DEFINED_ARRAY(xsd__dateTime)
   AXIS_DEFINED_ARRAY(xsd__unsignedByte)
   AXIS_DEFINED_ARRAY(xsd__unsignedInt)
  
  
  
  1.4       +2 -2      ws-axis/c/include/axis/AxisUserAPI.h
  
  Index: AxisUserAPI.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/AxisUserAPI.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AxisUserAPI.h	28 Jan 2005 14:51:19 -0000	1.3
  +++ AxisUserAPI.h	9 Feb 2005 17:34:46 -0000	1.4
  @@ -101,7 +101,7 @@
    * @typedef xsdc__NCName
    * Axis C++ defined type for xml basic type NCName
    */
  -typedef AxiscChar * xsdc__NCName;
  +//typedef AxiscChar * xsdc__NCName;
   
   /**
    * @typedef xsdc__dateTime
  @@ -213,7 +213,7 @@
   AXISC_DEFINED_ARRAY(xsdc__double)
   AXISC_DEFINED_ARRAY(xsdc__boolean)
   AXISC_DEFINED_ARRAY(xsdc__QName)
  -AXISC_DEFINED_ARRAY(xsdc__NCName)
  +//AXISC_DEFINED_ARRAY(xsdc__NCName)
   AXISC_DEFINED_ARRAY(xsdc__dateTime)
   AXISC_DEFINED_ARRAY(xsdc__unsignedByte)
   AXISC_DEFINED_ARRAY(xsdc__unsignedInt)
  
  
  
  1.14      +6 -3      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/TypeMap.java
  
  Index: TypeMap.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/TypeMap.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- TypeMap.java	28 Oct 2004 14:14:54 -0000	1.13
  +++ TypeMap.java	9 Feb 2005 17:34:46 -0000	1.14
  @@ -93,9 +93,10 @@
           basicTypeClass2QNamemap.put(
               "xsd__QName",
               new QName(WrapperConstants.SCHEMA_NAMESPACE, "QName"));
  -        basicTypeClass2QNamemap.put(
  +/*        basicTypeClass2QNamemap.put(
               "xsd__NCName",
               new QName(WrapperConstants.SCHEMA_NAMESPACE, "NCName"));
  +            */
           basicTypeClass2QNamemap.put(
               "xsd__date",
               new QName(WrapperConstants.SCHEMA_NAMESPACE, "date"));
  @@ -138,9 +139,10 @@
           basicTypeQname2classmap.put(
               new QName(WrapperConstants.SCHEMA_NAMESPACE, "QName"),
               "xsd__QName");
  -        basicTypeQname2classmap.put(
  +/*        basicTypeQname2classmap.put(
               new QName(WrapperConstants.SCHEMA_NAMESPACE, "NCName"),
               "xsd__NCName");
  +            */
           basicTypeQname2classmap.put(
               new QName(WrapperConstants.SCHEMA_NAMESPACE, "dateTime"),
               "xsd__dateTime");
  @@ -212,9 +214,10 @@
           basicTypeQname2classmap.put(
               new QName(WrapperConstants.SOAPENC_NAMESPACE, "QName"),
               "xsd__QName");
  -        basicTypeQname2classmap.put(
  +/*      basicTypeQname2classmap.put(
               new QName(WrapperConstants.SOAPENC_NAMESPACE, "NCName"),
               "xsd__NCName");
  +            */
           basicTypeQname2classmap.put(
               new QName(WrapperConstants.SOAPENC_NAMESPACE, "dateTime"),
               "xsd__dateTime");
  
  
  

Mime
View raw message