Author: amassari
Date: Wed Jul 29 16:01:28 2009
New Revision: 798961
URL: http://svn.apache.org/viewvc?rev=798961&view=rev
Log:
Report an error if more than one anyAttribute declaration is found, or if it is
not the last declaration (XERCESC-1717)
Modified:
xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
xerces/c/trunk/src/xercesc/framework/XMLErrorCodes.hpp
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt
xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc
xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
Modified: xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml?rev=798961&r1=798960&r2=798961&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml (original)
+++ xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml Wed Jul 29
16:01:28 2009
@@ -213,6 +213,8 @@
<Message Id="InvalidAttTNS" Text="target namespace of attribute
'{0}' cannot be http://www.w3.org/2001/XMLSchema-instance"/>
<Message Id="NSDeclInvalid" Text="invalid namespace declaration"/>
<Message Id="DOMLevel1Node" Text="namespace fix-up cannot be
performed on DOM Level 1 node"/>
+ <Message Id="DuplicateAnyAttribute" Text="more than one
anyAttribute declaration found in complex type declaration"/>
+ <Message Id="AnyAttributeBeforeAttribute" Text="anyAttribute must
not be followed by other declarations"/>
</Error>
<FatalError>
<Message Id="EntityExpansionLimitExceeded" Text= "parser has
encountered more than '{0}' entity expansions in the document; this is the
limit imposed by the application"/>
Modified: xerces/c/trunk/src/xercesc/framework/XMLErrorCodes.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLErrorCodes.hpp?rev=798961&r1=798960&r2=798961&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLErrorCodes.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLErrorCodes.hpp Wed Jul 29 16:01:28
2009
@@ -171,140 +171,142 @@
, InvalidAttTNS = 154
, NSDeclInvalid = 155
, DOMLevel1Node = 156
- , E_HighBounds = 157
- , F_LowBounds = 158
- , EntityExpansionLimitExceeded = 159
- , ExpectedCommentOrCDATA = 160
- , ExpectedAttrName = 161
- , ExpectedNotationName = 162
- , NoRepInMixed = 163
- , ExpectedDefAttrDecl = 164
- , ExpectedEqSign = 165
- , ExpectedElementName = 166
- , CommentsMustStartWith = 167
- , InvalidDocumentStructure = 168
- , ExpectedDeclString = 169
- , BadXMLVersion = 170
- , UnsupportedXMLVersion = 171
- , UnterminatedXMLDecl = 172
- , BadXMLEncoding = 173
- , BadStandalone = 174
- , UnterminatedComment = 175
- , PINameExpected = 176
- , UnterminatedPI = 177
- , InvalidCharacter = 178
- , UnterminatedStartTag = 179
- , ExpectedAttrValue = 180
- , UnterminatedEndTag = 181
- , ExpectedAttributeType = 182
- , ExpectedEndOfTagX = 183
- , ExpectedMarkup = 184
- , NotValidAfterContent = 185
- , ExpectedComment = 186
- , ExpectedCommentOrPI = 187
- , ExpectedWhitespace = 188
- , NoRootElemInDOCTYPE = 189
- , ExpectedQuotedString = 190
- , ExpectedPublicId = 191
- , InvalidPublicIdChar = 192
- , UnterminatedDOCTYPE = 193
- , InvalidCharacterInIntSubset = 194
- , UnexpectedWhitespace = 195
- , InvalidCharacterInAttrValue = 196
- , ExpectedMarkupDecl = 197
- , TextDeclNotLegalHere = 198
- , ConditionalSectInIntSubset = 199
- , ExpectedPEName = 200
- , UnterminatedEntityDecl = 201
- , InvalidCharacterRef = 202
- , UnterminatedCharRef = 203
- , ExpectedEntityRefName = 204
- , EntityNotFound = 205
- , NoUnparsedEntityRefs = 206
- , UnterminatedEntityRef = 207
- , RecursiveEntity = 208
- , PartialMarkupInEntity = 209
- , UnterminatedElementDecl = 210
- , ExpectedContentSpecExpr = 211
- , ExpectedAsterisk = 212
- , UnterminatedContentModel = 213
- , ExpectedSystemOrPublicId = 214
- , UnterminatedNotationDecl = 215
- , ExpectedSeqChoiceLeaf = 216
- , ExpectedChoiceOrCloseParen = 217
- , ExpectedSeqOrCloseParen = 218
- , ExpectedEnumValue = 219
- , ExpectedEnumSepOrParen = 220
- , UnterminatedEntityLiteral = 221
- , MoreEndThanStartTags = 222
- , ExpectedOpenParen = 223
- , AttrAlreadyUsedInSTag = 224
- , BracketInAttrValue = 225
- , Expected2ndSurrogateChar = 226
- , ExpectedEndOfConditional = 227
- , ExpectedIncOrIgn = 228
- , ExpectedINCLUDEBracket = 229
- , UnexpectedEOE = 230
- , PEPropogated = 231
- , ExtraCloseSquare = 232
- , PERefInMarkupInIntSubset = 233
- , EntityPropogated = 234
- , ExpectedNumericalCharRef = 235
- , ExpectedOpenSquareBracket = 236
- , BadSequenceInCharData = 237
- , IllegalSequenceInComment = 238
- , UnterminatedCDATASection = 239
- , ExpectedNDATA = 240
- , NDATANotValidForPE = 241
- , HexRadixMustBeLowerCase = 242
- , DeclStringRep = 243
- , DeclStringsInWrongOrder = 244
- , NoExtRefsInAttValue = 245
- , XMLDeclMustBeLowerCase = 246
- , ExpectedEntityValue = 247
- , BadDigitForRadix = 248
- , EndedWithTagsOnStack = 249
- , NestedCDATA = 250
- , UnknownPrefix = 251
- , PartialTagMarkupError = 252
- , EmptyMainEntity = 253
- , CDATAOutsideOfContent = 254
- , Unexpected2ndSurrogateChar = 255
- , NoPIStartsWithXML = 256
- , XMLDeclMustBeFirst = 257
- , XMLVersionRequired = 258
- , StandaloneNotLegal = 259
- , EncodingRequired = 260
- , ColonNotLegalWithNS = 261
- , XMLException_Fatal = 262
- , BadSchemaLocation = 263
- , SchemaScanFatalError = 264
- , IllegalRefInStandalone = 265
- , PEBetweenDecl = 266
- , NoEmptyStrNamespace = 267
- , NoUseOfxmlnsAsPrefix = 268
- , NoUseOfxmlnsURI = 269
- , PrefixXMLNotMatchXMLURI = 270
- , XMLURINotMatchXMLPrefix = 271
- , NoXMLNSAsElementPrefix = 272
- , CT_SimpleTypeChildRequired = 273
- , InvalidRootElemInDOCTYPE = 274
- , InvalidElementName = 275
- , InvalidAttrName = 276
- , InvalidEntityRefName = 277
- , DuplicateDocTypeDecl = 278
- , XIncludeOrphanFallback = 279
- , XIncludeNoHref = 280
- , XIncludeXPointerNotSupported = 281
- , XIncludeInvalidParseVal = 282
- , XIncludeMultipleFallbackElems = 283
- , XIncludeIncludeFailedNoFallback = 284
- , XIncludeCircularInclusionLoop = 285
- , XIncludeCircularInclusionDocIncludesSelf = 286
- , XIncludeDisallowedChild = 287
- , XIncludeConflictingNotation = 288
- , XIncludeConflictingEntity = 289
- , F_HighBounds = 290
+ , DuplicateAnyAttribute = 157
+ , AnyAttributeBeforeAttribute = 158
+ , E_HighBounds = 159
+ , F_LowBounds = 160
+ , EntityExpansionLimitExceeded = 161
+ , ExpectedCommentOrCDATA = 162
+ , ExpectedAttrName = 163
+ , ExpectedNotationName = 164
+ , NoRepInMixed = 165
+ , ExpectedDefAttrDecl = 166
+ , ExpectedEqSign = 167
+ , ExpectedElementName = 168
+ , CommentsMustStartWith = 169
+ , InvalidDocumentStructure = 170
+ , ExpectedDeclString = 171
+ , BadXMLVersion = 172
+ , UnsupportedXMLVersion = 173
+ , UnterminatedXMLDecl = 174
+ , BadXMLEncoding = 175
+ , BadStandalone = 176
+ , UnterminatedComment = 177
+ , PINameExpected = 178
+ , UnterminatedPI = 179
+ , InvalidCharacter = 180
+ , UnterminatedStartTag = 181
+ , ExpectedAttrValue = 182
+ , UnterminatedEndTag = 183
+ , ExpectedAttributeType = 184
+ , ExpectedEndOfTagX = 185
+ , ExpectedMarkup = 186
+ , NotValidAfterContent = 187
+ , ExpectedComment = 188
+ , ExpectedCommentOrPI = 189
+ , ExpectedWhitespace = 190
+ , NoRootElemInDOCTYPE = 191
+ , ExpectedQuotedString = 192
+ , ExpectedPublicId = 193
+ , InvalidPublicIdChar = 194
+ , UnterminatedDOCTYPE = 195
+ , InvalidCharacterInIntSubset = 196
+ , UnexpectedWhitespace = 197
+ , InvalidCharacterInAttrValue = 198
+ , ExpectedMarkupDecl = 199
+ , TextDeclNotLegalHere = 200
+ , ConditionalSectInIntSubset = 201
+ , ExpectedPEName = 202
+ , UnterminatedEntityDecl = 203
+ , InvalidCharacterRef = 204
+ , UnterminatedCharRef = 205
+ , ExpectedEntityRefName = 206
+ , EntityNotFound = 207
+ , NoUnparsedEntityRefs = 208
+ , UnterminatedEntityRef = 209
+ , RecursiveEntity = 210
+ , PartialMarkupInEntity = 211
+ , UnterminatedElementDecl = 212
+ , ExpectedContentSpecExpr = 213
+ , ExpectedAsterisk = 214
+ , UnterminatedContentModel = 215
+ , ExpectedSystemOrPublicId = 216
+ , UnterminatedNotationDecl = 217
+ , ExpectedSeqChoiceLeaf = 218
+ , ExpectedChoiceOrCloseParen = 219
+ , ExpectedSeqOrCloseParen = 220
+ , ExpectedEnumValue = 221
+ , ExpectedEnumSepOrParen = 222
+ , UnterminatedEntityLiteral = 223
+ , MoreEndThanStartTags = 224
+ , ExpectedOpenParen = 225
+ , AttrAlreadyUsedInSTag = 226
+ , BracketInAttrValue = 227
+ , Expected2ndSurrogateChar = 228
+ , ExpectedEndOfConditional = 229
+ , ExpectedIncOrIgn = 230
+ , ExpectedINCLUDEBracket = 231
+ , UnexpectedEOE = 232
+ , PEPropogated = 233
+ , ExtraCloseSquare = 234
+ , PERefInMarkupInIntSubset = 235
+ , EntityPropogated = 236
+ , ExpectedNumericalCharRef = 237
+ , ExpectedOpenSquareBracket = 238
+ , BadSequenceInCharData = 239
+ , IllegalSequenceInComment = 240
+ , UnterminatedCDATASection = 241
+ , ExpectedNDATA = 242
+ , NDATANotValidForPE = 243
+ , HexRadixMustBeLowerCase = 244
+ , DeclStringRep = 245
+ , DeclStringsInWrongOrder = 246
+ , NoExtRefsInAttValue = 247
+ , XMLDeclMustBeLowerCase = 248
+ , ExpectedEntityValue = 249
+ , BadDigitForRadix = 250
+ , EndedWithTagsOnStack = 251
+ , NestedCDATA = 252
+ , UnknownPrefix = 253
+ , PartialTagMarkupError = 254
+ , EmptyMainEntity = 255
+ , CDATAOutsideOfContent = 256
+ , Unexpected2ndSurrogateChar = 257
+ , NoPIStartsWithXML = 258
+ , XMLDeclMustBeFirst = 259
+ , XMLVersionRequired = 260
+ , StandaloneNotLegal = 261
+ , EncodingRequired = 262
+ , ColonNotLegalWithNS = 263
+ , XMLException_Fatal = 264
+ , BadSchemaLocation = 265
+ , SchemaScanFatalError = 266
+ , IllegalRefInStandalone = 267
+ , PEBetweenDecl = 268
+ , NoEmptyStrNamespace = 269
+ , NoUseOfxmlnsAsPrefix = 270
+ , NoUseOfxmlnsURI = 271
+ , PrefixXMLNotMatchXMLURI = 272
+ , XMLURINotMatchXMLPrefix = 273
+ , NoXMLNSAsElementPrefix = 274
+ , CT_SimpleTypeChildRequired = 275
+ , InvalidRootElemInDOCTYPE = 276
+ , InvalidElementName = 277
+ , InvalidAttrName = 278
+ , InvalidEntityRefName = 279
+ , DuplicateDocTypeDecl = 280
+ , XIncludeOrphanFallback = 281
+ , XIncludeNoHref = 282
+ , XIncludeXPointerNotSupported = 283
+ , XIncludeInvalidParseVal = 284
+ , XIncludeMultipleFallbackElems = 285
+ , XIncludeIncludeFailedNoFallback = 286
+ , XIncludeCircularInclusionLoop = 287
+ , XIncludeCircularInclusionDocIncludesSelf = 288
+ , XIncludeDisallowedChild = 289
+ , XIncludeConflictingNotation = 290
+ , XIncludeConflictingEntity = 291
+ , F_HighBounds = 292
};
static bool isFatal(const XMLErrs::Codes toCheck)
Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt?rev=798961&r1=798960&r2=798961&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt (original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt Wed Jul
29 16:01:28 2009
@@ -158,6 +158,8 @@
"target namespace of attribute '{0}' cannot be
http://www.w3.org/2001/XMLSchema-instance"; ,
"invalid namespace declaration" ,
"namespace fix-up cannot be performed on DOM Level 1 node" ,
+ "more than one anyAttribute declaration found in complex type
declaration" ,
+ "anyAttribute must not be followed by other declarations" ,
"E_ End " ,
"F_ Start " ,
"parser has encountered more than '{0}' entity expansions in
the document; this is the limit imposed by the application" ,
Modified:
xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp?rev=798961&r1=798960&r2=798961&view=diff
==============================================================================
---
xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
(original)
+++
xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
Wed Jul 29 16:01:28 2009
@@ -360,6 +360,11 @@
, {
0x0069,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x0020,0x006E,0x0061,0x006D,0x0065,0x0073,0x0070,0x0061,0x0063,0x0065,0x0020,0x0064,0x0065,0x0063,0x006C,0x0061,0x0072,0x0061,0x0074,0x0069,0x006F,0x006E,0x00
}
, {
0x006E,0x0061,0x006D,0x0065,0x0073,0x0070,0x0061,0x0063,0x0065,0x0020,0x0066,0x0069,0x0078,0x002D,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,0x0044,0x004F,0x004D,0x0020,0x004C,0x0065,0x0076,0x0065,0x006C,0x0020,0x0031,0x0020,0x006E,0x006F,0x0064,0x0065,0x00
}
+ , {
0x006D,0x006F,0x0072,0x0065,0x0020,0x0074,0x0068,0x0061,0x006E,0x0020,0x006F,0x006E,0x0065,0x0020,0x0061,0x006E,0x0079,0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0064,0x0065,0x0063,0x006C,0x0061,0x0072,0x0061,0x0074,
+
0x0069,0x006F,0x006E,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x0020,0x0069,0x006E,0x0020,0x0063,0x006F,0x006D,0x0070,0x006C,0x0065,0x0078,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x0064,0x0065,0x0063,0x006C,0x0061,0x0072,0x0061,0x0074,0x0069,
+ 0x006F,0x006E,0x00 }
+ , {
0x0061,0x006E,0x0079,0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x006E,0x006F,0x0074,0x0020,0x0062,0x0065,0x0020,0x0066,0x006F,0x006C,0x006C,0x006F,0x0077,0x0065,0x0064,0x0020,0x0062,
+
0x0079,0x0020,0x006F,0x0074,0x0068,0x0065,0x0072,0x0020,0x0064,0x0065,0x0063,0x006C,0x0061,0x0072,0x0061,0x0074,0x0069,0x006F,0x006E,0x0073,0x00
}
, { 0x0045,0x005F,0x0045,0x006E,0x0064,0x00 }
, { 0x0046,0x005F,0x0053,0x0074,0x0061,0x0072,0x0074,0x00 }
, {
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,0x006E,0x0020,0x0027,0x007B,
@@ -583,7 +588,7 @@
, { 0x0046,0x005F,0x0045,0x006E,0x0064,0x00 }
};
-const unsigned int gXMLErrArraySize = 291;
+const unsigned int gXMLErrArraySize = 293;
const XMLCh gXMLValidityArray[][128] =
{
Modified:
xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg?rev=798961&r1=798960&r2=798961&view=diff
==============================================================================
---
xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
(original)
+++
xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
Wed Jul 29 16:01:28 2009
@@ -153,137 +153,139 @@
154 target namespace of attribute '{0}' cannot be
http://www.w3.org/2001/XMLSchema-instance
155 invalid namespace declaration
156 namespace fix-up cannot be performed on DOM Level 1 node
-159 parser has encountered more than '{0}' entity expansions in the document;
this is the limit imposed by the application
-160 expected comment or CDATA section
-161 attribute name expected
-162 notation name expected
-163 illegal repetition of elements in mixed content model
-164 default attribute declaration expected
-165 equal sign expected
-166 element name expected
-167 comment must start with <!--
-168 invalid document structure
-169 expected version, encoding, or standalone declaration
-170 invalid XML version declaration
-171 unsupported XML version '{0}'
-172 unterminated XML declaration
-173 invalid XML encoding declaration '{0}'
-174 invalid standalone declaration
-175 unterminated comment
-176 processing instruction name expected
-177 unterminated processing instruction
-178 invalid character 0x{0}
-179 unterminated start tag '{0}'
-180 attribute value expected
-181 unterminated end tag '{0}'
-182 expected type for attribute '{0}' of element '{1}'
-183 expected end of tag '{0}'
-184 expected tag name, comment, PI, or other markup
-185 invalid content after root element's end tag
-186 comment expected
-187 comment or processing instruction expected
-188 whitespace expected
-189 expected root element in DOCTYPE declaration
-190 quoted string expected
-191 public id expected
-192 invalid character 0x{0} in public id
-193 unterminated DOCTYPE declaration
-194 invalid character 0x{0} in internal subset
-195 unexpected whitespace
-196 invalid character 0x{1} in attribute value '{0}'
-197 markup declaration expected
-198 TEXT declaration is illegal at this point
-199 conditional section in internal subset
-200 parameter entity name expected
-201 unterminated entity declaration '{0}'
-202 invalid character reference
-203 unterminated character reference
-204 expected entity name for reference
-205 entity '{0}' not found
-206 unparsed entity reference '{0}' is invalid at this point
-207 unterminated entity reference '{0}'
-208 recursive entity expansion '{0}'
-209 partial markup in entity value
-210 unterminated element declaration '{0}'
-211 expected content specification for element '{0}'
-212 '*' expected
-213 mixed content model '{0}' not terminated properly
-214 system or public id expected
-215 unterminated notation declaration
-216 expected ',', '|', or ')'
-217 expected '|' or ')'
-218 expected ',', '|', or ')' in content model of element '{0}'
-219 expected enumeration value for attribute '{0}'
-220 expected '|' or ')'
-221 unterminated entity literal
-222 unmatched end tag detected
-223 '(' expected
-224 attribute '{0}' is already specified for element '{1}'
-225 '<' character cannot be used in attribute value '{0}'; use < instead
-226 leading surrogate character is not followed by a legal second character
-227 expected ']]>' sequence to end conditional section
-228 expected INCLUDE or IGNORE at this point
-229 expected '[' to follow INCLUDE or IGNORE
-230 unexpected end of entity '{0}'
-231 parameter entity propagated out of internal/external subset
-232 unmatched ']' character detected
-233 parameter entity references are not allowed inside markup in internal
subset
-234 entity propagated out of the content section into miscellaneous
-235 expected &# to be followed by a numeric character value
-236 '[' expected
-237 ']]>' sequence is not allowed in character data
-238 '--' sequence is illegal in comment
-239 unterminated CDATA section
-240 NDATA expected
-241 NDATA is illegal for parameter entities
-242 hex radix character references must use 'x', not 'X'
-243 {0} declaration already seen
-244 XML declarations must be in this order: version, encoding, standalone
-245 external entity cannot be referred to from attribute value
-246 XML or TEXT declaration must start with '<?xml ', not '<?XML '
-247 expected literal entity value or public/system id
-248 '{0}' is not a valid digit for the specified radix
-249 input ended before all started tags were ended; last tag started is '{0}'
-250 nested CDATA section illegal
-251 prefix '{0}' can not be resolved to namespace URI
-252 start and the end tags are in different entities
-253 XML document cannot be empty
-254 CDATA section is illegal outside the root element
-255 unexpected trailing surrogate character
-256 processing instruction cannot start with 'xml'
-257 XML or TEXT declaration must start at line 1, column 1
-258 version declaration is required in XML declaration
-259 standalone declaration is only legal in the main XML entity
-260 encoding declaration is required in TEXT declaration
-261 colon is illegal in names when namespaces are enabled
-262 {0}
-263 schemaLocation does not contain namespace-location pairs
-264 fatal error during schema scan
-265 reference to external entity declaration '{0}' is illegal in standalone
document
-266 partial markup in parameter entity replacement text in complete
declaration
-267 invalid namespace value in prefix-namespace mapping '{0}'
-268 prefix 'xmlns' cannot be explicitly bound to namespace
-269 namespace for 'xmlns' cannot be explicitly bound to prefix
-270 prefix 'xml' cannot be bound to namespace other than its canonical
namespace
-271 namespace for 'xml' cannot be bound to prefix other than 'xml'
-272 element '{0}' cannot have 'xmlns' as its prefix
-273 restriction must contain simpleType definition
-274 invalid root element '{0}' in DOCTYPE declaration
-275 invalid element name '{0}'
-276 invalid attribute name '{0}'
-277 invalid entity reference name '{0}'
-278 DOCTYPE declaration already seen
-279 fallback element is not a direct child of include element
-280 include element without 'href' attribute
-281 include element with XPointer specification; XPointer is not yet supported
-282 invalid 'parse' attribute value '{0}'; expected 'text' or 'xml'
-283 multiple fallback elements in document '{0}'
-284 include failed and no fallback element found in document '{0}'
-285 circular inclusion in document '{0}'
-286 self-inclusion in document '{0}'
-287 element '{0}' is not allowed as a child of include element
-288 included notation '{0}' conflicts with notation already defined
-289 included entity '{0}' conflicts with entity already defined
+157 more than one anyAttribute declaration found in complex type declaration
+158 anyAttribute must not be followed by other declarations
+161 parser has encountered more than '{0}' entity expansions in the document;
this is the limit imposed by the application
+162 expected comment or CDATA section
+163 attribute name expected
+164 notation name expected
+165 illegal repetition of elements in mixed content model
+166 default attribute declaration expected
+167 equal sign expected
+168 element name expected
+169 comment must start with <!--
+170 invalid document structure
+171 expected version, encoding, or standalone declaration
+172 invalid XML version declaration
+173 unsupported XML version '{0}'
+174 unterminated XML declaration
+175 invalid XML encoding declaration '{0}'
+176 invalid standalone declaration
+177 unterminated comment
+178 processing instruction name expected
+179 unterminated processing instruction
+180 invalid character 0x{0}
+181 unterminated start tag '{0}'
+182 attribute value expected
+183 unterminated end tag '{0}'
+184 expected type for attribute '{0}' of element '{1}'
+185 expected end of tag '{0}'
+186 expected tag name, comment, PI, or other markup
+187 invalid content after root element's end tag
+188 comment expected
+189 comment or processing instruction expected
+190 whitespace expected
+191 expected root element in DOCTYPE declaration
+192 quoted string expected
+193 public id expected
+194 invalid character 0x{0} in public id
+195 unterminated DOCTYPE declaration
+196 invalid character 0x{0} in internal subset
+197 unexpected whitespace
+198 invalid character 0x{1} in attribute value '{0}'
+199 markup declaration expected
+200 TEXT declaration is illegal at this point
+201 conditional section in internal subset
+202 parameter entity name expected
+203 unterminated entity declaration '{0}'
+204 invalid character reference
+205 unterminated character reference
+206 expected entity name for reference
+207 entity '{0}' not found
+208 unparsed entity reference '{0}' is invalid at this point
+209 unterminated entity reference '{0}'
+210 recursive entity expansion '{0}'
+211 partial markup in entity value
+212 unterminated element declaration '{0}'
+213 expected content specification for element '{0}'
+214 '*' expected
+215 mixed content model '{0}' not terminated properly
+216 system or public id expected
+217 unterminated notation declaration
+218 expected ',', '|', or ')'
+219 expected '|' or ')'
+220 expected ',', '|', or ')' in content model of element '{0}'
+221 expected enumeration value for attribute '{0}'
+222 expected '|' or ')'
+223 unterminated entity literal
+224 unmatched end tag detected
+225 '(' expected
+226 attribute '{0}' is already specified for element '{1}'
+227 '<' character cannot be used in attribute value '{0}'; use < instead
+228 leading surrogate character is not followed by a legal second character
+229 expected ']]>' sequence to end conditional section
+230 expected INCLUDE or IGNORE at this point
+231 expected '[' to follow INCLUDE or IGNORE
+232 unexpected end of entity '{0}'
+233 parameter entity propagated out of internal/external subset
+234 unmatched ']' character detected
+235 parameter entity references are not allowed inside markup in internal
subset
+236 entity propagated out of the content section into miscellaneous
+237 expected &# to be followed by a numeric character value
+238 '[' expected
+239 ']]>' sequence is not allowed in character data
+240 '--' sequence is illegal in comment
+241 unterminated CDATA section
+242 NDATA expected
+243 NDATA is illegal for parameter entities
+244 hex radix character references must use 'x', not 'X'
+245 {0} declaration already seen
+246 XML declarations must be in this order: version, encoding, standalone
+247 external entity cannot be referred to from attribute value
+248 XML or TEXT declaration must start with '<?xml ', not '<?XML '
+249 expected literal entity value or public/system id
+250 '{0}' is not a valid digit for the specified radix
+251 input ended before all started tags were ended; last tag started is '{0}'
+252 nested CDATA section illegal
+253 prefix '{0}' can not be resolved to namespace URI
+254 start and the end tags are in different entities
+255 XML document cannot be empty
+256 CDATA section is illegal outside the root element
+257 unexpected trailing surrogate character
+258 processing instruction cannot start with 'xml'
+259 XML or TEXT declaration must start at line 1, column 1
+260 version declaration is required in XML declaration
+261 standalone declaration is only legal in the main XML entity
+262 encoding declaration is required in TEXT declaration
+263 colon is illegal in names when namespaces are enabled
+264 {0}
+265 schemaLocation does not contain namespace-location pairs
+266 fatal error during schema scan
+267 reference to external entity declaration '{0}' is illegal in standalone
document
+268 partial markup in parameter entity replacement text in complete
declaration
+269 invalid namespace value in prefix-namespace mapping '{0}'
+270 prefix 'xmlns' cannot be explicitly bound to namespace
+271 namespace for 'xmlns' cannot be explicitly bound to prefix
+272 prefix 'xml' cannot be bound to namespace other than its canonical
namespace
+273 namespace for 'xml' cannot be bound to prefix other than 'xml'
+274 element '{0}' cannot have 'xmlns' as its prefix
+275 restriction must contain simpleType definition
+276 invalid root element '{0}' in DOCTYPE declaration
+277 invalid element name '{0}'
+278 invalid attribute name '{0}'
+279 invalid entity reference name '{0}'
+280 DOCTYPE declaration already seen
+281 fallback element is not a direct child of include element
+282 include element without 'href' attribute
+283 include element with XPointer specification; XPointer is not yet supported
+284 invalid 'parse' attribute value '{0}'; expected 'text' or 'xml'
+285 multiple fallback elements in document '{0}'
+286 include failed and no fallback element found in document '{0}'
+287 circular inclusion in document '{0}'
+288 self-inclusion in document '{0}'
+289 element '{0}' is not allowed as a child of include element
+290 included notation '{0}' conflicts with notation already defined
+291 included entity '{0}' conflicts with entity already defined
$set 2
Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc?rev=798961&r1=798960&r2=798961&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc (original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc Wed Jul 29
16:01:28 2009
@@ -258,137 +258,139 @@
154 L"target namespace of attribute '{0}' cannot be
http://www.w3.org/2001/XMLSchema-instance";
155 L"invalid namespace declaration"
156 L"namespace fix-up cannot be performed on DOM Level 1
node"
- 159 L"parser has encountered more than '{0}' entity
expansions in the document; this is the limit imposed by the application"
- 160 L"expected comment or CDATA section"
- 161 L"attribute name expected"
- 162 L"notation name expected"
- 163 L"illegal repetition of elements in mixed content model"
- 164 L"default attribute declaration expected"
- 165 L"equal sign expected"
- 166 L"element name expected"
- 167 L"comment must start with <!--"
- 168 L"invalid document structure"
- 169 L"expected version, encoding, or standalone declaration"
- 170 L"invalid XML version declaration"
- 171 L"unsupported XML version '{0}'"
- 172 L"unterminated XML declaration"
- 173 L"invalid XML encoding declaration '{0}'"
- 174 L"invalid standalone declaration"
- 175 L"unterminated comment"
- 176 L"processing instruction name expected"
- 177 L"unterminated processing instruction"
- 178 L"invalid character 0x{0}"
- 179 L"unterminated start tag '{0}'"
- 180 L"attribute value expected"
- 181 L"unterminated end tag '{0}'"
- 182 L"expected type for attribute '{0}' of element '{1}'"
- 183 L"expected end of tag '{0}'"
- 184 L"expected tag name, comment, PI, or other markup"
- 185 L"invalid content after root element's end tag"
- 186 L"comment expected"
- 187 L"comment or processing instruction expected"
- 188 L"whitespace expected"
- 189 L"expected root element in DOCTYPE declaration"
- 190 L"quoted string expected"
- 191 L"public id expected"
- 192 L"invalid character 0x{0} in public id"
- 193 L"unterminated DOCTYPE declaration"
- 194 L"invalid character 0x{0} in internal subset"
- 195 L"unexpected whitespace"
- 196 L"invalid character 0x{1} in attribute value '{0}'"
- 197 L"markup declaration expected"
- 198 L"TEXT declaration is illegal at this point"
- 199 L"conditional section in internal subset"
- 200 L"parameter entity name expected"
- 201 L"unterminated entity declaration '{0}'"
- 202 L"invalid character reference"
- 203 L"unterminated character reference"
- 204 L"expected entity name for reference"
- 205 L"entity '{0}' not found"
- 206 L"unparsed entity reference '{0}' is invalid at this
point"
- 207 L"unterminated entity reference '{0}'"
- 208 L"recursive entity expansion '{0}'"
- 209 L"partial markup in entity value"
- 210 L"unterminated element declaration '{0}'"
- 211 L"expected content specification for element '{0}'"
- 212 L"'*' expected"
- 213 L"mixed content model '{0}' not terminated properly"
- 214 L"system or public id expected"
- 215 L"unterminated notation declaration"
- 216 L"expected ',', '|', or ')'"
- 217 L"expected '|' or ')'"
- 218 L"expected ',', '|', or ')' in content model of element
'{0}'"
- 219 L"expected enumeration value for attribute '{0}'"
- 220 L"expected '|' or ')'"
- 221 L"unterminated entity literal"
- 222 L"unmatched end tag detected"
- 223 L"'(' expected"
- 224 L"attribute '{0}' is already specified for element '{1}'"
- 225 L"'<' character cannot be used in attribute value '{0}';
use < instead"
- 226 L"leading surrogate character is not followed by a legal
second character"
- 227 L"expected ']]>' sequence to end conditional section"
- 228 L"expected INCLUDE or IGNORE at this point"
- 229 L"expected '[' to follow INCLUDE or IGNORE"
- 230 L"unexpected end of entity '{0}'"
- 231 L"parameter entity propagated out of internal/external
subset"
- 232 L"unmatched ']' character detected"
- 233 L"parameter entity references are not allowed inside
markup in internal subset"
- 234 L"entity propagated out of the content section into
miscellaneous"
- 235 L"expected &# to be followed by a numeric character
value"
- 236 L"'[' expected"
- 237 L"']]>' sequence is not allowed in character data"
- 238 L"'--' sequence is illegal in comment"
- 239 L"unterminated CDATA section"
- 240 L"NDATA expected"
- 241 L"NDATA is illegal for parameter entities"
- 242 L"hex radix character references must use 'x', not 'X'"
- 243 L"{0} declaration already seen"
- 244 L"XML declarations must be in this order: version,
encoding, standalone"
- 245 L"external entity cannot be referred to from attribute
value"
- 246 L"XML or TEXT declaration must start with '<?xml ', not
'<?XML '"
- 247 L"expected literal entity value or public/system id"
- 248 L"'{0}' is not a valid digit for the specified radix"
- 249 L"input ended before all started tags were ended; last
tag started is '{0}'"
- 250 L"nested CDATA section illegal"
- 251 L"prefix '{0}' can not be resolved to namespace URI"
- 252 L"start and the end tags are in different entities"
- 253 L"XML document cannot be empty"
- 254 L"CDATA section is illegal outside the root element"
- 255 L"unexpected trailing surrogate character"
- 256 L"processing instruction cannot start with 'xml'"
- 257 L"XML or TEXT declaration must start at line 1, column 1"
- 258 L"version declaration is required in XML declaration"
- 259 L"standalone declaration is only legal in the main XML
entity"
- 260 L"encoding declaration is required in TEXT declaration"
- 261 L"colon is illegal in names when namespaces are enabled"
- 262 L"{0}"
- 263 L"schemaLocation does not contain namespace-location
pairs"
- 264 L"fatal error during schema scan"
- 265 L"reference to external entity declaration '{0}' is
illegal in standalone document"
- 266 L"partial markup in parameter entity replacement text in
complete declaration"
- 267 L"invalid namespace value in prefix-namespace mapping
'{0}'"
- 268 L"prefix 'xmlns' cannot be explicitly bound to namespace"
- 269 L"namespace for 'xmlns' cannot be explicitly bound to
prefix"
- 270 L"prefix 'xml' cannot be bound to namespace other than
its canonical namespace"
- 271 L"namespace for 'xml' cannot be bound to prefix other
than 'xml'"
- 272 L"element '{0}' cannot have 'xmlns' as its prefix"
- 273 L"restriction must contain simpleType definition"
- 274 L"invalid root element '{0}' in DOCTYPE declaration"
- 275 L"invalid element name '{0}'"
- 276 L"invalid attribute name '{0}'"
- 277 L"invalid entity reference name '{0}'"
- 278 L"DOCTYPE declaration already seen"
- 279 L"fallback element is not a direct child of include
element"
- 280 L"include element without 'href' attribute"
- 281 L"include element with XPointer specification; XPointer
is not yet supported"
- 282 L"invalid 'parse' attribute value '{0}'; expected 'text'
or 'xml'"
- 283 L"multiple fallback elements in document '{0}'"
- 284 L"include failed and no fallback element found in
document '{0}'"
- 285 L"circular inclusion in document '{0}'"
- 286 L"self-inclusion in document '{0}'"
- 287 L"element '{0}' is not allowed as a child of include
element"
- 288 L"included notation '{0}' conflicts with notation
already defined"
- 289 L"included entity '{0}' conflicts with entity already
defined"
+ 157 L"more than one anyAttribute declaration found in
complex type declaration"
+ 158 L"anyAttribute must not be followed by other
declarations"
+ 161 L"parser has encountered more than '{0}' entity
expansions in the document; this is the limit imposed by the application"
+ 162 L"expected comment or CDATA section"
+ 163 L"attribute name expected"
+ 164 L"notation name expected"
+ 165 L"illegal repetition of elements in mixed content model"
+ 166 L"default attribute declaration expected"
+ 167 L"equal sign expected"
+ 168 L"element name expected"
+ 169 L"comment must start with <!--"
+ 170 L"invalid document structure"
+ 171 L"expected version, encoding, or standalone declaration"
+ 172 L"invalid XML version declaration"
+ 173 L"unsupported XML version '{0}'"
+ 174 L"unterminated XML declaration"
+ 175 L"invalid XML encoding declaration '{0}'"
+ 176 L"invalid standalone declaration"
+ 177 L"unterminated comment"
+ 178 L"processing instruction name expected"
+ 179 L"unterminated processing instruction"
+ 180 L"invalid character 0x{0}"
+ 181 L"unterminated start tag '{0}'"
+ 182 L"attribute value expected"
+ 183 L"unterminated end tag '{0}'"
+ 184 L"expected type for attribute '{0}' of element '{1}'"
+ 185 L"expected end of tag '{0}'"
+ 186 L"expected tag name, comment, PI, or other markup"
+ 187 L"invalid content after root element's end tag"
+ 188 L"comment expected"
+ 189 L"comment or processing instruction expected"
+ 190 L"whitespace expected"
+ 191 L"expected root element in DOCTYPE declaration"
+ 192 L"quoted string expected"
+ 193 L"public id expected"
+ 194 L"invalid character 0x{0} in public id"
+ 195 L"unterminated DOCTYPE declaration"
+ 196 L"invalid character 0x{0} in internal subset"
+ 197 L"unexpected whitespace"
+ 198 L"invalid character 0x{1} in attribute value '{0}'"
+ 199 L"markup declaration expected"
+ 200 L"TEXT declaration is illegal at this point"
+ 201 L"conditional section in internal subset"
+ 202 L"parameter entity name expected"
+ 203 L"unterminated entity declaration '{0}'"
+ 204 L"invalid character reference"
+ 205 L"unterminated character reference"
+ 206 L"expected entity name for reference"
+ 207 L"entity '{0}' not found"
+ 208 L"unparsed entity reference '{0}' is invalid at this
point"
+ 209 L"unterminated entity reference '{0}'"
+ 210 L"recursive entity expansion '{0}'"
+ 211 L"partial markup in entity value"
+ 212 L"unterminated element declaration '{0}'"
+ 213 L"expected content specification for element '{0}'"
+ 214 L"'*' expected"
+ 215 L"mixed content model '{0}' not terminated properly"
+ 216 L"system or public id expected"
+ 217 L"unterminated notation declaration"
+ 218 L"expected ',', '|', or ')'"
+ 219 L"expected '|' or ')'"
+ 220 L"expected ',', '|', or ')' in content model of element
'{0}'"
+ 221 L"expected enumeration value for attribute '{0}'"
+ 222 L"expected '|' or ')'"
+ 223 L"unterminated entity literal"
+ 224 L"unmatched end tag detected"
+ 225 L"'(' expected"
+ 226 L"attribute '{0}' is already specified for element '{1}'"
+ 227 L"'<' character cannot be used in attribute value '{0}';
use < instead"
+ 228 L"leading surrogate character is not followed by a legal
second character"
+ 229 L"expected ']]>' sequence to end conditional section"
+ 230 L"expected INCLUDE or IGNORE at this point"
+ 231 L"expected '[' to follow INCLUDE or IGNORE"
+ 232 L"unexpected end of entity '{0}'"
+ 233 L"parameter entity propagated out of internal/external
subset"
+ 234 L"unmatched ']' character detected"
+ 235 L"parameter entity references are not allowed inside
markup in internal subset"
+ 236 L"entity propagated out of the content section into
miscellaneous"
+ 237 L"expected &# to be followed by a numeric character
value"
+ 238 L"'[' expected"
+ 239 L"']]>' sequence is not allowed in character data"
+ 240 L"'--' sequence is illegal in comment"
+ 241 L"unterminated CDATA section"
+ 242 L"NDATA expected"
+ 243 L"NDATA is illegal for parameter entities"
+ 244 L"hex radix character references must use 'x', not 'X'"
+ 245 L"{0} declaration already seen"
+ 246 L"XML declarations must be in this order: version,
encoding, standalone"
+ 247 L"external entity cannot be referred to from attribute
value"
+ 248 L"XML or TEXT declaration must start with '<?xml ', not
'<?XML '"
+ 249 L"expected literal entity value or public/system id"
+ 250 L"'{0}' is not a valid digit for the specified radix"
+ 251 L"input ended before all started tags were ended; last
tag started is '{0}'"
+ 252 L"nested CDATA section illegal"
+ 253 L"prefix '{0}' can not be resolved to namespace URI"
+ 254 L"start and the end tags are in different entities"
+ 255 L"XML document cannot be empty"
+ 256 L"CDATA section is illegal outside the root element"
+ 257 L"unexpected trailing surrogate character"
+ 258 L"processing instruction cannot start with 'xml'"
+ 259 L"XML or TEXT declaration must start at line 1, column 1"
+ 260 L"version declaration is required in XML declaration"
+ 261 L"standalone declaration is only legal in the main XML
entity"
+ 262 L"encoding declaration is required in TEXT declaration"
+ 263 L"colon is illegal in names when namespaces are enabled"
+ 264 L"{0}"
+ 265 L"schemaLocation does not contain namespace-location
pairs"
+ 266 L"fatal error during schema scan"
+ 267 L"reference to external entity declaration '{0}' is
illegal in standalone document"
+ 268 L"partial markup in parameter entity replacement text in
complete declaration"
+ 269 L"invalid namespace value in prefix-namespace mapping
'{0}'"
+ 270 L"prefix 'xmlns' cannot be explicitly bound to namespace"
+ 271 L"namespace for 'xmlns' cannot be explicitly bound to
prefix"
+ 272 L"prefix 'xml' cannot be bound to namespace other than
its canonical namespace"
+ 273 L"namespace for 'xml' cannot be bound to prefix other
than 'xml'"
+ 274 L"element '{0}' cannot have 'xmlns' as its prefix"
+ 275 L"restriction must contain simpleType definition"
+ 276 L"invalid root element '{0}' in DOCTYPE declaration"
+ 277 L"invalid element name '{0}'"
+ 278 L"invalid attribute name '{0}'"
+ 279 L"invalid entity reference name '{0}'"
+ 280 L"DOCTYPE declaration already seen"
+ 281 L"fallback element is not a direct child of include
element"
+ 282 L"include element without 'href' attribute"
+ 283 L"include element with XPointer specification; XPointer
is not yet supported"
+ 284 L"invalid 'parse' attribute value '{0}'; expected 'text'
or 'xml'"
+ 285 L"multiple fallback elements in document '{0}'"
+ 286 L"include failed and no fallback element found in
document '{0}'"
+ 287 L"circular inclusion in document '{0}'"
+ 288 L"self-inclusion in document '{0}'"
+ 289 L"element '{0}' is not allowed as a child of include
element"
+ 290 L"included notation '{0}' conflicts with notation
already defined"
+ 291 L"included entity '{0}' conflicts with entity already
defined"
END
STRINGTABLE DISCARDABLE
BEGIN
Modified: xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp?rev=798961&r1=798960&r2=798961&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp Wed Jul 29
16:01:28 2009
@@ -6679,15 +6679,24 @@
const XMLCh* childName = child->getLocalName();
if (XMLString::equals(childName, SchemaSymbols::fgELT_ATTRIBUTE)) {
+ if(attWildCard)
+ reportSchemaError(child, XMLUni::fgXMLErrDomain,
XMLErrs::AnyAttributeBeforeAttribute);
+
traverseAttributeDecl(child, typeInfo);
}
else if (XMLString::equals(childName,
SchemaSymbols::fgELT_ATTRIBUTEGROUP)) {
+ if(attWildCard)
+ reportSchemaError(child, XMLUni::fgXMLErrDomain,
XMLErrs::AnyAttributeBeforeAttribute);
+
attGroupInfo = traverseAttributeGroupDecl(child, typeInfo);
if (attGroupInfo && !attGroupList.containsElement(attGroupInfo)) {
attGroupList.addElement(attGroupInfo);
}
}
else if (XMLString::equals(childName,
SchemaSymbols::fgELT_ANYATTRIBUTE) ) {
+ if(attWildCard)
+ reportSchemaError(child, XMLUni::fgXMLErrDomain,
XMLErrs::DuplicateAnyAttribute);
+
attWildCard = traverseAnyAttribute(child);
janAttWildCard.reset(attWildCard);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
