You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2002/02/13 17:09:24 UTC

cvs commit: xml-xerces/c/src/xercesc/util XMLUni.cpp XMLUni.hpp

knoaman     02/02/13 08:09:24

  Modified:    c/src/xercesc/parsers SAX2XMLReaderImpl.cpp
                        SAX2XMLReaderImpl.hpp
               c/src/xercesc/util XMLUni.cpp XMLUni.hpp
  Log:
  Move SAX2 features/properties names constants to XMLUni.
  
  Revision  Changes    Path
  1.2       +23 -194   xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
  
  Index: SAX2XMLReaderImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SAX2XMLReaderImpl.cpp	1 Feb 2002 22:22:06 -0000	1.1
  +++ SAX2XMLReaderImpl.cpp	13 Feb 2002 16:09:24 -0000	1.2
  @@ -56,8 +56,11 @@
   
   /*
    * $Log: SAX2XMLReaderImpl.cpp,v $
  - * Revision 1.1  2002/02/01 22:22:06  peiyongz
  - * Initial revision
  + * Revision 1.2  2002/02/13 16:09:24  knoaman
  + * Move SAX2 features/properties names constants to XMLUni.
  + *
  + * Revision 1.1.1.1  2002/02/01 22:22:06  peiyongz
  + * sane_include
    *
    * Revision 1.25  2002/01/28 17:47:41  knoaman
    * Some SAX calls were not passed to the LexicalHandler.
  @@ -196,180 +199,6 @@
   #include <xercesc/parsers/SAX2XMLReaderImpl.hpp>
   #include <string.h>
   
  -// SAX2 Core: http://xml.org/sax/features/validation
  -const XMLCh SAX2XMLReaderImpl::SAX_CORE_VALIDATION[] = {
  -		chLatin_h, chLatin_t, chLatin_t, chLatin_p,
  -		chColon, chForwardSlash, chForwardSlash,
  -		chLatin_x, chLatin_m, chLatin_l, chPeriod,
  -		chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
  -		chLatin_s, chLatin_a, chLatin_x, chForwardSlash,
  -		chLatin_f, chLatin_e, chLatin_a,
  -		chLatin_t, chLatin_u, chLatin_r,
  -		chLatin_e, chLatin_s, chForwardSlash,
  -		chLatin_v, chLatin_a, chLatin_l,
  -		chLatin_i, chLatin_d, chLatin_a, chLatin_t,
  -		chLatin_i, chLatin_o, chLatin_n, chNull
  -};
  -
  -// SAX2 Core: http://xml.org/sax/features/namespaces
  -const XMLCh SAX2XMLReaderImpl::SAX_CORE_NAMESPACES[] = {
  -		chLatin_h, chLatin_t, chLatin_t, chLatin_p,
  -		chColon, chForwardSlash, chForwardSlash,
  -		chLatin_x, chLatin_m, chLatin_l, chPeriod,
  -		chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
  -		chLatin_s, chLatin_a, chLatin_x, chForwardSlash,
  -		chLatin_f, chLatin_e, chLatin_a,
  -		chLatin_t, chLatin_u, chLatin_r,
  -		chLatin_e, chLatin_s, chForwardSlash,
  -		chLatin_n, chLatin_a, chLatin_m,
  -		chLatin_e, chLatin_s, chLatin_p, chLatin_a,
  -		chLatin_c, chLatin_e, chLatin_s, chNull
  -};
  -
  -//SAX2 Core: http://xml.org/sax/features/namespace-prefixes
  -const XMLCh SAX2XMLReaderImpl::SAX_CORE_NAMESPACE_PREFIXES[] = {
  -		chLatin_h, chLatin_t, chLatin_t, chLatin_p,
  -		chColon, chForwardSlash, chForwardSlash,
  -		chLatin_x, chLatin_m, chLatin_l, chPeriod,
  -		chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
  -		chLatin_s, chLatin_a, chLatin_x, chForwardSlash,
  -		chLatin_f, chLatin_e, chLatin_a,
  -		chLatin_t, chLatin_u, chLatin_r,
  -		chLatin_e, chLatin_s, chForwardSlash,
  -		chLatin_n, chLatin_a, chLatin_m,
  -		chLatin_e, chLatin_s, chLatin_p, chLatin_a,
  -		chLatin_c, chLatin_e,
  -		chDash, chLatin_p, chLatin_r, chLatin_e,
  -		chLatin_f, chLatin_i, chLatin_x,
  -		chLatin_e, chLatin_s, chNull
  -};
  -
  -//Xerces: http://apache.org/xml/features/validation/dynamic
  -const XMLCh SAX2XMLReaderImpl::SAX_XERCES_DYNAMIC[] = {
  -		chLatin_h, chLatin_t, chLatin_t, chLatin_p,
  -		chColon, chForwardSlash, chForwardSlash,
  -		chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h, chLatin_e, chPeriod,
  -		chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
  -		chLatin_x, chLatin_m, chLatin_l, chForwardSlash,
  -		chLatin_f, chLatin_e, chLatin_a,
  -		chLatin_t, chLatin_u, chLatin_r,
  -		chLatin_e, chLatin_s, chForwardSlash,
  -		chLatin_v, chLatin_a, chLatin_l,
  -		chLatin_i, chLatin_d, chLatin_a, chLatin_t,
  -		chLatin_i, chLatin_o, chLatin_n, chForwardSlash,
  -		chLatin_d, chLatin_y, chLatin_n, chLatin_a,
  -		chLatin_m, chLatin_i, chLatin_c, chNull
  -};
  -
  -//Xerces: http://apache.org/xml/features/validation/reuse-grammar
  -const XMLCh SAX2XMLReaderImpl::SAX_XERCES_REUSEGRAMMAR[] = {
  -		chLatin_h, chLatin_t, chLatin_t, chLatin_p,
  -		chColon, chForwardSlash, chForwardSlash,
  -		chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h, chLatin_e, chPeriod,
  -		chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
  -		chLatin_x, chLatin_m, chLatin_l, chForwardSlash,
  -		chLatin_f, chLatin_e, chLatin_a,
  -		chLatin_t, chLatin_u, chLatin_r,
  -		chLatin_e, chLatin_s, chForwardSlash,
  -		chLatin_v, chLatin_a, chLatin_l,
  -		chLatin_i, chLatin_d, chLatin_a, chLatin_t,
  -		chLatin_i, chLatin_o, chLatin_n, chForwardSlash,
  -		chLatin_r, chLatin_e, chLatin_u, chLatin_s, chLatin_e, chDash,
  -      chLatin_g, chLatin_r, chLatin_a,	chLatin_m, chLatin_m,
  -      chLatin_a, chLatin_r, chNull
  -};
  -
  -//Xerces: http://apache.org/xml/features/validation/schema
  -const XMLCh SAX2XMLReaderImpl::SAX_XERCES_SCHEMA[] = {
  -		chLatin_h, chLatin_t, chLatin_t, chLatin_p,
  -		chColon, chForwardSlash, chForwardSlash,
  -		chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h, chLatin_e, chPeriod,
  -		chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
  -		chLatin_x, chLatin_m, chLatin_l, chForwardSlash,
  -		chLatin_f, chLatin_e, chLatin_a,
  -		chLatin_t, chLatin_u, chLatin_r,
  -		chLatin_e, chLatin_s, chForwardSlash,
  -		chLatin_v, chLatin_a, chLatin_l,
  -		chLatin_i, chLatin_d, chLatin_a, chLatin_t,
  -		chLatin_i, chLatin_o, chLatin_n, chForwardSlash,
  -		chLatin_s, chLatin_c, chLatin_h, chLatin_e,
  -		chLatin_m, chLatin_a, chNull
  -};
  -
  -//Xerces: http://apache.org/xml/features/validation/schema-full-checking
  -const XMLCh SAX2XMLReaderImpl::SAX_XERCES_SCHEMA_FULL_CHECKING[] = {
  -		chLatin_h, chLatin_t, chLatin_t, chLatin_p,
  -		chColon, chForwardSlash, chForwardSlash,
  -		chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h, chLatin_e, chPeriod,
  -		chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
  -		chLatin_x, chLatin_m, chLatin_l, chForwardSlash,
  -		chLatin_f, chLatin_e, chLatin_a,
  -		chLatin_t, chLatin_u, chLatin_r,
  -		chLatin_e, chLatin_s, chForwardSlash,
  -		chLatin_v, chLatin_a, chLatin_l,
  -		chLatin_i, chLatin_d, chLatin_a, chLatin_t,
  -		chLatin_i, chLatin_o, chLatin_n, chForwardSlash,
  -		chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a,
  -      chDash, chLatin_f, chLatin_u, chLatin_l, chLatin_l,
  -      chDash, chLatin_c, chLatin_h, chLatin_e, chLatin_c, chLatin_k,
  -      chLatin_i, chLatin_n, chLatin_g, chNull
  -};
  -
  -//deprecated
  -//Xerces: http://apache.org/xml/features/validation/reuse-validator
  -const XMLCh SAX2XMLReaderImpl::SAX_XERCES_REUSEVALIDATOR[] = {
  -		chLatin_h, chLatin_t, chLatin_t, chLatin_p,
  -		chColon, chForwardSlash, chForwardSlash,
  -		chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h, chLatin_e, chPeriod,
  -		chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
  -		chLatin_x, chLatin_m, chLatin_l, chForwardSlash,
  -		chLatin_f, chLatin_e, chLatin_a,
  -		chLatin_t, chLatin_u, chLatin_r,
  -		chLatin_e, chLatin_s, chForwardSlash,
  -		chLatin_v, chLatin_a, chLatin_l,
  -		chLatin_i, chLatin_d, chLatin_a, chLatin_t,
  -		chLatin_i, chLatin_o, chLatin_n, chForwardSlash,
  -		chLatin_r, chLatin_e, chLatin_u, chLatin_s,
  -		chLatin_e, chDash, chLatin_v,
  -		chLatin_a, chLatin_l,
  -		chLatin_i, chLatin_d, chLatin_a, chLatin_t,
  -		chLatin_o, chLatin_r, chNull
  -};
  -
  -
  -//Property
  -//Xerces: http://apache.org/xml/properties/schema/external-schemaLocation
  -const XMLCh SAX2XMLReaderImpl::SAX_XERCES_SCHEMA_EXTERNAL_SCHEMALOCATION[] = {
  -		chLatin_h, chLatin_t, chLatin_t, chLatin_p,
  -		chColon, chForwardSlash, chForwardSlash,
  -		chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h, chLatin_e, chPeriod,
  -		chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
  -		chLatin_x, chLatin_m, chLatin_l, chForwardSlash,
  -		chLatin_p, chLatin_r, chLatin_o, chLatin_p, chLatin_e, chLatin_r,
  -      chLatin_t, chLatin_i, chLatin_e, chLatin_s, chForwardSlash,
  -		chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a, chForwardSlash,
  -		chLatin_e, chLatin_x, chLatin_t, chLatin_e, chLatin_r, chLatin_n, chLatin_a, chLatin_l, chDash,
  -      chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a,
  -      chLatin_L, chLatin_o, chLatin_c, chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
  -};
  -
  -//Property
  -//Xerces: http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation
  -const XMLCh SAX2XMLReaderImpl::SAX_XERCES_SCHEMA_EXTERNAL_NONAMESPACESCHEMALOCATION[] = {
  -		chLatin_h, chLatin_t, chLatin_t, chLatin_p,
  -		chColon, chForwardSlash, chForwardSlash,
  -		chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h, chLatin_e, chPeriod,
  -		chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
  -		chLatin_x, chLatin_m, chLatin_l, chForwardSlash,
  -		chLatin_p, chLatin_r, chLatin_o, chLatin_p, chLatin_e, chLatin_r,
  -      chLatin_t, chLatin_i, chLatin_e, chLatin_s, chForwardSlash,
  -		chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a, chForwardSlash,
  -		chLatin_e, chLatin_x, chLatin_t, chLatin_e, chLatin_r, chLatin_n, chLatin_a, chLatin_l, chDash,
  -      chLatin_n, chLatin_o, chLatin_N, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chLatin_p, chLatin_a, chLatin_c, chLatin_e,
  -      chLatin_S, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a,
  -      chLatin_L, chLatin_o, chLatin_c, chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
  -};
  -
   const XMLCh gDTDEntityStr[] =
   {
       chOpenSquare, chLatin_d, chLatin_t, chLatin_d, chCloseSquare, chNull
  @@ -1460,12 +1289,12 @@
   	if (fParseInProgress)
   		throw SAXNotSupportedException("Feature modification is not supported during parse.");
   	
  -	if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_CORE_NAMESPACES) == 0)
  +	if (XMLString::compareIString(name, XMLUni::fgSAX2CoreNameSpaces) == 0)
   	{
   		setDoNamespaces(value);
   	}
   
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_CORE_VALIDATION) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2CoreValidation) == 0)
   	{
   		fValidation = value;
   		if (fValidation)
  @@ -1478,12 +1307,12 @@
   	}
   
   
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_CORE_NAMESPACE_PREFIXES) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2CoreNameSpacePrefixes) == 0)
   	{
   		fnamespacePrefix = value;
   	}
   
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_DYNAMIC) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2XercesDynamic) == 0)
   	{
   		fautoValidation = value;
   		// for auto validation, the sax2 core validation feature must also be enabled.
  @@ -1496,22 +1325,22 @@
   			setValidationScheme(Val_Never);
   	}
   
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_REUSEVALIDATOR) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2XercesReuseValidator) == 0)
   	{
   		fReuseGrammar = value;
   	}
   
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_REUSEGRAMMAR) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2XercesReuseGrammar) == 0)
   	{
   		fReuseGrammar = value;
   	}
   
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_SCHEMA) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2XercesSchema) == 0)
   	{
   		setDoSchema(value);
   	}
   
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_SCHEMA_FULL_CHECKING) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2XercesSchemaFullChecking) == 0)
   	{
   		fScanner->setValidationSchemaFullChecking(value);
   	}
  @@ -1522,21 +1351,21 @@
   
   bool SAX2XMLReaderImpl::getFeature(const XMLCh* const name) const
   {
  -	if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_CORE_NAMESPACES) == 0)
  +	if (XMLString::compareIString(name, XMLUni::fgSAX2CoreNameSpaces) == 0)
   		return getDoNamespaces();
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_CORE_VALIDATION) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2CoreValidation) == 0)
   		return fValidation;
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_CORE_NAMESPACE_PREFIXES) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2CoreNameSpacePrefixes) == 0)
   		return fnamespacePrefix;
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_DYNAMIC) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2XercesDynamic) == 0)
   		return fautoValidation;
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_REUSEVALIDATOR) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2XercesReuseValidator) == 0)
           return fReuseGrammar;
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_REUSEGRAMMAR) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2XercesReuseGrammar) == 0)
           return fReuseGrammar;
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_SCHEMA) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2XercesSchema) == 0)
           return getDoSchema();
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_SCHEMA_FULL_CHECKING) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2XercesSchemaFullChecking) == 0)
           return fScanner->getValidationSchemaFullChecking();
      else
          throw SAXNotRecognizedException("Unknown Feature");
  @@ -1548,12 +1377,12 @@
   	if (fParseInProgress)
   		throw SAXNotSupportedException("Property modification is not supported during parse.");
   
  -	if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_SCHEMA_EXTERNAL_SCHEMALOCATION) == 0)
  +	if (XMLString::compareIString(name, XMLUni::fgSAX2XercesSchemaExternalSchemaLocation) == 0)
   	{
   		fScanner->setExternalSchemaLocation((XMLCh*)value);
   	}
   
  -	else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_SCHEMA_EXTERNAL_NONAMESPACESCHEMALOCATION) == 0)
  +	else if (XMLString::compareIString(name, XMLUni::fgSAX2XercesSchemaExternalNoNameSpaceSchemaLocation) == 0)
   	{
   		fScanner->setExternalNoNamespaceSchemaLocation((XMLCh*)value);
   	}
  @@ -1565,9 +1394,9 @@
   
   void* SAX2XMLReaderImpl::getProperty(const XMLCh* const name) const
   {
  -    if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_SCHEMA_EXTERNAL_SCHEMALOCATION) == 0)
  +    if (XMLString::compareIString(name, XMLUni::fgSAX2XercesSchemaExternalSchemaLocation) == 0)
           return (void*)fScanner->getExternalSchemaLocation();
  -    else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_SCHEMA_EXTERNAL_NONAMESPACESCHEMALOCATION) == 0)
  +    else if (XMLString::compareIString(name, XMLUni::fgSAX2XercesSchemaExternalNoNameSpaceSchemaLocation) == 0)
           return (void*)fScanner->getExternalNoNamespaceSchemaLocation();
       else
           throw SAXNotRecognizedException("Unknown Property");
  
  
  
  1.2       +3 -11     xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
  
  Index: SAX2XMLReaderImpl.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SAX2XMLReaderImpl.hpp	1 Feb 2002 22:22:07 -0000	1.1
  +++ SAX2XMLReaderImpl.hpp	13 Feb 2002 16:09:24 -0000	1.2
  @@ -56,8 +56,11 @@
   
   /*
    * $Log: SAX2XMLReaderImpl.hpp,v $
  - * Revision 1.1  2002/02/01 22:22:07  peiyongz
  - * Initial revision
  + * Revision 1.2  2002/02/13 16:09:24  knoaman
  + * Move SAX2 features/properties names constants to XMLUni.
  + *
  + * Revision 1.1.1.1  2002/02/01 22:22:07  peiyongz
  + * sane_include
    *
    * Revision 1.21  2002/01/28 18:45:40  knoaman
    * Update documentation for SAX2 feature 'namespace-prefixes'.
  @@ -179,17 +182,6 @@
       , public DocTypeHandler
   {
   public :
  -
  -	static const XMLCh SAX_CORE_VALIDATION[];
  -	static const XMLCh SAX_CORE_NAMESPACES[];
  -	static const XMLCh SAX_CORE_NAMESPACE_PREFIXES[];
  -	static const XMLCh SAX_XERCES_DYNAMIC[];
  -	static const XMLCh SAX_XERCES_REUSEVALIDATOR[];
  -	static const XMLCh SAX_XERCES_REUSEGRAMMAR[];
  -	static const XMLCh SAX_XERCES_SCHEMA[];
  -	static const XMLCh SAX_XERCES_SCHEMA_FULL_CHECKING[];
  -	static const XMLCh SAX_XERCES_SCHEMA_EXTERNAL_SCHEMALOCATION[];
  -	static const XMLCh SAX_XERCES_SCHEMA_EXTERNAL_NONAMESPACESCHEMALOCATION[];
   	
   	SAX2XMLReaderImpl() ;
   	~SAX2XMLReaderImpl() ;
  
  
  
  1.3       +144 -1    xml-xerces/c/src/xercesc/util/XMLUni.cpp
  
  Index: XMLUni.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUni.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLUni.cpp	5 Feb 2002 13:11:45 -0000	1.2
  +++ XMLUni.cpp	13 Feb 2002 16:09:24 -0000	1.3
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: XMLUni.cpp,v 1.2 2002/02/05 13:11:45 tng Exp $
  + * $Id: XMLUni.cpp,v 1.3 2002/02/13 16:09:24 knoaman Exp $
    */
   
   
  @@ -825,5 +825,148 @@
   const XMLCh XMLUni::fgNullString[] =
   {
       chLatin_n, chLatin_u, chLatin_l, chLatin_l, chNull
  +};
  +
  +// SAX2 Core: http://xml.org/sax/features/validation
  +const XMLCh XMLUni::fgSAX2CoreValidation[] =
  +{
  +        chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
  +    ,   chForwardSlash, chLatin_x, chLatin_m, chLatin_l, chPeriod, chLatin_o
  +    ,   chLatin_r, chLatin_g, chForwardSlash, chLatin_s, chLatin_a, chLatin_x
  +    ,   chForwardSlash, chLatin_f, chLatin_e, chLatin_a, chLatin_t, chLatin_u
  +    ,   chLatin_r, chLatin_e, chLatin_s, chForwardSlash, chLatin_v, chLatin_a
  +    ,   chLatin_l, chLatin_i, chLatin_d, chLatin_a, chLatin_t, chLatin_i
  +    ,   chLatin_o, chLatin_n, chNull
  +};
  +
  +// SAX2 Core: http://xml.org/sax/features/namespaces
  +const XMLCh XMLUni::fgSAX2CoreNameSpaces[] =
  +{
  +        chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
  +    ,   chForwardSlash, chLatin_x, chLatin_m, chLatin_l, chPeriod, chLatin_o
  +    ,   chLatin_r, chLatin_g, chForwardSlash, chLatin_s, chLatin_a, chLatin_x
  +    ,   chForwardSlash, chLatin_f, chLatin_e, chLatin_a, chLatin_t, chLatin_u
  +    ,   chLatin_r, chLatin_e, chLatin_s, chForwardSlash, chLatin_n, chLatin_a
  +    ,   chLatin_m, chLatin_e, chLatin_s, chLatin_p, chLatin_a, chLatin_c
  +    ,   chLatin_e, chLatin_s, chNull
  +};
  +
  +//SAX2 Core: http://xml.org/sax/features/namespace-prefixes
  +const XMLCh XMLUni::fgSAX2CoreNameSpacePrefixes[] =
  +{
  +        chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
  +    ,   chForwardSlash, chLatin_x, chLatin_m, chLatin_l, chPeriod, chLatin_o
  +    ,   chLatin_r, chLatin_g, chForwardSlash, chLatin_s, chLatin_a, chLatin_x
  +    ,   chForwardSlash, chLatin_f, chLatin_e, chLatin_a, chLatin_t, chLatin_u
  +    ,   chLatin_r, chLatin_e, chLatin_s, chForwardSlash, chLatin_n, chLatin_a
  +    ,   chLatin_m, chLatin_e, chLatin_s, chLatin_p, chLatin_a, chLatin_c, chLatin_e
  +    ,   chDash, chLatin_p, chLatin_r, chLatin_e, chLatin_f, chLatin_i, chLatin_x
  +    ,   chLatin_e, chLatin_s, chNull
  +};
  +
  +//Xerces: http://apache.org/xml/features/validation/dynamic
  +const XMLCh XMLUni::fgSAX2XercesDynamic[] =
  +{
  +        chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
  +    ,   chForwardSlash, chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h
  +    ,   chLatin_e, chPeriod, chLatin_o, chLatin_r, chLatin_g, chForwardSlash
  +    ,   chLatin_x, chLatin_m, chLatin_l, chForwardSlash, chLatin_f, chLatin_e
  +    ,   chLatin_a, chLatin_t, chLatin_u, chLatin_r, chLatin_e, chLatin_s
  +    ,   chForwardSlash , chLatin_v, chLatin_a, chLatin_l, chLatin_i, chLatin_d
  +    ,   chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chForwardSlash
  +    ,   chLatin_d, chLatin_y, chLatin_n, chLatin_a, chLatin_m, chLatin_i, chLatin_c, chNull
  +};
  +
  +//Xerces: http://apache.org/xml/features/validation/reuse-grammar
  +const XMLCh XMLUni::fgSAX2XercesReuseGrammar[] =
  +{
  +        chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
  +    ,   chForwardSlash, chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h
  +    ,   chLatin_e, chPeriod, chLatin_o, chLatin_r, chLatin_g, chForwardSlash
  +    ,   chLatin_x, chLatin_m, chLatin_l, chForwardSlash, chLatin_f, chLatin_e
  +    ,   chLatin_a, chLatin_t, chLatin_u, chLatin_r, chLatin_e, chLatin_s
  +    ,   chForwardSlash, chLatin_v, chLatin_a, chLatin_l, chLatin_i, chLatin_d
  +    ,   chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chForwardSlash
  +    ,   chLatin_r, chLatin_e, chLatin_u, chLatin_s, chLatin_e, chDash, chLatin_g
  +    ,   chLatin_r, chLatin_a,	chLatin_m, chLatin_m, chLatin_a, chLatin_r, chNull
  +};
  +
  +//Xerces: http://apache.org/xml/features/validation/schema
  +const XMLCh XMLUni::fgSAX2XercesSchema[] =
  +{
  +        chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
  +    ,   chForwardSlash, chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h
  +    ,   chLatin_e, chPeriod, chLatin_o, chLatin_r, chLatin_g, chForwardSlash
  +    ,   chLatin_x, chLatin_m, chLatin_l, chForwardSlash, chLatin_f, chLatin_e
  +    ,   chLatin_a, chLatin_t, chLatin_u, chLatin_r, chLatin_e, chLatin_s
  +    ,   chForwardSlash, chLatin_v, chLatin_a, chLatin_l, chLatin_i, chLatin_d
  +    ,   chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chForwardSlash
  +    ,   chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a, chNull
  +};
  +
  +//Xerces: http://apache.org/xml/features/validation/schema-full-checking
  +const XMLCh XMLUni::fgSAX2XercesSchemaFullChecking[] =
  +{
  +        chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
  +    ,   chForwardSlash, chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h
  +    ,   chLatin_e, chPeriod, chLatin_o, chLatin_r, chLatin_g, chForwardSlash
  +    ,   chLatin_x, chLatin_m, chLatin_l, chForwardSlash, chLatin_f, chLatin_e
  +    ,   chLatin_a, chLatin_t, chLatin_u, chLatin_r, chLatin_e, chLatin_s
  +    ,   chForwardSlash, chLatin_v, chLatin_a, chLatin_l, chLatin_i, chLatin_d
  +    ,   chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chForwardSlash
  +    ,   chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a, chDash
  +    ,   chLatin_f, chLatin_u, chLatin_l, chLatin_l, chDash, chLatin_c, chLatin_h
  +    ,   chLatin_e, chLatin_c, chLatin_k, chLatin_i, chLatin_n, chLatin_g, chNull
  +};
  +
  +//deprecated
  +//Xerces: http://apache.org/xml/features/validation/reuse-validator
  +const XMLCh XMLUni::fgSAX2XercesReuseValidator[] =
  +{
  +        chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
  +    ,   chForwardSlash, chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h
  +    ,   chLatin_e, chPeriod, chLatin_o, chLatin_r, chLatin_g, chForwardSlash
  +    ,   chLatin_x, chLatin_m, chLatin_l, chForwardSlash, chLatin_f, chLatin_e
  +    ,   chLatin_a, chLatin_t, chLatin_u, chLatin_r, chLatin_e, chLatin_s
  +    ,   chForwardSlash, chLatin_v, chLatin_a, chLatin_l, chLatin_i, chLatin_d
  +    ,   chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chForwardSlash
  +    ,   chLatin_r, chLatin_e, chLatin_u, chLatin_s, chLatin_e, chDash, chLatin_v
  +    ,   chLatin_a, chLatin_l, chLatin_i, chLatin_d, chLatin_a, chLatin_t
  +    ,   chLatin_o, chLatin_r, chNull
  +};
  +
  +
  +//Property
  +//Xerces: http://apache.org/xml/properties/schema/external-schemaLocation
  +const XMLCh XMLUni::fgSAX2XercesSchemaExternalSchemaLocation[] =
  +{
  +        chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
  +    ,   chForwardSlash, chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h
  +    ,   chLatin_e, chPeriod, chLatin_o, chLatin_r, chLatin_g, chForwardSlash
  +    ,   chLatin_x, chLatin_m, chLatin_l, chForwardSlash, chLatin_p, chLatin_r
  +    ,   chLatin_o, chLatin_p, chLatin_e, chLatin_r, chLatin_t, chLatin_i
  +    ,   chLatin_e, chLatin_s, chForwardSlash, chLatin_s, chLatin_c, chLatin_h
  +    ,   chLatin_e, chLatin_m, chLatin_a, chForwardSlash, chLatin_e, chLatin_x
  +    ,   chLatin_t, chLatin_e, chLatin_r, chLatin_n, chLatin_a, chLatin_l, chDash
  +    ,   chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a, chLatin_L
  +    ,   chLatin_o, chLatin_c, chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
  +};
  +
  +//Property
  +//Xerces: http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation
  +const XMLCh XMLUni::fgSAX2XercesSchemaExternalNoNameSpaceSchemaLocation[] =
  +{
  +        chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
  +    ,   chForwardSlash, chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h
  +    ,   chLatin_e, chPeriod, chLatin_o, chLatin_r, chLatin_g, chForwardSlash
  +    ,   chLatin_x, chLatin_m, chLatin_l, chForwardSlash, chLatin_p, chLatin_r
  +    ,   chLatin_o, chLatin_p, chLatin_e, chLatin_r, chLatin_t, chLatin_i
  +    ,   chLatin_e, chLatin_s, chForwardSlash, chLatin_s, chLatin_c, chLatin_h
  +    ,   chLatin_e, chLatin_m, chLatin_a, chForwardSlash, chLatin_e, chLatin_x
  +    ,   chLatin_t, chLatin_e, chLatin_r, chLatin_n, chLatin_a, chLatin_l, chDash
  +    ,   chLatin_n, chLatin_o, chLatin_N, chLatin_a, chLatin_m, chLatin_e, chLatin_s
  +    ,   chLatin_p, chLatin_a, chLatin_c, chLatin_e, chLatin_S, chLatin_c, chLatin_h
  +    ,   chLatin_e, chLatin_m, chLatin_a, chLatin_L, chLatin_o, chLatin_c, chLatin_a
  +    ,   chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
   };
   
  
  
  
  1.3       +13 -1     xml-xerces/c/src/xercesc/util/XMLUni.hpp
  
  Index: XMLUni.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUni.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLUni.hpp	5 Feb 2002 13:11:45 -0000	1.2
  +++ XMLUni.hpp	13 Feb 2002 16:09:24 -0000	1.3
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: XMLUni.hpp,v 1.2 2002/02/05 13:11:45 tng Exp $
  + * $Id: XMLUni.hpp,v 1.3 2002/02/13 16:09:24 knoaman Exp $
    */
   
   
  @@ -216,6 +216,18 @@
       static const XMLCh fgEString[];
       static const XMLCh fgZeroString[];
       static const XMLCh fgNullString[];
  +
  +    // SAX2 features/properties names
  +    static const XMLCh fgSAX2CoreValidation[];
  +    static const XMLCh fgSAX2CoreNameSpaces[];
  +    static const XMLCh fgSAX2CoreNameSpacePrefixes[];
  +    static const XMLCh fgSAX2XercesDynamic[];
  +    static const XMLCh fgSAX2XercesReuseValidator[];
  +    static const XMLCh fgSAX2XercesReuseGrammar[];
  +    static const XMLCh fgSAX2XercesSchema[];
  +    static const XMLCh fgSAX2XercesSchemaFullChecking[];
  +    static const XMLCh fgSAX2XercesSchemaExternalSchemaLocation[];
  +    static const XMLCh fgSAX2XercesSchemaExternalNoNameSpaceSchemaLocation[];
   
   };
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org