You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ga...@apache.org on 2003/05/14 20:10:41 UTC
cvs commit: xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory XercesMessages_en_US.hpp
gareth 2003/05/14 11:10:41
Modified: c/src/xercesc/NLS/EN_US XMLErrList_EN_US.Xml
c/src/xercesc/framework XMLErrorCodes.hpp
c/src/xercesc/util XMLDOMMsg.hpp XMLExceptMsgs.hpp
c/src/xercesc/util/MsgLoaders/ICU/resources en_US.txt
c/src/xercesc/util/MsgLoaders/InMemory
XercesMessages_en_US.hpp
Log:
Added error messages in preparation for namespace normalization and methods that return DOMError::ErrorSeverity as opposed to XMLErrorReporter::ErrTypes.
Revision Changes Path
1.35 +2 -0 xml-xerces/c/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
Index: XMLErrList_EN_US.Xml
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- XMLErrList_EN_US.Xml 28 Apr 2003 23:32:57 -0000 1.34
+++ XMLErrList_EN_US.Xml 14 May 2003 18:10:40 -0000 1.35
@@ -174,6 +174,8 @@
<Message Id="SubsGroupMemberAbstract" Text="For '{0}' to be a member of the substitution group set of '{1}', its {abstract} must be false."/>
<Message Id="ELTSchemaNS" Text="The namespace of element '{0}' must be from the schema namespace."/>
<Message Id="InvalidAttTNS" Text="The {target namespace} of '{0}' must not match 'http://www.w3.org/2001/XMLSchema-instance'."/>
+ <Message Id="NSDeclInvalid" Text="The namespace declaration is invalid." />
+ <Message Id="DOMLevel1Node" Text="Namespace fixup cannot be performed on a DOM Level 1 Node." />
</Error>
<FatalError>
<Message Id="EntityExpansionLimitExceeded" Text= "The parser has encountered more than '{0}' entity expansions in this document; this is the limit imposed by the application."/>
1.20 +149 -138 xml-xerces/c/src/xercesc/framework/XMLErrorCodes.hpp
Index: XMLErrorCodes.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLErrorCodes.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XMLErrorCodes.hpp 17 Apr 2003 22:00:52 -0000 1.19
+++ XMLErrorCodes.hpp 14 May 2003 18:10:40 -0000 1.20
@@ -5,6 +5,7 @@
#include <xercesc/framework/XMLErrorReporter.hpp>
#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/dom/DOMError.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -181,144 +182,146 @@
, SubsGroupMemberAbstract = 165
, ELTSchemaNS = 166
, InvalidAttTNS = 167
- , E_HighBounds = 168
- , F_LowBounds = 169
- , EntityExpansionLimitExceeded = 170
- , ExpectedCommentOrCDATA = 171
- , ExpectedAttrName = 172
- , ExpectedNotationName = 173
- , NoRepInMixed = 174
- , BadDefAttrDecl = 175
- , ExpectedDefAttrDecl = 176
- , AttListSyntaxError = 177
- , ExpectedEqSign = 178
- , DupAttrName = 179
- , BadIdForXMLLangAttr = 180
- , ExpectedElementName = 181
- , MustStartWithXMLDecl = 182
- , CommentsMustStartWith = 183
- , InvalidDocumentStructure = 184
- , ExpectedDeclString = 185
- , BadXMLVersion = 186
- , UnsupportedXMLVersion = 187
- , UnterminatedXMLDecl = 188
- , BadXMLEncoding = 189
- , BadStandalone = 190
- , UnterminatedComment = 191
- , PINameExpected = 192
- , UnterminatedPI = 193
- , InvalidCharacter = 194
- , UnexpectedTextBeforeRoot = 195
- , UnterminatedStartTag = 196
- , ExpectedAttrValue = 197
- , UnterminatedEndTag = 198
- , ExpectedAttributeType = 199
- , ExpectedEndOfTagX = 200
- , ExpectedMarkup = 201
- , NotValidAfterContent = 202
- , ExpectedComment = 203
- , ExpectedCommentOrPI = 204
- , ExpectedWhitespace = 205
- , NoRootElemInDOCTYPE = 206
- , ExpectedQuotedString = 207
- , ExpectedPublicId = 208
- , InvalidPublicIdChar = 209
- , UnterminatedDOCTYPE = 210
- , InvalidCharacterInIntSubset = 211
- , ExpectedCDATA = 212
- , InvalidInitialNameChar = 213
- , InvalidNameChar = 214
- , UnexpectedWhitespace = 215
- , InvalidCharacterInAttrValue = 216
- , ExpectedMarkupDecl = 217
- , TextDeclNotLegalHere = 218
- , ConditionalSectInIntSubset = 219
- , ExpectedPEName = 220
- , UnterminatedEntityDecl = 221
- , InvalidCharacterRef = 222
- , UnterminatedCharRef = 223
- , ExpectedEntityRefName = 224
- , EntityNotFound = 225
- , NoUnparsedEntityRefs = 226
- , UnterminatedEntityRef = 227
- , RecursiveEntity = 228
- , PartialMarkupInEntity = 229
- , UnterminatedElementDecl = 230
- , ExpectedContentSpecExpr = 231
- , ExpectedAsterisk = 232
- , UnterminatedContentModel = 233
- , ExpectedSystemId = 234
- , ExpectedSystemOrPublicId = 235
- , UnterminatedNotationDecl = 236
- , ExpectedSeqChoiceLeaf = 237
- , ExpectedChoiceOrCloseParen = 238
- , ExpectedSeqOrCloseParen = 239
- , ExpectedEnumValue = 240
- , ExpectedEnumSepOrParen = 241
- , UnterminatedEntityLiteral = 242
- , MoreEndThanStartTags = 243
- , ExpectedOpenParen = 244
- , AttrAlreadyUsedInSTag = 245
- , BracketInAttrValue = 246
- , Expected2ndSurrogateChar = 247
- , ExpectedEndOfConditional = 248
- , ExpectedIncOrIgn = 249
- , ExpectedINCLUDEBracket = 250
- , ExpectedTextDecl = 251
- , ExpectedXMLDecl = 252
- , UnexpectedEOE = 253
- , PEPropogated = 254
- , ExtraCloseSquare = 255
- , PERefInMarkupInIntSubset = 256
- , EntityPropogated = 257
- , ExpectedNumericalCharRef = 258
- , ExpectedOpenSquareBracket = 259
- , BadSequenceInCharData = 260
- , IllegalSequenceInComment = 261
- , UnterminatedCDATASection = 262
- , ExpectedNDATA = 263
- , NDATANotValidForPE = 264
- , HexRadixMustBeLowerCase = 265
- , DeclStringRep = 266
- , DeclStringsInWrongOrder = 267
- , NoExtRefsInAttValue = 268
- , XMLDeclMustBeLowerCase = 269
- , ExpectedEntityValue = 270
- , BadDigitForRadix = 271
- , EndedWithTagsOnStack = 272
- , AmbiguousContentModel = 273
- , NestedCDATA = 274
- , UnknownPrefix = 275
- , PartialTagMarkupError = 276
- , EmptyMainEntity = 277
- , CDATAOutsideOfContent = 278
- , OnlyCharRefsAllowedHere = 279
- , Unexpected2ndSurrogateChar = 280
- , NoPIStartsWithXML = 281
- , XMLDeclMustBeFirst = 282
- , XMLVersionRequired = 283
- , StandaloneNotLegal = 284
- , EncodingRequired = 285
- , TooManyColonsInName = 286
- , InvalidColonPos = 287
- , ColonNotLegalWithNS = 288
- , SysException = 289
- , XMLException_Fatal = 290
- , UnexpectedEOF = 291
- , UnexpectedError = 292
- , BadSchemaLocation = 293
- , NoGrammarResolver = 294
- , SchemaScanFatalError = 295
- , IllegalRefInStandalone = 296
- , PEBetweenDecl = 297
- , NoEmptyStrNamespace = 298
- , NoUseOfxmlnsAsPrefix = 299
- , NoUseOfxmlnsURI = 300
- , PrefixXMLNotMatchXMLURI = 301
- , XMLURINotMatchXMLPrefix = 302
- , NoXMLNSAsElementPrefix = 303
- , CT_SimpleTypeChildRequired = 304
- , F_HighBounds = 305
+ , NSDeclInvalid = 168
+ , DOMLevel1Node = 169
+ , E_HighBounds = 170
+ , F_LowBounds = 171
+ , EntityExpansionLimitExceeded = 172
+ , ExpectedCommentOrCDATA = 173
+ , ExpectedAttrName = 174
+ , ExpectedNotationName = 175
+ , NoRepInMixed = 176
+ , BadDefAttrDecl = 177
+ , ExpectedDefAttrDecl = 178
+ , AttListSyntaxError = 179
+ , ExpectedEqSign = 180
+ , DupAttrName = 181
+ , BadIdForXMLLangAttr = 182
+ , ExpectedElementName = 183
+ , MustStartWithXMLDecl = 184
+ , CommentsMustStartWith = 185
+ , InvalidDocumentStructure = 186
+ , ExpectedDeclString = 187
+ , BadXMLVersion = 188
+ , UnsupportedXMLVersion = 189
+ , UnterminatedXMLDecl = 190
+ , BadXMLEncoding = 191
+ , BadStandalone = 192
+ , UnterminatedComment = 193
+ , PINameExpected = 194
+ , UnterminatedPI = 195
+ , InvalidCharacter = 196
+ , UnexpectedTextBeforeRoot = 197
+ , UnterminatedStartTag = 198
+ , ExpectedAttrValue = 199
+ , UnterminatedEndTag = 200
+ , ExpectedAttributeType = 201
+ , ExpectedEndOfTagX = 202
+ , ExpectedMarkup = 203
+ , NotValidAfterContent = 204
+ , ExpectedComment = 205
+ , ExpectedCommentOrPI = 206
+ , ExpectedWhitespace = 207
+ , NoRootElemInDOCTYPE = 208
+ , ExpectedQuotedString = 209
+ , ExpectedPublicId = 210
+ , InvalidPublicIdChar = 211
+ , UnterminatedDOCTYPE = 212
+ , InvalidCharacterInIntSubset = 213
+ , ExpectedCDATA = 214
+ , InvalidInitialNameChar = 215
+ , InvalidNameChar = 216
+ , UnexpectedWhitespace = 217
+ , InvalidCharacterInAttrValue = 218
+ , ExpectedMarkupDecl = 219
+ , TextDeclNotLegalHere = 220
+ , ConditionalSectInIntSubset = 221
+ , ExpectedPEName = 222
+ , UnterminatedEntityDecl = 223
+ , InvalidCharacterRef = 224
+ , UnterminatedCharRef = 225
+ , ExpectedEntityRefName = 226
+ , EntityNotFound = 227
+ , NoUnparsedEntityRefs = 228
+ , UnterminatedEntityRef = 229
+ , RecursiveEntity = 230
+ , PartialMarkupInEntity = 231
+ , UnterminatedElementDecl = 232
+ , ExpectedContentSpecExpr = 233
+ , ExpectedAsterisk = 234
+ , UnterminatedContentModel = 235
+ , ExpectedSystemId = 236
+ , ExpectedSystemOrPublicId = 237
+ , UnterminatedNotationDecl = 238
+ , ExpectedSeqChoiceLeaf = 239
+ , ExpectedChoiceOrCloseParen = 240
+ , ExpectedSeqOrCloseParen = 241
+ , ExpectedEnumValue = 242
+ , ExpectedEnumSepOrParen = 243
+ , UnterminatedEntityLiteral = 244
+ , MoreEndThanStartTags = 245
+ , ExpectedOpenParen = 246
+ , AttrAlreadyUsedInSTag = 247
+ , BracketInAttrValue = 248
+ , Expected2ndSurrogateChar = 249
+ , ExpectedEndOfConditional = 250
+ , ExpectedIncOrIgn = 251
+ , ExpectedINCLUDEBracket = 252
+ , ExpectedTextDecl = 253
+ , ExpectedXMLDecl = 254
+ , UnexpectedEOE = 255
+ , PEPropogated = 256
+ , ExtraCloseSquare = 257
+ , PERefInMarkupInIntSubset = 258
+ , EntityPropogated = 259
+ , ExpectedNumericalCharRef = 260
+ , ExpectedOpenSquareBracket = 261
+ , BadSequenceInCharData = 262
+ , IllegalSequenceInComment = 263
+ , UnterminatedCDATASection = 264
+ , ExpectedNDATA = 265
+ , NDATANotValidForPE = 266
+ , HexRadixMustBeLowerCase = 267
+ , DeclStringRep = 268
+ , DeclStringsInWrongOrder = 269
+ , NoExtRefsInAttValue = 270
+ , XMLDeclMustBeLowerCase = 271
+ , ExpectedEntityValue = 272
+ , BadDigitForRadix = 273
+ , EndedWithTagsOnStack = 274
+ , AmbiguousContentModel = 275
+ , NestedCDATA = 276
+ , UnknownPrefix = 277
+ , PartialTagMarkupError = 278
+ , EmptyMainEntity = 279
+ , CDATAOutsideOfContent = 280
+ , OnlyCharRefsAllowedHere = 281
+ , Unexpected2ndSurrogateChar = 282
+ , NoPIStartsWithXML = 283
+ , XMLDeclMustBeFirst = 284
+ , XMLVersionRequired = 285
+ , StandaloneNotLegal = 286
+ , EncodingRequired = 287
+ , TooManyColonsInName = 288
+ , InvalidColonPos = 289
+ , ColonNotLegalWithNS = 290
+ , SysException = 291
+ , XMLException_Fatal = 292
+ , UnexpectedEOF = 293
+ , UnexpectedError = 294
+ , BadSchemaLocation = 295
+ , NoGrammarResolver = 296
+ , SchemaScanFatalError = 297
+ , IllegalRefInStandalone = 298
+ , PEBetweenDecl = 299
+ , NoEmptyStrNamespace = 300
+ , NoUseOfxmlnsAsPrefix = 301
+ , NoUseOfxmlnsURI = 302
+ , PrefixXMLNotMatchXMLURI = 303
+ , XMLURINotMatchXMLPrefix = 304
+ , NoXMLNSAsElementPrefix = 305
+ , CT_SimpleTypeChildRequired = 306
+ , F_HighBounds = 307
};
static bool isFatal(const XMLErrs::Codes toCheck)
@@ -345,6 +348,14 @@
else if ((toCheck >= E_LowBounds) && (toCheck <= E_HighBounds))
return XMLErrorReporter::ErrType_Error;
return XMLErrorReporter::ErrTypes_Unknown;
+ }
+ static DOMError::ErrorSeverity DOMErrorType(const XMLErrs::Codes toCheck)
+ {
+ if ((toCheck >= W_LowBounds) && (toCheck <= W_HighBounds))
+ return DOMError::DOM_SEVERITY_WARNING;
+ else if ((toCheck >= F_LowBounds) && (toCheck <= F_HighBounds))
+ return DOMError::DOM_SEVERITY_FATAL_ERROR;
+ else return DOMError::DOM_SEVERITY_ERROR;
}
};
1.5 +9 -0 xml-xerces/c/src/xercesc/util/XMLDOMMsg.hpp
Index: XMLDOMMsg.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLDOMMsg.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLDOMMsg.hpp 20 Dec 2002 21:39:04 -0000 1.4
+++ XMLDOMMsg.hpp 14 May 2003 18:10:41 -0000 1.5
@@ -5,6 +5,7 @@
#include <xercesc/framework/XMLErrorReporter.hpp>
#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/dom/DOMError.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -69,6 +70,14 @@
else if ((toCheck >= E_LowBounds) && (toCheck <= E_HighBounds))
return XMLErrorReporter::ErrType_Error;
return XMLErrorReporter::ErrTypes_Unknown;
+ }
+ static DOMError::ErrorSeverity DOMErrorType(const XMLDOMMsg::Codes toCheck)
+ {
+ if ((toCheck >= W_LowBounds) && (toCheck <= W_HighBounds))
+ return DOMError::DOM_SEVERITY_WARNING;
+ else if ((toCheck >= F_LowBounds) && (toCheck <= F_HighBounds))
+ return DOMError::DOM_SEVERITY_FATAL_ERROR;
+ else return DOMError::DOM_SEVERITY_ERROR;
}
};
1.15 +1 -0 xml-xerces/c/src/xercesc/util/XMLExceptMsgs.hpp
Index: XMLExceptMsgs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLExceptMsgs.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XMLExceptMsgs.hpp 20 Mar 2003 20:08:54 -0000 1.14
+++ XMLExceptMsgs.hpp 14 May 2003 18:10:41 -0000 1.15
@@ -4,6 +4,7 @@
#define ERRHEADER_XMLExcepts
#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/dom/DOMError.hpp>
XERCES_CPP_NAMESPACE_BEGIN
1.27 +2 -0 xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
Index: en_US.txt
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- en_US.txt 28 Apr 2003 23:32:51 -0000 1.26
+++ en_US.txt 14 May 2003 18:10:41 -0000 1.27
@@ -169,6 +169,8 @@
"For '{0}' to be a member of the substitution group set of '{1}', its {abstract} must be false. " ,
"The namespace of element '{0}' must be from the schema namespace. " ,
"The {target namespace} of '{0}' must not match 'http://www.w3.org/2001/XMLSchema-instance'. " ,
+ "The namespace declaration is invalid. " ,
+ "Namespace fixup cannot be performed on a DOM Level 1 Node. " ,
"E_ End " ,
"F_ Start " ,
"The parser has encountered more than '{0}' entity expansions in this document; this is the limit imposed by the application. " ,
1.17 +5 -1 xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
Index: XercesMessages_en_US.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XercesMessages_en_US.hpp 28 Apr 2003 23:32:52 -0000 1.16
+++ XercesMessages_en_US.hpp 14 May 2003 18:10:41 -0000 1.17
@@ -430,6 +430,10 @@
, { 0x0054,0x0068,0x0065,0x0020,0x007B,0x0074,0x0061,0x0072,0x0067,0x0065,0x0074,0x0020,0x006E,0x0061,0x006D,0x0065,0x0073,0x0070,0x0061,0x0063,0x0065,0x007D,0x0020,0x006F,0x0066,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x006D,0x0075,0x0073,
0x0074,0x0020,0x006E,0x006F,0x0074,0x0020,0x006D,0x0061,0x0074,0x0063,0x0068,0x0020,0x0027,0x0068,0x0074,0x0074,0x0070,0x003A,0x002F,0x002F,0x0077,0x0077,0x0077,0x002E,0x0077,0x0033,0x002E,0x006F,0x0072,0x0067,0x002F,0x0032,0x0030,0x0030,0x0031,
0x002F,0x0058,0x004D,0x004C,0x0053,0x0063,0x0068,0x0065,0x006D,0x0061,0x002D,0x0069,0x006E,0x0073,0x0074,0x0061,0x006E,0x0063,0x0065,0x0027,0x002E,0x00 }
+ , { 0x0054,0x0068,0x0065,0x0020,0x006E,0x0061,0x006D,0x0065,0x0073,0x0070,0x0061,0x0063,0x0065,0x0020,0x0064,0x0065,0x0063,0x006C,0x0061,0x0072,0x0061,0x0074,0x0069,0x006F,0x006E,0x0020,0x0069,0x0073,0x0020,0x0069,0x006E,0x0076,0x0061,0x006C,0x0069,
+ 0x0064,0x002E,0x00 }
+ , { 0x004E,0x0061,0x006D,0x0065,0x0073,0x0070,0x0061,0x0063,0x0065,0x0020,0x0066,0x0069,0x0078,0x0075,0x0070,0x0020,0x0063,0x0061,0x006E,0x006E,0x006F,0x0074,0x0020,0x0062,0x0065,0x0020,0x0070,0x0065,0x0072,0x0066,0x006F,0x0072,0x006D,0x0065,0x0064,
+ 0x0020,0x006F,0x006E,0x0020,0x0061,0x0020,0x0044,0x004F,0x004D,0x0020,0x004C,0x0065,0x0076,0x0065,0x006C,0x0020,0x0031,0x0020,0x004E,0x006F,0x0064,0x0065,0x002E,0x00 }
, { 0x0045,0x005F,0x0045,0x006E,0x0064,0x00 }
, { 0x0046,0x005F,0x0053,0x0074,0x0061,0x0072,0x0074,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0070,0x0061,0x0072,0x0073,0x0065,0x0072,0x0020,0x0068,0x0061,0x0073,0x0020,0x0065,0x006E,0x0063,0x006F,0x0075,0x006E,0x0074,0x0065,0x0072,0x0065,0x0064,0x0020,0x006D,0x006F,0x0072,0x0065,0x0020,0x0074,0x0068,0x0061,
@@ -666,7 +670,7 @@
, { 0x0046,0x005F,0x0045,0x006E,0x0064,0x00 }
};
-const unsigned int gXMLErrArraySize = 306;
+const unsigned int gXMLErrArraySize = 308;
const XMLCh gXMLValidityArray[][128] =
{
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org