From 5613cc3b395bc263cda89517740720d8d29317b0 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <borisk@apache.org>
Date: Mon, 10 Mar 2008 16:56:27 +0000
Subject: [PATCH] Clean up error messages
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@635600 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml | 276 +++++-------------
src/xercesc/internal/DGXMLScanner.cpp | 10 +-
src/xercesc/internal/IGXMLScanner.cpp | 10 +-
src/xercesc/internal/IGXMLScanner2.cpp | 2 +-
src/xercesc/internal/SGXMLScanner.cpp | 12 +-
src/xercesc/internal/WFXMLScanner.cpp | 6 -
src/xercesc/internal/XMLScanner.cpp | 21 --
.../validators/schema/SchemaValidator.cpp | 4 +-
tools/NLS/Xlat/Xlat_ICUResourceBundle.cpp | 4 +-
9 files changed, 84 insertions(+), 261 deletions(-)
diff --git a/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml b/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
index aa0bb2ab2..85ce822ca 100644
--- a/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
+++ b/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
@@ -13,105 +13,91 @@
<Message Id="ContradictoryEncoding" Text="Encoding ({0}, from XMLDecl or manually set) contradicts the auto-sensed encoding, ignoring it"/>
<Message Id="UndeclaredElemInCM" Text="Element '{0}' was referenced in a content model but never declared"/>
<Message Id="UndeclaredElemInAttList" Text="Element '{0}' was referenced in an attlist but never declared"/>
- <Message Id="XMLException_Warning" Text="An exception occurred! Type:{0}, Message:{1}"/>
- <Message Id="XIncludeResourceErrorWarning" Text="Error occurred including document '{0}'"/>
+ <Message Id="XMLException_Warning" Text="{0}"/>
+ <Message Id="XIncludeResourceErrorWarning" Text="Unable to include document '{0}'"/>
<Message Id="XIncludeCannotOpenFile" Text="Cannot open text file target '{0}'"/>
- <Message Id="XIncludeInternalTextIncError" Text="Internal error including text file '{0}'"/>
- <Message Id="XIncludeIncludeFailedResourceError" Text="Unable to include resource '{0}'"/>
+ <Message Id="XIncludeIncludeFailedResourceError" Text="Unable to include resource '{0}'"/>
</Warning>
<Error>
<Message Id="FeatureUnsupported" Text="'{0}' is not allowed for the content of a simpleType. Only list, union and restriction are allowed."/>
- <Message Id="TopLevelNoNameComplexType" Text="Error: Top level complexType has no name - declaration ignored"/>
- <Message Id="TopLevelNoNameAttribute" Text="Globally-declared attribute must have a name - attribute declaration ignored"/>
- <Message Id="NoNameRefAttribute" Text="Attribute must have a name or a ref - attribute declaration ignored"/>
- <Message Id="GlobalNoNameElement" Text="Globally-declared element must have a name - element declaration ignored"/>
- <Message Id="NoNameRefElement" Text="Element must have a name or a ref attribute - element ignored"/>
- <Message Id="NoNameRefGroup" Text="<group> must have a name or a ref attribute - declaration ignored"/>
- <Message Id="NoNameRefAttGroup" Text="<attributeGroup> must have a name or a ref attribute - declaration ignored"/>
- <Message Id="AnonComplexTypeWithName" Text="Anonymous complexType in element {0} has a name attribute"/>
- <Message Id="AnonSimpleTypeWithName" Text="Anonymous simpleType in element {0} has a name attribute"/>
+ <Message Id="TopLevelNoNameComplexType" Text="Globally-declared complex type must have a name"/>
+ <Message Id="TopLevelNoNameAttribute" Text="Globally-declared attribute must have a name"/>
+ <Message Id="NoNameRefAttribute" Text="Attribute must have a name or a ref"/>
+ <Message Id="NoNameRefElement" Text="Element must have a name or a ref attribute"/>
+ <Message Id="NoNameRefGroup" Text="<group> must have a name or a ref attribute"/>
+ <Message Id="NoNameRefAttGroup" Text="<attributeGroup> must have a name or a ref attribute"/>
+ <Message Id="AnonComplexTypeWithName" Text="Anonymous complexType in element '{0}' has a name attribute"/>
+ <Message Id="AnonSimpleTypeWithName" Text="Anonymous simpleType in element '{0}' has a name attribute"/>
<Message Id="InvalidElementContent" Text="The content of an element information item does not match (annotation?, (simpleType | complexType)?, (unique | key | keyref)*)"/>
- <Message Id="UntypedElement" Text="Untyped element: {0}"/>
- <Message Id="SimpleTypeContentError" Text="Error in content of simpleType, '{0}' is invalid. Only allowed one of (restriction | list | union)."/>
- <Message Id="ExpectedSimpleTypeInList" Text="Expected simpleType in 'list' declaration for {0}"/>
- <Message Id="ListUnionRestrictionError" Text="List | Union | Restriction content is invalid for type {0}"/>
- <Message Id="SimpleTypeDerivationByListError" Text="Error in content of derivation by list for {0}"/>
- <Message Id="ExpectedSimpleTypeInRestriction" Text="Expected simpleType in 'restriction' declaration for {0}"/>
- <Message Id="DuplicateFacet" Text="Facet {0} already defined - ignoring"/>
- <Message Id="ExpectedSimpleTypeInUnion" Text="Expected simpleType in 'union' declaration for {0}"/>
+ <Message Id="SimpleTypeContentError" Text="Invalid content in simple type '{0}'. Only allowed one of (restriction | list | union)."/>
+ <Message Id="ExpectedSimpleTypeInList" Text="Expected simpleType in 'list' declaration for '{0}'"/>
+ <Message Id="ListUnionRestrictionError" Text="List | Union | Restriction content is invalid for type '{0}'"/>
+ <Message Id="SimpleTypeDerivationByListError" Text="Error in content of derivation by list for '{0}'"/>
+ <Message Id="ExpectedSimpleTypeInRestriction" Text="Expected simpleType in 'restriction' declaration for '{0}'"/>
+ <Message Id="DuplicateFacet" Text="Facet '{0}' already defined"/>
+ <Message Id="ExpectedSimpleTypeInUnion" Text="Expected simpleType in 'union' declaration for '{0}'"/>
<Message Id="EmptySimpleTypeContent" Text="SimpleType content is empty"/>
<Message Id="InvalidSimpleContent" Text="The content of the simpleContent element is invalid. The content must be RESTRICTION or EXTENSION"/>
<Message Id="UnspecifiedBase" Text="The BASE attribute must be specified for the RESTRICTION or EXTENSION element"/>
<Message Id="InvalidComplexContent" Text="The content of the complexContent element is invalid. The content must be RESTRICTION or EXTENSION"/>
<Message Id="SchemaElementContentError" Text="Error in content of <schema> element information item"/>
- <Message Id="ContentError" Text="Content (annotation?,..) is incorrect for type {0}"/>
- <Message Id="UnknownSimpleType" Text="Unknown simpleType: {0}"/>
- <Message Id="UnknownComplexType" Text="Unknown complexType: {0}"/>
+ <Message Id="ContentError" Text="Content (annotation?,..) is incorrect for type '{0}'"/>
+ <Message Id="UnknownSimpleType" Text="Unknown simpleType: '{0}'"/>
+ <Message Id="UnknownComplexType" Text="Unknown complexType: '{0}'"/>
<Message Id="UnresolvedPrefix" Text="Prefix: '{0}' can not be resolved to a URI"/>
- <Message Id="RefElementNotFound" Text="Ref element {0} not found in the Schema"/>
- <Message Id="TypeNotFound" Text="Type not found in {0}:{1}"/>
- <Message Id="TopLevelAttributeNotFound" Text="Could not find top level attribute: {0}"/>
+ <Message Id="RefElementNotFound" Text="Ref element '{0}' not found in the Schema"/>
+ <Message Id="TypeNotFound" Text="Type not found in '{0}:{1}'"/>
+ <Message Id="TopLevelAttributeNotFound" Text="Could not find top level attribute: '{0}'"/>
<Message Id="InvalidChildInComplexType" Text="Invalid child '{0}' in the complex type"/>
- <Message Id="BaseTypeNotFound" Text="Base type could not be found: {0}"/>
- <Message Id="NoAttributeInSchema" Text="No attribute '{0}' was defined in schema: {1}"/>
- <Message Id="DatatypeValidatorCreationError" Text="Error creating datatype validator: {0}"/>
+ <Message Id="BaseTypeNotFound" Text="Base type could not be found: '{0}'"/>
+ <Message Id="DatatypeValidatorCreationError" Text="Unable to create datatype validator '{0}'"/>
<Message Id="InvalidChildFollowingSimpleContent" Text="Invalid child following the simpleContent child in the complexType"/>
<Message Id="InvalidChildFollowingConplexContent" Text="Invalid child following the complexContent child in the complexType"/>
- <Message Id="InvalidComplexTypeBlockValue" Text="The 'block' attribute values of a complexType must be #all | list(restriction,extension); {0} was found"/>
- <Message Id="InvalidComplexTypeFinalValue" Text="The 'final' attribute values of a complexType must be #all | list(restriction,extension); {0} was found"/>
<Message Id="AttributeDefaultFixedValue" Text="Attribute '{0}={1}' cannot have both 'fixed' and 'default' present at the same time."/>
<Message Id="NotOptionalDefaultAttValue" Text="For attribute '{0}={1}' default and use are both present so use must have the value 'optional'."/>
- <Message Id="LocalAttributeWithNameRef" Text="Local attribute:{0} has also a ref defined - name ignored"/>
- <Message Id="GlobalAttributeWithNameRef" Text="Global attribute:'{0}' cannot have a ref defined"/>
- <Message Id="DuplicateAttribute" Text="Error: Attribute '{0}' declared more than once in the same scope- ignoring"/>
+ <Message Id="DuplicateAttribute" Text="Attribute '{0}' declared more than once in the same scope"/>
<Message Id="AttributeWithTypeAndSimpleType" Text="Attribute '{0}' may not contain both a type and a simpleType declaration."/>
- <Message Id="AttributeSimpleTypeNotFound" Text="SimpleType ({0}:{1}) for attribute: {2} not found"/>
+ <Message Id="AttributeSimpleTypeNotFound" Text="SimpleType ({0}:{1}) for attribute: '{2}' not found"/>
<Message Id="ElementWithFixedAndDefault" Text="Element '{0}' cannot have both 'fixed' and 'default' present at the same time."/>
- <Message Id="DeclarationWithNameRef" Text="{0}:'{1}' has also a ref defined - name ignored"/>
- <Message Id="BadAttWithRef" Text="ref cannot appear with any of type, abstract, block, final, nillable, default or fixed"/>
- <Message Id="InvalidDeclarationName" Text="Invalid {0} name:'{1}' - declaration ignored"/>
- <Message Id="GlobalElementWithRef" Text="Globally-declared element {0} cannot have a ref attribute - ref ignored"/>
+ <Message Id="InvalidDeclarationName" Text="Invalid {0} name:'{1}'"/>
<Message Id="ElementWithTypeAndAnonType" Text="Element '{0}' cannot have both a type attribute and a simpleType/complexType type child"/>
- <Message Id="NotSimpleOrMixedElement" Text="Element {0} has a fixed or default value and must have a mixed simple or simple content model"/>
- <Message Id="DisallowedSimpleTypeExtension" Text="The simpleType {0} that {1} uses has a value of 'final' which does not permit extension"/>
+ <Message Id="NotSimpleOrMixedElement" Text="Element '{0}' has a fixed or default value and must have a mixed simple or simple content model"/>
+ <Message Id="DisallowedSimpleTypeExtension" Text="The simpleType '{0}' that '{1}' uses has a value of 'final' which does not permit extension"/>
<Message Id="InvalidSimpleContentBase" Text="The type '{0}' specified as the base in the simpleContent element must not have complexContent"/>
<Message Id="InvalidComplexTypeBase" Text="The type '{0}' is a simple type. It cannot be used in a derivation by RESTRICTION for a complexType"/>
<Message Id="InvalidChildInSimpleContent" Text="Invalid child following the RESTRICTION or EXTENSION element in the simpleContent definition"/>
<Message Id="InvalidChildInComplexContent" Text="Invalid child following the RESTRICTION or EXTENSION element in the complexContent definition"/>
- <Message Id="AnnotationError" Text="Annotation can only appear once: type {0}"/>
- <Message Id="DisallowedBaseDerivation" Text="The base type {0} does not allow itself to be used as the base for a restriction and/or as a type in a list and/or union"/>
+ <Message Id="AnnotationError" Text="Annotation can only appear once: type '{0}'"/>
+ <Message Id="DisallowedBaseDerivation" Text="The base type '{0}' does not allow itself to be used as the base for a restriction and/or as a type in a list and/or union"/>
<Message Id="SubstitutionRepeated" Text="The value 'substitution' already in the list"/>
<Message Id="UnionRepeated" Text="The value 'union' is already in the list"/>
<Message Id="ExtensionRepeated" Text="The value 'extension' is already in the list"/>
<Message Id="ListRepeated" Text="The value 'list' is already in the list"/>
<Message Id="RestrictionRepeated" Text="The value 'restriction' is already in the list"/>
- <Message Id="InvalidBlockValue" Text="Invalid block value: {0}"/>
- <Message Id="InvalidFinalValue" Text="Invalid final value: {0}"/>
- <Message Id="InvalidSubstitutionGroupElement" Text="Element {0} cannot be part of the substitution group headed by {1}"/>
- <Message Id="SubstitutionGroupTypeMismatch" Text="Element {0} has a type which does not derive from the type of the element at the head of the substitution group"/>
- <Message Id="DuplicateElementDeclaration" Text="Duplicate element decl in the same scope: {0}"/>
- <Message Id="InvalidElementBlockValue" Text="The 'block' attribute values of an element must be #all | list(substitution,restriction,extension); {0} was found"/>
- <Message Id="InvalidElementFinalValue" Text="The 'final' attribute values of an element must be #all | list(restriction,extension); {0} was found"/>
+ <Message Id="InvalidBlockValue" Text="Invalid block value: '{0}'"/>
+ <Message Id="InvalidFinalValue" Text="Invalid final value: '{0}'"/>
+ <Message Id="InvalidSubstitutionGroupElement" Text="Element '{0}' cannot be part of the substitution group headed by '{1}'"/>
+ <Message Id="SubstitutionGroupTypeMismatch" Text="Element '{0}' has a type which does not derive from the type of the element at the head of the substitution group"/>
+ <Message Id="DuplicateElementDeclaration" Text="Duplicate element decl in the same scope: '{0}'"/>
<Message Id="InvalidAttValue" Text="Invalid value '{0}' for attribute: '{1}'."/>
<Message Id="AttributeRefContentError" Text="Ref is present, and simpleType/form/type found for attribute '{0}={1}'"/>
- <Message Id="DuplicateRefAttribute" Text="Duplicate reference attribute {0}:{1} in complexType"/>
+ <Message Id="DuplicateRefAttribute" Text="Duplicate reference attribute '{0}:{1}' in complexType"/>
<Message Id="ForbiddenDerivationByRestriction" Text="Derivation by restriction is forbidden by either the base type '{0}' or the schema"/>
<Message Id="ForbiddenDerivationByExtension" Text="Derivation by extension is forbidden by either the base type '{0}' or the schema"/>
<Message Id="BaseNotComplexType" Text="The base type specified in the complexContent element must be a complexType"/>
<Message Id="ImportNamespaceDifference" Text="Imported schema '{0}' has a different targetNameSpace '{1}' from what's declared '{2}'"/>
- <Message Id="ImportRootError" Text="Could not get the doc root for imported Schema: {0}"/>
<Message Id="DeclarationNoSchemaLocation" Text="A schemaLocation attribute must be specified on '{0}' element."/>
<Message Id="IncludeNamespaceDifference" Text="Included schema '{0}' has a different targetNameSpace '{1}'"/>
<Message Id="OnlyAnnotationExpected" Text="At most one <annotation> element is expected in the content."/>
<Message Id="InvalidAttributeContent" Text="The content must be (annotation?, simpleType?) for attribute '{0}={1}'"/>
- <Message Id="AttributeRequired" Text="Attribute '{0}' must appear in {1} {2} declarations"/>
- <Message Id="AttributeDisallowed" Text="Attribute '{0}' cannot appear in {1} {2} declarations"/>
+ <Message Id="AttributeRequired" Text="Attribute '{0}' must appear in '{1}' '{2}' declarations"/>
+ <Message Id="AttributeDisallowed" Text="Attribute '{0}' cannot appear in '{1}' '{2}' declarations"/>
<Message Id="InvalidMin2MaxOccurs" Text="Value of minOccurs '{0}' must not be greater than value of maxOccurs '{1}'"/>
<Message Id="AnyAttributeContentError" Text="'anyAttribute' elements can contain at most one 'annotation' element in their children"/>
- <Message Id="NoNameGlobalElement" Text="Global <{0}> must have a name - declaration ignored"/>
+ <Message Id="NoNameGlobalElement" Text="Global <{0}> must have a name"/>
<Message Id="NoCircularDefinition" Text="No circular definitions are allowed: '{0}'"/>
- <Message Id="DuplicateGlobalType" Text="Global {0}:'{1}' declared more than once or also declared as {2}"/>
- <Message Id="DuplicateGlobalDeclaration" Text="Global {0}:'{1}' declared more than once"/>
+ <Message Id="DuplicateGlobalType" Text="Global '{0}:{1}' declared more than once or also declared as '{2}'"/>
+ <Message Id="DuplicateGlobalDeclaration" Text="Global '{0}:{1}' declared more than once"/>
<Message Id="WS_CollapseExpected" Text="Invalid value '{0}' for facet 'whiteSpace'. Value should be 'collapse'."/>
<Message Id="Import_1_1" Text="The namespace of an <import> element must be different from the targetNamespace of the <import>ing schema"/>
<Message Id="Import_1_2" Text="If the namespace on an <import> element is not present, the <import>ing schema must have a targetNamespace"/>
@@ -123,15 +109,13 @@
<Message Id="InvalidContentRestriction" Text="The content type is not a valid restriction of the content type of the base."/>
<Message Id="ForbiddenDerivation" Text="Derivation by extension or restriction is forbidden by either the base type '{0}' or the schema"/>
<Message Id="AtomicItemType" Text="The {item type definition} must have {variety} of atomic or union (where all member types must be atomic)"/>
- <Message Id="MemberTypeNoUnion" Text="The {member type definitions} must all have {variety} of atomic or list"/>
<Message Id="GroupContentError" Text="The group:'{0}' must contain (all | choice | sequence)"/>
<Message Id="AttGroupContentError" Text="The attributeGroup:'{0}' must match (annotation?. ((attribute | attributeGroup)*, anyAttribute?))"/>
<Message Id="MinMaxOnGroupChild" Text="The child of a model group definition must not specify either the minOccurs or maxOccurs attribute."/>
- <Message Id="DeclarationNotFound" Text="The {0} -'{1}:{2}'- not found in the schema"/>
+ <Message Id="DeclarationNotFound" Text="The {0} '{1}:{2}' not found in the schema"/>
<Message Id="AllContentLimited" Text="A group whose content is 'all' must only appear as the content type of a complex type definition."/>
<Message Id="BadMinMaxAllCT" Text="When a model group has {compositor} 'all' which constitutes the {content type} of a complex type, minOccurs=maxOccurs=1"/>
<Message Id="BadMinMaxAllElem" Text="In an 'all' schema component, the value of minOccurs/maxOccurs of an element must be '0' or '1'."/>
- <Message Id="NoCircularAttGroup" Text="Circular attributeGroup reference -{0}- is disallowed outside <redefine>"/>
<Message Id="DuplicateAttInDerivation" Text="Attribute '{0}' already defined in base and should not appear in derivation by extension."/>
<Message Id="NotExpressibleWildCardIntersection" Text="The intensional intersection of {attributes wildcard}s must be expressible"/>
<Message Id="BadAttDerivation_1" Text="Base type definition does not have any attributes"/>
@@ -154,7 +138,6 @@
<Message Id="Redefine_GroupRefCount" Text="If a group child of a <redefine> element contains a group ref'ing itself, it must have exactly 1 reference."/>
<Message Id="Redefine_AttGroupRefCount" Text="If an attributeGroup of a <redefine> element contains a reference to itself, such reference must be exactly 1"/>
<Message Id="Redefine_InvalidChild" Text="A <redefine> element cannot contain a child of type '{0}'"/>
- <Message Id="Notation_InvalidDecl" Text="The declaration for notation '{0}' is invalid"/>
<Message Id="Notation_DeclNotFound" Text="The notation declaration '{0}:{1}' is not found"/>
<Message Id="IC_DuplicateDecl" Text="More than one identity constraint named '{0}'."/>
<Message Id="IC_BadContent" Text="The content of an identity constraint must match (annotation?, selector, field+)"/>
@@ -166,16 +149,14 @@
<Message Id="AttDeclPropCorrect5" Text="More than one attribute derived from type ID cannot appear in the same complex type - '{0}' ignored"/>
<Message Id="AttGrpPropCorrect3" Text="More than one attribute derived from type ID cannot appear in the same attribute group - '{0}' ignored"/>
<Message Id="InvalidTargetNSValue" Text="'' is not a legal value for the targetNamespace attribute; the attribute must be absent or contain a nonempty value"/>
- <Message Id="DisplayErrorMessage" Text="{0}"/>
- <Message Id="XMLException_Error" Text="An exception occurred! Type:{0}, Message:{1}"/>
+ <Message Id="XMLException_Error" Text="{0}"/>
<Message Id="InvalidRedefine" Text="Invalid Redefine: '{0}' has already been included or redefined"/>
<Message Id="InvalidNSReference" Text="Schema Representation Constraint: Namespace '{0}' is referenced without <import> declaration"/>
<Message Id="NotAllContent" Text="An 'all' model group that's part of a complex type definition must constitute the entire content type of the definition"/>
<Message Id="InvalidAnnotationContent" Text="An <annotation> can only contain <appinfo> and <documentation> elements"/>
- <Message Id="InvalidFacetName" Text="Invalid facet name: {0}"/>
+ <Message Id="InvalidFacetName" Text="Invalid facet name: '{0}'"/>
<Message Id="InvalidXMLSchemaRoot" Text="The root element name of an XML Schema should be 'schema'."/>
<Message Id="CircularSubsGroup" Text="Circular substitution groups are disallowed for element '{0}'."/>
- <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." />
@@ -187,27 +168,21 @@
<Message Id="ExpectedAttrName" Text="Expected an attribute name"/>
<Message Id="ExpectedNotationName" Text="Expected a notation name"/>
<Message Id="NoRepInMixed" Text="Repetition of individual elements is not legal for mixed content models"/>
- <Message Id="BadDefAttrDecl" Text="Bad default attribute declaration"/>
<Message Id="ExpectedDefAttrDecl" Text="Expected default attribute declaration, assuming #IMPLIED "/>
- <Message Id="AttListSyntaxError" Text="Attribute list syntax error"/>
<Message Id="ExpectedEqSign" Text="Expected equal sign"/>
- <Message Id="DupAttrName" Text="Duplication attribute name"/>
- <Message Id="BadIdForXMLLangAttr" Text="Bad ID, '{0}', for xml:lang attribute"/>
<Message Id="ExpectedElementName" Text="Expected an element name"/>
- <Message Id="MustStartWithXMLDecl" Text="Must start with an XMLDecl"/>
<Message Id="CommentsMustStartWith" Text="Comments must start with <!--"/>
<Message Id="InvalidDocumentStructure" Text="Invalid document structure"/>
<Message Id="ExpectedDeclString" Text="Expected a 'version=', 'encoding=', or 'standalone='"/>
- <Message Id="BadXMLVersion" Text="Bad XML version string"/>
+ <Message Id="BadXMLVersion" Text="Invalid XML version string"/>
<Message Id="UnsupportedXMLVersion" Text="Unsupported XML version, '{0}'"/>
<Message Id="UnterminatedXMLDecl" Text="Unterminated XML decl"/>
- <Message Id="BadXMLEncoding" Text="Bad XML encoding declaration, '{0}'"/>
- <Message Id="BadStandalone" Text="Bad standalone declaration"/>
+ <Message Id="BadXMLEncoding" Text="Invalid XML encoding declaration, '{0}'"/>
+ <Message Id="BadStandalone" Text="Invalid standalone declaration"/>
<Message Id="UnterminatedComment" Text="Unterminated comment"/>
<Message Id="PINameExpected" Text="Processing instruction name expected"/>
<Message Id="UnterminatedPI" Text="Unterminated processing instruction"/>
<Message Id="InvalidCharacter" Text="Invalid character (Unicode: 0x{0})"/>
- <Message Id="UnexpectedTextBeforeRoot" Text="Unexpected text before root element"/>
<Message Id="UnterminatedStartTag" Text="Unterminated start tag, '{0}'"/>
<Message Id="ExpectedAttrValue" Text="Expected an attribute value"/>
<Message Id="UnterminatedEndTag" Text="Unterminated end tag, '{0}'"/>
@@ -224,13 +199,10 @@
<Message Id="InvalidPublicIdChar" Text="Invalid character in public id (Unicode: 0x{0})"/>
<Message Id="UnterminatedDOCTYPE" Text="Unterminated DOCTYPE declaration"/>
<Message Id="InvalidCharacterInIntSubset" Text="Invalid character in internal subset (Unicode: 0x{0})"/>
- <Message Id="ExpectedCDATA" Text="Expected CDATA section"/>
- <Message Id="InvalidInitialNameChar" Text="Invalid initial name character"/>
- <Message Id="InvalidNameChar" Text="Invalid name character"/>
<Message Id="UnexpectedWhitespace" Text="Unexpected whitespace"/>
<Message Id="InvalidCharacterInAttrValue" Text="Invalid character in attribute value {0} (Unicode: 0x{1})"/>
<Message Id="ExpectedMarkupDecl" Text="Expected a markup declaration"/>
- <Message Id="TextDeclNotLegalHere" Text="Text declaration not legal here"/>
+ <Message Id="TextDeclNotLegalHere" Text="Text declaration not legal at this point"/>
<Message Id="ConditionalSectInIntSubset" Text="Conditional section in internal subset"/>
<Message Id="ExpectedPEName" Text="Expected parameter entity name"/>
<Message Id="UnterminatedEntityDecl" Text="Unterminated entity declaration, '{0}'"/>
@@ -238,7 +210,7 @@
<Message Id="UnterminatedCharRef" Text="Unterminated character reference"/>
<Message Id="ExpectedEntityRefName" Text="Expected entity name for reference"/>
<Message Id="EntityNotFound" Text="Entity '{0}' was not found"/>
- <Message Id="NoUnparsedEntityRefs" Text="Unparsed entity references, '{0}', not valid here"/>
+ <Message Id="NoUnparsedEntityRefs" Text="Unparsed entity references, '{0}', not valid at this point"/>
<Message Id="UnterminatedEntityRef" Text="Unterminated entity reference, '{0}'"/>
<Message Id="RecursiveEntity" Text="Recursive entity expansion, '{0}'"/>
<Message Id="PartialMarkupInEntity" Text="Partial markup in entity value"/>
@@ -246,7 +218,6 @@
<Message Id="ExpectedContentSpecExpr" Text="Expected content specification expression for element '{0}'"/>
<Message Id="ExpectedAsterisk" Text="Expected asterisk"/>
<Message Id="UnterminatedContentModel" Text="'{0}' is a mixed content model that is not terminated properly."/>
- <Message Id="ExpectedSystemId" Text="Expected system id"/>
<Message Id="ExpectedSystemOrPublicId" Text="Expected system or public id"/>
<Message Id="UnterminatedNotationDecl" Text="Unterminated notation declaration"/>
<Message Id="ExpectedSeqChoiceLeaf" Text="Expected ',', '|', or ')' characters"/>
@@ -261,52 +232,42 @@
<Message Id="BracketInAttrValue" Text="A '<' character cannot be used in attribute '{0}', except through &lt;"/>
<Message Id="Expected2ndSurrogateChar" Text="A leading surrogate character was not followed by a legal second character"/>
<Message Id="ExpectedEndOfConditional" Text="Expected ']]>' to end a conditional section"/>
- <Message Id="ExpectedIncOrIgn" Text="Expected INCLUDE or IGNORE here"/>
+ <Message Id="ExpectedIncOrIgn" Text="Expected INCLUDE or IGNORE at this point"/>
<Message Id="ExpectedINCLUDEBracket" Text="Expected [ to follow INCLUDE or IGNORE"/>
- <Message Id="ExpectedTextDecl" Text="Expected a TextDecl here: <?xml ...."/>
- <Message Id="ExpectedXMLDecl" Text="Expected a XMLDecl here: <?xml ...."/>
<Message Id="UnexpectedEOE" Text="Unexpected end of entity {0}"/>
<Message Id="PEPropogated" Text="A PE propagated out of the int/ext subset, discarding extra text"/>
- <Message Id="ExtraCloseSquare" Text="An extra ] character was found an ignored"/>
+ <Message Id="ExtraCloseSquare" Text="An extra ] character was found"/>
<Message Id="PERefInMarkupInIntSubset" Text="PE refs are not allowed inside markup in the internal subset"/>
<Message Id="EntityPropogated" Text="An entity propagated out of the content section into Miscellaneous"/>
<Message Id="ExpectedNumericalCharRef" Text="Expected &# to be followed by a numeric character value"/>
- <Message Id="ExpectedOpenSquareBracket" Text="Expected an open bracket ('[') here"/>
+ <Message Id="ExpectedOpenSquareBracket" Text="Expected an open bracket ('[')"/>
<Message Id="BadSequenceInCharData" Text="The sequence ']]>' is not allowed in character data"/>
<Message Id="IllegalSequenceInComment" Text="Illegal sequence '--' in comment"/>
<Message Id="UnterminatedCDATASection" Text="Unterminated CDATA section"/>
<Message Id="ExpectedNDATA" Text="Expected NDATA"/>
<Message Id="NDATANotValidForPE" Text="NDATA is not legal for parameter entities"/>
<Message Id="HexRadixMustBeLowerCase" Text="Hex radix character refs must use 'x', not 'X'"/>
- <Message Id="DeclStringRep" Text="'{0}' has already been set. Ignoring redundant setting"/>
+ <Message Id="DeclStringRep" Text="'{0}' has already been set"/>
<Message Id="DeclStringsInWrongOrder" Text="The XMLDecl strings must be in the order: version, encoding, standalone"/>
<Message Id="NoExtRefsInAttValue" Text="External entities cannot be referred to from attribute values"/>
<Message Id="XMLDeclMustBeLowerCase" Text="The XML or Text decl must start with '<?xml ', not '<?XML '"/>
<Message Id="ExpectedEntityValue" Text="Expected a literal entity value or PUBLIC/SYSTEM id"/>
<Message Id="BadDigitForRadix" Text="'{0}' is not a valid digit for the indicated radix"/>
<Message Id="EndedWithTagsOnStack" Text="The input ended before all started tags were ended. Last tag started was '{0}'"/>
- <Message Id="AmbiguousContentModel" Text="The content model for element '{0}' is ambiguous"/>
<Message Id="NestedCDATA" Text="Nested CDATA sections are not allowed"/>
<Message Id="UnknownPrefix" Text="The prefix '{0}' has not been mapped to any URI"/>
<Message Id="PartialTagMarkupError" Text="The start and the end tag were in the different entities"/>
<Message Id="EmptyMainEntity" Text="The main XML document cannot be empty"/>
<Message Id="CDATAOutsideOfContent" Text="CDATA is not allowed outside the root element"/>
- <Message Id="OnlyCharRefsAllowedHere" Text="Only numeric character entities or special character entities are legal here"/>
<Message Id="Unexpected2ndSurrogateChar" Text="Got an unexpected trailing surrogate character"/>
<Message Id="NoPIStartsWithXML" Text="No processing instruction starts with 'xml'"/>
<Message Id="XMLDeclMustBeFirst" Text="The XML or Text declaration must start at line/column 1/1"/>
<Message Id="XMLVersionRequired" Text="The 'version=' string is required in an XMLDecl"/>
<Message Id="StandaloneNotLegal" Text="The 'standalone=' string is only allowed in the main XML entity"/>
<Message Id="EncodingRequired" Text="The 'encoding=' string is required in an Text Decl"/>
- <Message Id="TooManyColonsInName" Text="When namespaces are enabled, a name can have only one colon character"/>
- <Message Id="InvalidColonPos" Text="When namespaces are enabled, the colon cannot be the first or last character"/>
<Message Id="ColonNotLegalWithNS" Text="Colons are not allowed in this name when namespaces are enabled"/>
- <Message Id="SysException" Text="A system exception occurred during processing"/>
- <Message Id="XMLException_Fatal" Text="An exception occurred! Type:{0}, Message:{1}"/>
- <Message Id="UnexpectedEOF" Text="Unexpected end of file exception. Message: {0}"/>
- <Message Id="UnexpectedError" Text="UnexpectedError"/>
+ <Message Id="XMLException_Fatal" Text="{0}"/>
<Message Id="BadSchemaLocation" Text="The schemaLocation attribute does not contain pairs of values."/>
- <Message Id="NoGrammarResolver" Text="Internal error: don't have a GrammarResolver for TraverseSchema"/>
<Message Id="SchemaScanFatalError" Text="Fatal error encountered during schema scan"/>
<Message Id="IllegalRefInStandalone" Text="Reference to external entity declaration '{0}' is not allowed in a standalone document."/>
<Message Id="PEBetweenDecl" Text="Partial markup in parameter entity replacement text in a complete declaration."/>
@@ -317,11 +278,11 @@
<Message Id="XMLURINotMatchXMLPrefix" Text="The namespace for 'xml' cannot be bound to any prefix other than 'xml'."/>
<Message Id="NoXMLNSAsElementPrefix" Text="Element '{0}' cannot have 'xmlns' as its prefix."/>
<Message Id="CT_SimpleTypeChildRequired" Text="Complex Type Definition Representation OK - 2.2: <restriction> must have a <simpleType> child."/>
- <Message Id="InvalidRootElemInDOCTYPE" Text="DOCTYPE root element qname beginning with '{0}' invalid"/>
- <Message Id="InvalidElementName" Text="Element qname beginning with '{0}' invalid"/>
- <Message Id="InvalidAttrName" Text="Attribute qname beginning with '{0}' invalid"/>
- <Message Id="InvalidEntityRefName" Text="Entity qname for reference beginning '{0}' invalid"/>
- <Message Id="DuplicateDocTypeDecl" Text="Already seen doctype"/>
+ <Message Id="InvalidRootElemInDOCTYPE" Text="DOCTYPE root element qname beginning with '{0}' invalid"/>
+ <Message Id="InvalidElementName" Text="Element qname beginning with '{0}' invalid"/>
+ <Message Id="InvalidAttrName" Text="Attribute qname beginning with '{0}' invalid"/>
+ <Message Id="InvalidEntityRefName" Text="Entity qname for reference beginning '{0}' invalid"/>
+ <Message Id="DuplicateDocTypeDecl" Text="Already seen doctype"/>
<Message Id="XIncludeOrphanFallback" Text="Found a fallback element not a direct child of include element"/>
<Message Id="XIncludeNoHref" Text="include element found without href attribute"/>
<Message Id="XIncludeXPointerNotSupported" Text="Found an include element with xpointer specification. XPointer not yet supported"/>
@@ -363,47 +324,13 @@
<Message Id="NoMultipleValues" Text="Attribute '{0}' does not support multiple values"/>
<Message Id="NotSameAsFixedValue" Text="Attribute '{0}' has a value, '{1}', that does not match its #FIXED value, '{2}'"/>
<Message Id="RepElemInMixed" Text="Element types cannot be duplicated in Mixed content models"/>
- <Message Id="NoValidatorFor" Text="No validator for datatype {0}"/>
- <Message Id="IncorrectDatatype" Text="Incorrect datatype: {0}"/>
- <Message Id="NotADatatype" Text="{0} is not a datatype."/>
- <Message Id="TextOnlyContentWithType" Text="The content attribute must be 'textOnly' if you specify a type attribute."/>
<Message Id="FeatureUnsupported" Text="{0} is unsupported"/>
- <Message Id="NestedOnlyInElemOnly" Text="Nested Element decls only allowed in elementOnly content"/>
- <Message Id="EltRefOnlyInMixedElemOnly" Text="Element references only allowed in mixed or elementOnly content"/>
- <Message Id="OnlyInEltContent" Text="{0} only allowed in elementOnly content."/>
- <Message Id="OrderIsAll" Text="{0} not allowed if the order is all."/>
- <Message Id="DatatypeWithType" Text="Datatype qualifiers can only be used if you specify a type attribute."/>
- <Message Id="DatatypeQualUnsupported" Text="The datatype qualifier {0} is not supported."/>
<Message Id="GroupContentRestricted" Text="'{0}' is not allowed for the content of a '{1}' model group. Only element, group, choice, sequence and any are allowed."/>
- <Message Id="UnknownBaseDatatype" Text="Unknown base type {0} for type {1}."/>
- <Message Id="OneOfTypeRefArchRef" Text="Can only have one of type and ref attributes."/>
+ <Message Id="UnknownBaseDatatype" Text="Unknown base type '{0}' for type '{1}'."/>
<Message Id="NoContentForRef" Text="A <{0}> declaration that has a ref attribute, cannot have child content."/>
- <Message Id="IncorrectDefaultType" Text="Incorrect type for {0}'s default value: {1}"/>
- <Message Id="IllegalAttContent" Text="Illegal content {0} in attribute group"/>
- <Message Id="ValueNotInteger" Text="Value of {0} is not an integer."/>
- <Message Id="DatatypeError" Text="Datatype error: Type:{0}, Message:{1}."/>
- <Message Id="SchemaError" Text="Schema error: Type:{0}, Message:{1}"/>
- <Message Id="TypeAlreadySet" Text="The type of the element has already been declared."/>
+ <Message Id="DatatypeError" Text="{1}"/>
<Message Id="ProhibitedAttributePresent" Text="Prohibited Attribute {0} is found."/>
<Message Id="IllegalXMLSpace" Text="Illegal xml:space declaration."/>
- <Message Id="NotBoolean" Text="{0} is not a boolean."/>
- <Message Id="NotDecimal" Text="{0} is not a decimal."/>
- <Message Id="FacetsInconsistent" Text="Facets are inconsistent with base type."/>
- <Message Id="IllegalFacetValue" Text="Illegal value {0} for facet {1}."/>
- <Message Id="IllegalDecimalFacet" Text="Illegal Facet for decimal type."/>
- <Message Id="UnknownFacet" Text="Unknown Facet: {0}."/>
- <Message Id="InvalidEnumValue" Text="Invalid value for Enum constant: {0}."/>
- <Message Id="OutOfBounds" Text="{0} is out of bounds:[ {1} {3} X {4} {2} ]."/>
- <Message Id="NotAnEnumValue" Text="{0} is not one of the specified enum values."/>
- <Message Id="NotInteger" Text="{0} is not an integer."/>
- <Message Id="IllegalIntegerFacet" Text="Illegal Facet for Integer type."/>
- <Message Id="NotReal" Text="{0} is not a double."/>
- <Message Id="IllegalRealFacet" Text="Illegal Facet for Real type."/>
- <Message Id="ScaleLargerThanPrecision" Text="Scale Facet must be less than or equal to Precision Facet"/>
- <Message Id="PrecisionExceeded" Text="{0} has exceeded the precision Facet {1}"/>
- <Message Id="ScaleExceeded" Text="{0} has exceeded the scale Facet {1}"/>
- <Message Id="NotFloat" Text="{0} is not a float."/>
- <Message Id="SchemaRootError" Text="Can't get back Schema document's root element {0}."/>
<Message Id="WrongTargetNamespace" Text="Schema in {0} has a different target namespace from the one specified in the instance document {1}."/>
<Message Id="SimpleTypeHasChild" Text="In element {0}: Can not have element children within a simple type content."/>
<Message Id="NoDatatypeValidatorForSimpleType" Text="This element {0} has a simpletype but no datatype validator was found."/>
@@ -435,9 +362,7 @@
<Message Id="IC_FieldMultipleMatch" Text="Field matches more than one value within the scope of its selector; fields must match unique values"/>
<Message Id="IC_UnknownField" Text="Internal identity constraint error; unknown field."/>
<Message Id="IC_AbsentKeyValue" Text="Identity-constraint 4.2.1: element '{0}' has a key with no value."/>
- <Message Id="IC_UniqueNotEnoughValues" Text="Not enough values specified for <unique> identity constraint for element '{0}'."/>
<Message Id="IC_KeyNotEnoughValues" Text="Not enough values specified for <key name={1}> identity constraint for element '{0}'."/>
- <Message Id="IC_KeyRefNotEnoughValues" Text="Not enough values specified for <keyref name={1}> identity constraint for element '{0}'."/>
<Message Id="IC_KeyMatchesNillable" Text="Identity-constraint 4.2.3: element '{0}' has a key that matches an element that has nillable set to true."/>
<Message Id="IC_DuplicateUnique" Text="Duplicate unique value declared for identity constraint of element '{0}'."/>
<Message Id="IC_DuplicateKey" Text="Duplicate key value declared for identity constraint of element '{0}'."/>
@@ -453,8 +378,7 @@
</MsgDomain>
<MsgDomain Domain="http://apache.org/xml/messages/XML4CErrors">
<Warning>
- <Message Id="Scan_CouldNotOpenSource_Warning" Text="Warning: The primary document entity could not be opened. Id={0}"/>
- <Message Id="GC_ExistingGrammar" Text="Warning: No caching of grammar set, a grammar with same key found in the cache pool."/>
+ <Message Id="Scan_CouldNotOpenSource_Warning" Text="The primary document entity could not be opened. Id={0}"/>
</Warning>
<FatalError>
<Message Id="Array_BadIndex" Text="The index is beyond the array bounds "/>
@@ -469,8 +393,7 @@
<Message Id="CPtr_PointerIsZero" Text="The pointer has not been set"/>
<Message Id="CM_BinOpHadUnaryType" Text="The binary operation node had a unary node type"/>
<Message Id="CM_MustBeMixedOrChildren" Text="The content type must be mixed or children"/>
- <Message Id="CM_NoPCDATAHere" Text="PCDATA nodes are not valid here"/>
- <Message Id="CM_NotValidForSpecType" Text="The {0} operation is invalid for the spec type"/>
+ <Message Id="CM_NoPCDATAHere" Text="PCDATA nodes are not valid at this point"/>
<Message Id="CM_UnaryOpHadBinType" Text="The unary operation node had a binary node type"/>
<Message Id="CM_UnknownCMType" Text="Unknown content model type"/>
<Message Id="CM_UnknownCMSpecType" Text="Unknown content spec type"/>
@@ -478,10 +401,8 @@
<Message Id="CM_NotValidSpecTypeForNode" Text="The spec type is not valid for {0}"/>
<Message Id="DTD_UnknownCreateReason" Text="The creation reason enum has an unknown value"/>
<Message Id="ElemStack_EmptyStack" Text="The element stack is empty"/>
- <Message Id="ElemStack_BadIndex" Text="The element stack index given was beyond the stack top"/>
<Message Id="ElemStack_StackUnderflow" Text="The element stack was already empty when a pop request occurred"/>
<Message Id="ElemStack_NoParentPushed" Text="A parent operation was requested, but only one element is on the stack"/>
- <Message Id="Enum_NoMoreElements" Text="The enumerator contains no more elements"/>
<Message Id="File_CouldNotOpenFile" Text="Could not open file: {0}"/>
<Message Id="File_CouldNotGetCurPos" Text="Could not query the current file position"/>
<Message Id="File_CouldNotCloseFile" Text="Could not close the file"/>
@@ -493,22 +414,14 @@
<Message Id="File_CouldNotResetFile" Text="Could not reset file to beginning"/>
<Message Id="File_CouldNotGetSize" Text="Could not ascertain the file size"/>
<Message Id="File_CouldNotGetBasePathName" Text="Could not determine base pathname of the file"/>
- <Message Id="File_BasePathUnderflow" Text="The base path had too few levels to weave in relative part"/>
<Message Id="Gen_ParseInProgress" Text="Parse may not be called while parsing"/>
<Message Id="Gen_NoDTDValidator" Text="A DOCTYPE was seen but the installed validator does not understand DTDs"/>
<Message Id="Gen_CouldNotOpenDTD" Text="Could not open DTD file '{0}'"/>
<Message Id="Gen_CouldNotOpenExtEntity" Text="Could not open external entity '{0}'"/>
<Message Id="Gen_UnexpectedEOF" Text="The end of input was not expected"/>
- <Message Id="HshTbl_ZeroModulus" Text="The hash modulus cannot be zero"/>
- <Message Id="HshTbl_BadHashFromKey" Text="Hashing the key returned an invalid bad hash value"/>
- <Message Id="HshTbl_NoSuchKeyExists" Text="The key could not be found in the hash table"/>
- <Message Id="Mutex_CouldNotCreate" Text="Could not create mutex"/>
- <Message Id="Mutex_CouldNotClose" Text="Could not close mutex"/>
- <Message Id="Mutex_CouldNotLock" Text="Could not lock mutex"/>
- <Message Id="Mutex_CouldNotUnlock" Text="Could not unlock mutex"/>
<Message Id="Mutex_CouldNotDestroy" Text="Could not destroy mutex"/>
- <Message Id="NetAcc_InternalError" Text="Internal Error on NetAccessor"/>
- <Message Id="NetAcc_LengthError" Text="Error on NetAccessor. Cannot determine length of remote file"/>
+ <Message Id="NetAcc_InternalError" Text="Internal Error in NetAccessor"/>
+ <Message Id="NetAcc_LengthError" Text="Error in NetAccessor. Cannot determine length of remote file"/>
<Message Id="NetAcc_InitFailed" Text="The NetAccessor could not be initialized."/>
<Message Id="NetAcc_TargetResolution" Text="The host/address '{0}' could not be resolved"/>
<Message Id="NetAcc_CreateSocket" Text="Could not create the socket for URL '{0}'"/>
@@ -516,36 +429,23 @@
<Message Id="NetAcc_WriteSocket" Text="Could not write to the socket for URL '{0}'"/>
<Message Id="NetAcc_ReadSocket" Text="Could not read from the socket for URL '{0}'"/>
<Message Id="NetAcc_UnsupportedMethod" Text="The specified HTTP method is not supported by this NetAccessor."/>
- <Message Id="Pool_ElemAlreadyExists" Text="The element {0} already exists"/>
- <Message Id="Pool_BadHashFromKey" Text="Hashing the key returned an invalid bad hash value"/>
<Message Id="Pool_InvalidId" Text="The passed id is not valid for this pool"/>
- <Message Id="Pool_ZeroModulus" Text="The modulus value cannot be zero"/>
<Message Id="RdrMgr_ReaderIdNotFound" Text="The indicated reader id was never found"/>
<Message Id="Reader_BadAutoEncoding" Text="The auto encoding enum has an unknown value"/>
<Message Id="Reader_CouldNotDecodeFirstLine" Text="Could not decode first line of entity: {0}"/>
- <Message Id="Reader_NelLsepinDecl" Text="XMLDecl or TextDecl can not have NEL or lsep: {0}"/>
- <Message Id="Reader_EOIInMultiSeq" Text="End of input was hit in the middle of a multibyte sequence"/>
+ <Message Id="Reader_NelLsepinDecl" Text="XMLDecl or TextDecl can not have NEL or lsep: {0}"/>
<Message Id="Reader_SrcOfsNotSupported" Text="The current transcoding service does not support source offset information"/>
<Message Id="Reader_EncodingStrRequired" Text="EBCDIC files must provide an encoding= string"/>
<Message Id="Scan_CouldNotOpenSource" Text="The primary document entity could not be opened. Id={0}"/>
<Message Id="Scan_UnbalancedStartEnd" Text="Unbalanced start/end tags found, cannot continue"/>
<Message Id="Scan_BadPScanToken" Text="The call to scanNext() is illegal at this time"/>
- <Message Id="Stack_BadIndex" Text="The index is past the top of stack"/>
- <Message Id="Stack_EmptyStack" Text="The stack is empty, cannot access members"/>
<Message Id="Str_ZeroSizedTargetBuf" Text="The target buffer cannot have a max size of zero"/>
<Message Id="Str_UnknownRadix" Text="The given radix is not supported. Use 2, 8, 10, or 16"/>
<Message Id="Str_TargetBufTooSmall" Text="The target buffer is too small to accept the results"/>
<Message Id="Str_StartIndexPastEnd" Text="The start index is past the end of the string"/>
<Message Id="Str_ConvertOverflow" Text="The represented value overflowed the output binary result"/>
- <Message Id="Strm_StdErrWriteFailure" Text="Could not write to standard err"/>
- <Message Id="Strm_StdOutWriteFailure" Text="Could not write to standard out"/>
- <Message Id="Strm_ConWriteFailure" Text="Could not write to console"/>
<Message Id="StrPool_IllegalId" Text="String pool id was not legal"/>
- <Message Id="Trans_CouldNotCreateDefCvtr" Text="Could not create a default transcoder"/>
- <Message Id="Trans_InvalidSizeReq" Text="The maximum size to xlat is larger than the declared block size"/>
<Message Id="Trans_Unrepresentable" Text="Unicode char 0x{0} is not representable in encoding {1}"/>
- <Message Id="Trans_NotValidForEncoding" Text="Character {0} is not valid for encoding {1}"/>
- <Message Id="Trans_BadBlockSize" Text="The requested block size is not equal to the size set during construction"/>
<Message Id="Trans_BadSrcSeq" Text="An invalid multi-byte source text sequence was encountered"/>
<Message Id="Trans_BadSrcCP" Text="{0} is not a valid value for encoding {1}"/>
<Message Id="Trans_BadTrailingSurrogate" Text="Leading surrogate was not followed by trailing"/>
@@ -553,16 +453,11 @@
<Message Id="URL_MalformedURL" Text="The URL was not correctly formed"/>
<Message Id="URL_UnsupportedProto" Text="The URL used an unsupported protocol"/>
<Message Id="URL_UnsupportedProto1" Text="Unsupported URL protocol: '{0}'"/>
- <Message Id="URL_OnlyLocalHost" Text="Only localhost is supported at this time"/>
<Message Id="URL_NoProtocolPresent" Text="No protocol prefix present"/>
<Message Id="URL_ExpectingTwoSlashes" Text="Expected // after protocol"/>
- <Message Id="URL_IncorrectEscapedCharRef" Text="% must be followed by two hex digits"/>
- <Message Id="URL_UnterminatedHostComponent" Text="Unterminated host component"/>
<Message Id="URL_RelativeBaseURL" Text="The base part of the URL cannot be relative"/>
- <Message Id="URL_BaseUnderflow" Text="The base part has too few levels to weave in relative part"/>
<Message Id="URL_BadPortField" Text="The port field must be a 16 bit decimal number"/>
<Message Id="UTF8_FormatError" Text="invalid byte {0} ({1}) of a {2}-byte sequence."/>
- <Message Id="UTF8_Invalid_2BytesSeq" Text="invalid byte {0} of 2-byte sequence."/>
<Message Id="UTF8_Invalid_3BytesSeq" Text="invalid bytes {0}, {1} of 3-byte sequence."/>
<Message Id="UTF8_Irregular_3BytesSeq" Text="irregular bytes {0}, {1} of 3-byte sequence."/>
<Message Id="UTF8_Invalid_4BytesSeq" Text="invalid bytes {0}, {1} of 4-byte sequence."/>
@@ -591,18 +486,15 @@
<Message Id="Parser_CC1" Text="A POSIX character class must be closed by ':]'"/>
<Message Id="Parser_CC2" Text="Unexpected end of the pattern in a character class"/>
<Message Id="Parser_CC3" Text="Unknown name for a POSIX character class"/>
- <Message Id="Parser_CC4" Text="'-' is invalid here"/>
<Message Id="Parser_CC5" Text="']' is expected"/>
<Message Id="Parser_CC6" Text="'{0}' is not a valid character range; use '\{1}' instead"/>
<Message Id="Parser_Ope1" Text="='[' is expected"/>
<Message Id="Parser_Ope2" Text="')' or '-[' or '+[' or '&[' is expected"/>
<Message Id="Parser_Ope3" Text="The range end code point '{0}' is less than the start code point '{1}'"/>
<Message Id="Parser_Descape1" Text="Invalid Unicode hex notation"/>
- <Message Id="Parser_Descape2" Text="Overflow in a hex notation"/>
<Message Id="Parser_Descape3" Text="'\ x{' must be closed by '}'"/>
<Message Id="Parser_Descape4" Text="Invalid Unicode code point"/>
- <Message Id="Parser_Descape5" Text="An anchor must not be here"/>
- <Message Id="Parser_Process1" Text="This expression is not supported in the current option setting"/>
+ <Message Id="Parser_Descape5" Text="An anchor must not be present at this point"/>
<Message Id="Parser_Process2" Text="'{0}' is not a valid character escape"/>
<Message Id="Parser_Quantifier1" Text="Invalid quantifier in '{0}'. A digit is expected"/>
<Message Id="Parser_Quantifier2" Text="Invalid quantifier in '{0}'. Invalid quantity or a '}' is missing"/>
@@ -610,7 +502,6 @@
<Message Id="Parser_Quantifier4" Text="Invalid quantifier in '{0}'. A min quantity must be <= a max quantity"/>
<Message Id="Parser_Quantifier5" Text="Invalid quantifier in '{0}'. A quantity value overflow"/>
<Message Id="Gen_NoSchemaValidator" Text="A schema was seen but the installed validator does not understand schema"/>
- <Message Id="XUTIL_UnCopyableNodeType" Text="The {0} node type is not valid for copy"/>
<Message Id="SubGrpComparator_NGR" Text="SubstitutionGroupComparator has no grammar resolver"/>
<Message Id="FACET_Invalid_Len" Text="Length Value '{0}' is invalid"/>
<Message Id="FACET_Invalid_maxLen" Text="maxLength Value '{0}' is invalid"/>
@@ -621,7 +512,6 @@
<Message Id="FACET_Len_maxLen" Text="It is an error for both length and maxLength to be members of facets"/>
<Message Id="FACET_Len_minLen" Text="It is an error for both length and minLength to be members of facets"/>
<Message Id="FACET_maxLen_minLen" Text="Value of maxLength '{0}' must be greater than the value of minLength '{1}'"/>
- <Message Id="FACET_bool_Pattern" Text="Only constraining facet in boolean datatype is PATTERN"/>
<Message Id="FACET_Invalid_Tag" Text="Invalid Facet Tag '{0}'"/>
<Message Id="FACET_Len_baseLen" Text="Value of Length '{0}' must be equal to the base Length '{1}'"/>
<Message Id="FACET_minLen_baseminLen" Text="Value of minLength '{0}' must be greater than or equal to the base minLength '{1}'"/>
@@ -658,7 +548,7 @@
<Message Id="FACET_maxExcl_base_maxExcl" Text="maxExclusive value '{0}' must be less than or equal to base's maxExclusive value '{1}'"/>
<Message Id="FACET_maxExcl_base_maxIncl" Text="maxExclusive value '{0}' must be less than or equal to base's maxInclusive value '{1}'"/>
<Message Id="FACET_maxExcl_base_minIncl" Text="maxExclusive value '{0}' must be greater than base's minInclusive value '{1}'"/>
- <Message Id="FACET_maxExcl_base_minExcl" Text="maxExclusive value '{0}' must be greater than base's minExclusive value '{1}'"/>
+ <Message Id="FACET_maxExcl_base_minExcl" Text="maxExclusive value '{0}' must be greater than base's minExclusive value '{1}'"/>
<Message Id="FACET_minExcl_base_maxExcl" Text="minExclusive value '{0}' must be less than base's maxExclusive value '{1}'"/>
<Message Id="FACET_minExcl_base_maxIncl" Text="minExclusive value '{0}' must be less than or equal to base's maxInclusive value '{1}'"/>
<Message Id="FACET_minExcl_base_minIncl" Text="minExclusive value '{0}' must be greater than base's minInclusive value '{1}'"/>
@@ -682,9 +572,8 @@
<Message Id="FACET_fractDigit_base_fixed" Text="fractDigit '{0}' must be equal to base's fractDigit '{1}' , fixed"/>
<Message Id="FACET_maxLen_base_fixed" Text="maxLen '{0}' must be equal to base's maxLen '{1}' , fixed"/>
<Message Id="FACET_minLen_base_fixed" Text="minLen '{0}' must be equal to base's minLen '{1}' , fixed"/>
- <Message Id="FACET_len_base_fixed" Text="len '{0}' must be equal to base's len '{1}' , fixed"/>
<Message Id="FACET_whitespace_base_fixed" Text="whitespace '{0}' must be equal to base's whitespace '{1}' , fixed"/>
- <Message Id="FACET_internalError_fixed" Text="internal Error: fixed"/>
+ <Message Id="FACET_internalError_fixed" Text="internal Error: fixed"/>
<Message Id="FACET_List_Null_baseValidator" Text="simpleType list's 'itemType' is empty."/>
<Message Id="FACET_Union_Null_memberTypeValidators" Text="simpleType union's 'memberTypes' is empty."/>
<Message Id="FACET_Union_Null_baseValidator" Text="simpleType restriction's union 'base' is empty."/>
@@ -726,13 +615,8 @@
<Message Id="XMLNUM_URI_No_Scheme" Text=" No scheme found in URI"/>
<Message Id="XMLNUM_URI_NullHost" Text=" '{0}', '{1}' may not be specified if host is not specified "/>
<Message Id="XMLNUM_URI_NullPath" Text=" '{0}', '{1}' may not be specified if path is not specified "/>
- <Message Id="XMLNUM_URI_Component_inPath" Text=" '{0}', '{1}' cannot be specified in path"/>
<Message Id="XMLNUM_URI_PortNo_Invalid" Text=" Port no '{0}' shall be in (0, 65535) "/>
- <Message Id="XMLNUM_DBL_FLT_maxNeg" Text=" Value '{0}' shall be greater than the max Negative value '{1}' "/>
- <Message Id="XMLNUM_DBL_FLT_maxPos" Text=" Value '{0}' shall be less than the max Negative value '{1}' "/>
- <Message Id="XMLNUM_DBL_FLT_minNegPos" Text=" Value '{0}' shall be in the range of '{1}', '{2}' "/>
<Message Id="XMLNUM_DBL_FLT_InvalidType" Text=" Type '{0}' is invalid: internal error "/>
- <Message Id="XMLNUM_DBL_FLT_No_Exponent" Text=" Value '{0}' shall have exponent. "/>
<Message Id="Regex_Result_Not_Set" Text="A result is not set."/>
<Message Id="Regex_CompactRangesError" Text="CompactRanges - Internal Error"/>
<Message Id="Regex_MergeRangesTypeMismatch" Text="Merge Ranges - Mismatched type"/>
@@ -750,7 +634,6 @@
<Message Id="Regex_RepPatMatchesZeroString" Text="Replace pattern cannot match zero length string"/>
<Message Id="Regex_InvalidRepPattern" Text="Invalid replace pattern"/>
<Message Id="NEL_RepeatedCalls" Text="Enabling the NEL option can only be called once per process."/>
- <Message Id="RethrowError" Text="{0}"/>
<Message Id="Out_Of_Memory" Text="operator new fails. Possibly running Of memory"/>
<Message Id="DV_InvalidOperation" Text="Operation is not allowed"/>
<Message Id="XPath_NoAttrSelector" Text="Selectors cannot select attributes"/>
@@ -814,7 +697,6 @@
<Message Id="PD_NameTypeOK5" Text="NameAndTypeOK: Element '{0}' has a type that does not derive from that of the base"/>
<Message Id="PD_NameTypeOK6" Text="NameAndTypeOK: Derived element '{0}' has fewer Identity Constraints than base element '{1}'"/>
<Message Id="PD_NameTypeOK7" Text="NameAndTypeOK: Derived element '{0}' has an Identity Constraint that does not appear on base element '{1}'"/>
- <Message Id="PD_RecurseAsIfGroup" Text="RecurseAsIfGroup: Element '{0}' belongs to a group of a variety different from that of the base"/>
<Message Id="PD_Recurse1" Text="Occurrence range of group is not a valid restriction of occurrence range of base group"/>
<Message Id="PD_Recurse2" Text="Recurse: There is not a complete functional mapping between the particles"/>
<Message Id="PD_ForbiddenRes1" Text="Forbidden restriction of 'any': Choice,Seq,All,Elt"/>
@@ -830,7 +712,7 @@
<Message Id="NodeIDMap_GrowErr" Text="NodeIDMap overflows and exceeds the largest available size"/>
<Message Id="XSer_ProtoType_Null_ClassName" Text="ProtoType has null class name"/>
<Message Id="XSer_ProtoType_NameLen_Dif" Text="ProtoType name length diff '{0}' vs '{1}'"/>
- <Message Id="XSer_ProtoType_Name_Dif" Text="ProtoType name diff '{0}' vs '{1}'"/>
+ <Message Id="XSer_ProtoType_Name_Dif" Text="ProtoType name diff '{0}' vs '{1}'"/>
<Message Id="XSer_InStream_Read_LT_Req" Text="InputStream read '{0}' less than required '{1}'"/>
<Message Id="XSer_InStream_Read_OverFlow" Text="InputStream read '{0}' beyond buffer available '{1}'"/>
<Message Id="XSer_Storing_Violation" Text="Storing violation"/>
@@ -840,19 +722,16 @@
<Message Id="XSer_Loading_Violation" Text="Loading violation"/>
<Message Id="XSer_LoadBuffer_Violation" Text="Load buffer violation '{0}', '{1}'"/>
<Message Id="XSer_Inv_ClassIndex" Text="Invalid class index '{0}', '{1}'"/>
- <Message Id="XSer_Inv_FillBuffer_Size" Text="Invalid fillBuffer size '{0}', '{1}'"/>
<Message Id="XSer_Inv_checkFillBuffer_Size" Text="Invalid checkFillBuffer size '{0}'"/>
<Message Id="XSer_Inv_checkFlushBuffer_Size" Text="Invalid checkFlushBuffer size '{0}'"/>
<Message Id="XSer_Inv_Null_Pointer" Text="Invalid null pointer encountered '{0}'"/>
- <Message Id="XSer_Inv_Buffer_Len" Text="Invalid buffer length '{0}'"/>
<Message Id="XSer_CreateObject_Fail" Text="CreateObject fails "/>
<Message Id="XSer_ObjCount_UppBnd_Exceed" Text="Object count '{0}' exceed upper boundary '{1}'"/>
- <Message Id="XSer_GrammarPool_Locked" Text="Grammar Pool is locked by other party"/>
<Message Id="XSer_GrammarPool_Empty" Text="Grammar Pool is empty"/>
- <Message Id="XSer_GrammarPool_NotEmpty" Text="Grammar Pool is NOT empty"/>
+ <Message Id="XSer_GrammarPool_NotEmpty" Text="Grammar Pool is NOT empty"/>
<Message Id="XSer_StringPool_NotEmpty" Text="String Pool is NOT empty"/>
<Message Id="XSer_Storer_NewerThan_Loader" Text="Storer Level '{0}' is newer than Loader Level'{1}' "/>
- <Message Id="VALUE_QName_Invalid2" Text="Value '{0}' is not valid QName because the prefix is not defined"/>
+ <Message Id="VALUE_QName_Invalid2" Text="Value '{0}' is not valid QName because the prefix is not defined"/>
</FatalError>
</MsgDomain>
<MsgDomain Domain="http://apache.org/xml/messages/XMLDOMMsg">
@@ -861,18 +740,14 @@
<!--DOMEXCEPTION_ERRX is not an error, it's just used to indicate the start of DOMExceptionCode enum -->
<Message Id="DOMEXCEPTION_ERRX" Text="Just an index"/>
<Message Id="INDEX_SIZE_ERR" Text="The index or size is negative, or greater than the allowed value"/>
- <Message Id="DOMSTRING_SIZE_ERR" Text="The specified range of text does not fit into the String"/>
<Message Id="HIERARCHY_REQUEST_ERR" Text="An attempt was made to insert a node where it is not permitted"/>
<Message Id="WRONG_DOCUMENT_ERR" Text="A node is used in a different document than the one that created it"/>
<Message Id="INVALID_CHARACTER_ERR" Text="An invalid or illegal XML character is specified"/>
- <Message Id="NO_DATA_ALLOWED_ERR" Text="Data is specified for a node which does not support data"/>
<Message Id="NO_MODIFICATION_ALLOWED_ERR" Text="An attempt is made to modify an object where modifications are not allowed"/>
<Message Id="NOT_FOUND_ERR" Text="An attempt is made to reference a node in a context where it does not exist"/>
<Message Id="NOT_SUPPORTED_ERR" Text="The implementation does not support the requested type of object or operation"/>
<Message Id="INUSE_ATTRIBUTE_ERR" Text="An attempt is made to add an attribute that is already in use elsewhere"/>
<Message Id="INVALID_STATE_ERR " Text="An attempt is made to use an object that is not, or is no longer, usable."/>
- <Message Id="SYNTAX_ERR" Text="An invalid or illegal string is specified"/>
- <Message Id="INVALID_MODIFICATION_ERR" Text="An attempt is made to modify the type of the underlying object"/>
<Message Id="NAMESPACE_ERR" Text="An attempt is made to create or change an object in a way which is incorrect with regard to namespaces"/>
<Message Id="INVALID_ACCESS_ERR" Text="An attempt is made to use an object that is not, or is no longer, usable"/>
<Message Id="VALIDATION_ERR" Text="A call to a method such as insertBefore or removeChild would make the Node invalid with respect to document grammar"/>
@@ -885,7 +760,6 @@
<!--DOMLSEXCEPTION_ERRX is not an error, it's just used to indicate the start of DOMLSException::LSExceptionCode enum -->
<Message Id="DOMLSEXCEPTION_ERRX" Text="Just an index"/>
<Message Id="PARSE_ERR" Text="An attempt was made to load a document, or an XML Fragment, using DOMLSParser and the processing has been stopped"/>
- <Message Id="SERIALIZE_ERR" Text="An attempt was made to serialize a DOMNode using DOMLSSerializer and the processing has been stopped"/>
<!--The following are DOMXPathException error text, same order as DOMXPathException::ExceptionCode enum -->
<!--DOMXPATHEXCEPTION_ERRX is not an error, it's just used to indicate the start of DOMXPathException::ExceptionCode enum -->
<Message Id="DOMXPATHEXCEPTION_ERRX" Text="Just an index"/>
diff --git a/src/xercesc/internal/DGXMLScanner.cpp b/src/xercesc/internal/DGXMLScanner.cpp
index 2e0123622..2401ec6ca 100644
--- a/src/xercesc/internal/DGXMLScanner.cpp
+++ b/src/xercesc/internal/DGXMLScanner.cpp
@@ -225,7 +225,6 @@ void DGXMLScanner::scanDocument(const InputSource& src)
(
XMLErrs::XMLException_Warning
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else if (excToCatch.getErrorType() >= XMLErrorReporter::ErrType_Fatal)
@@ -233,7 +232,6 @@ void DGXMLScanner::scanDocument(const InputSource& src)
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -241,7 +239,6 @@ void DGXMLScanner::scanDocument(const InputSource& src)
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
}
@@ -408,7 +405,6 @@ bool DGXMLScanner::scanNext(XMLPScanToken& token)
(
XMLErrs::XMLException_Warning
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else if (excToCatch.getErrorType() >= XMLErrorReporter::ErrType_Fatal)
@@ -416,7 +412,6 @@ bool DGXMLScanner::scanNext(XMLPScanToken& token)
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -424,7 +419,6 @@ bool DGXMLScanner::scanNext(XMLPScanToken& token)
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
}
@@ -2083,7 +2077,7 @@ Grammar* DGXMLScanner::loadGrammar(const InputSource& src
if (excToCatch.getErrorType() == XMLErrorReporter::ErrType_Warning)
emitError
(
- XMLErrs::DisplayErrorMessage
+ XMLErrs::XMLException_Warning
, excToCatch.getCode()
, excToCatch.getMessage()
);
@@ -2092,7 +2086,6 @@ Grammar* DGXMLScanner::loadGrammar(const InputSource& src
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -2100,7 +2093,6 @@ Grammar* DGXMLScanner::loadGrammar(const InputSource& src
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
}
diff --git a/src/xercesc/internal/IGXMLScanner.cpp b/src/xercesc/internal/IGXMLScanner.cpp
index 4334dc675..2e1e9f504 100644
--- a/src/xercesc/internal/IGXMLScanner.cpp
+++ b/src/xercesc/internal/IGXMLScanner.cpp
@@ -262,7 +262,6 @@ void IGXMLScanner::scanDocument(const InputSource& src)
(
XMLErrs::XMLException_Warning
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else if (excToCatch.getErrorType() >= XMLErrorReporter::ErrType_Fatal)
@@ -270,7 +269,6 @@ void IGXMLScanner::scanDocument(const InputSource& src)
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -278,7 +276,6 @@ void IGXMLScanner::scanDocument(const InputSource& src)
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
}
@@ -448,7 +445,6 @@ bool IGXMLScanner::scanNext(XMLPScanToken& token)
(
XMLErrs::XMLException_Warning
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else if (excToCatch.getErrorType() >= XMLErrorReporter::ErrType_Fatal)
@@ -456,7 +452,6 @@ bool IGXMLScanner::scanNext(XMLPScanToken& token)
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -464,7 +459,6 @@ bool IGXMLScanner::scanNext(XMLPScanToken& token)
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
}
@@ -3016,7 +3010,7 @@ Grammar* IGXMLScanner::loadGrammar(const InputSource& src
if (excToCatch.getErrorType() == XMLErrorReporter::ErrType_Warning)
emitError
(
- XMLErrs::DisplayErrorMessage
+ XMLErrs::XMLException_Warning
, excToCatch.getCode()
, excToCatch.getMessage()
);
@@ -3025,7 +3019,6 @@ Grammar* IGXMLScanner::loadGrammar(const InputSource& src
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -3033,7 +3026,6 @@ Grammar* IGXMLScanner::loadGrammar(const InputSource& src
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
}
diff --git a/src/xercesc/internal/IGXMLScanner2.cpp b/src/xercesc/internal/IGXMLScanner2.cpp
index 4f9671567..058a1b756 100644
--- a/src/xercesc/internal/IGXMLScanner2.cpp
+++ b/src/xercesc/internal/IGXMLScanner2.cpp
@@ -300,7 +300,7 @@ IGXMLScanner::buildAttList(const RefVectorOf<KVStringPair>& providedAttrs
}
catch (const XMLException& idve)
{
- fValidator->emitError (XMLValid::DatatypeError, idve.getCode(), idve.getType(), idve.getMessage());
+ fValidator->emitError (XMLValid::DatatypeError, idve.getCode(), idve.getMessage());
}
}
}
diff --git a/src/xercesc/internal/SGXMLScanner.cpp b/src/xercesc/internal/SGXMLScanner.cpp
index f50a48da1..6ed30bffa 100644
--- a/src/xercesc/internal/SGXMLScanner.cpp
+++ b/src/xercesc/internal/SGXMLScanner.cpp
@@ -256,7 +256,6 @@ void SGXMLScanner::scanDocument(const InputSource& src)
(
XMLErrs::XMLException_Warning
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else if (excToCatch.getErrorType() >= XMLErrorReporter::ErrType_Fatal)
@@ -264,7 +263,6 @@ void SGXMLScanner::scanDocument(const InputSource& src)
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -272,7 +270,6 @@ void SGXMLScanner::scanDocument(const InputSource& src)
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
}
@@ -439,7 +436,6 @@ bool SGXMLScanner::scanNext(XMLPScanToken& token)
(
XMLErrs::XMLException_Warning
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else if (excToCatch.getErrorType() >= XMLErrorReporter::ErrType_Fatal)
@@ -447,7 +443,6 @@ bool SGXMLScanner::scanNext(XMLPScanToken& token)
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -455,7 +450,6 @@ bool SGXMLScanner::scanNext(XMLPScanToken& token)
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
}
@@ -1944,7 +1938,7 @@ Grammar* SGXMLScanner::loadGrammar(const InputSource& src
if (excToCatch.getErrorType() == XMLErrorReporter::ErrType_Warning)
emitError
(
- XMLErrs::DisplayErrorMessage
+ XMLErrs::XMLException_Warning
, excToCatch.getCode()
, excToCatch.getMessage()
);
@@ -1953,7 +1947,6 @@ Grammar* SGXMLScanner::loadGrammar(const InputSource& src
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -1961,7 +1954,6 @@ Grammar* SGXMLScanner::loadGrammar(const InputSource& src
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
}
@@ -2327,7 +2319,7 @@ SGXMLScanner::buildAttList(const RefVectorOf<KVStringPair>& providedAttrs
}
catch (const XMLException& idve)
{
- fValidator->emitError (XMLValid::DatatypeError, idve.getCode(), idve.getType(), idve.getMessage());
+ fValidator->emitError (XMLValid::DatatypeError, idve.getCode(), idve.getMessage());
}
}
}
diff --git a/src/xercesc/internal/WFXMLScanner.cpp b/src/xercesc/internal/WFXMLScanner.cpp
index 09c59ddfd..f687a706d 100644
--- a/src/xercesc/internal/WFXMLScanner.cpp
+++ b/src/xercesc/internal/WFXMLScanner.cpp
@@ -200,7 +200,6 @@ void WFXMLScanner::scanDocument(const InputSource& src)
(
XMLErrs::XMLException_Warning
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else if (excToCatch.getErrorType() >= XMLErrorReporter::ErrType_Fatal)
@@ -208,7 +207,6 @@ void WFXMLScanner::scanDocument(const InputSource& src)
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -216,7 +214,6 @@ void WFXMLScanner::scanDocument(const InputSource& src)
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
}
@@ -371,7 +368,6 @@ bool WFXMLScanner::scanNext(XMLPScanToken& token)
(
XMLErrs::XMLException_Warning
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else if (excToCatch.getErrorType() >= XMLErrorReporter::ErrType_Fatal)
@@ -379,7 +375,6 @@ bool WFXMLScanner::scanNext(XMLPScanToken& token)
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -387,7 +382,6 @@ bool WFXMLScanner::scanNext(XMLPScanToken& token)
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
}
diff --git a/src/xercesc/internal/XMLScanner.cpp b/src/xercesc/internal/XMLScanner.cpp
index 0563a31fc..c6e15d78b 100644
--- a/src/xercesc/internal/XMLScanner.cpp
+++ b/src/xercesc/internal/XMLScanner.cpp
@@ -319,7 +319,6 @@ void XMLScanner::scanDocument( const XMLCh* const systemId)
(
XMLErrs::XMLException_Fatal
, e.getCode()
- , e.getType()
, e.getMessage()
);
return;
@@ -334,7 +333,6 @@ void XMLScanner::scanDocument( const XMLCh* const systemId)
(
XMLErrs::XMLException_Fatal
, e.getCode()
- , e.getType()
, e.getMessage()
);
return;
@@ -356,7 +354,6 @@ void XMLScanner::scanDocument( const XMLCh* const systemId)
(
XMLErrs::XMLException_Fatal
, e.getCode()
- , e.getType()
, e.getMessage()
);
return;
@@ -373,7 +370,6 @@ void XMLScanner::scanDocument( const XMLCh* const systemId)
(
XMLErrs::XMLException_Warning
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else if (excToCatch.getErrorType() >= XMLErrorReporter::ErrType_Fatal)
@@ -381,7 +377,6 @@ void XMLScanner::scanDocument( const XMLCh* const systemId)
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -389,7 +384,6 @@ void XMLScanner::scanDocument( const XMLCh* const systemId)
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
return;
@@ -438,7 +432,6 @@ bool XMLScanner::scanFirst( const XMLCh* const systemId
(
XMLErrs::XMLException_Fatal
, e.getCode()
- , e.getType()
, e.getMessage()
);
return false;
@@ -453,7 +446,6 @@ bool XMLScanner::scanFirst( const XMLCh* const systemId
(
XMLErrs::XMLException_Fatal
, e.getCode()
- , e.getType()
, e.getMessage()
);
return false;
@@ -474,7 +466,6 @@ bool XMLScanner::scanFirst( const XMLCh* const systemId
(
XMLErrs::XMLException_Fatal
, e.getCode()
- , e.getType()
, e.getMessage()
);
return false;
@@ -491,7 +482,6 @@ bool XMLScanner::scanFirst( const XMLCh* const systemId
(
XMLErrs::XMLException_Warning
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else if (excToCatch.getErrorType() >= XMLErrorReporter::ErrType_Fatal)
@@ -499,7 +489,6 @@ bool XMLScanner::scanFirst( const XMLCh* const systemId
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -507,7 +496,6 @@ bool XMLScanner::scanFirst( const XMLCh* const systemId
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
return false;
@@ -585,7 +573,6 @@ bool XMLScanner::scanFirst( const InputSource& src
(
XMLErrs::XMLException_Warning
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else if (excToCatch.getErrorType() >= XMLErrorReporter::ErrType_Fatal)
@@ -593,7 +580,6 @@ bool XMLScanner::scanFirst( const InputSource& src
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -601,7 +587,6 @@ bool XMLScanner::scanFirst( const InputSource& src
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
}
@@ -1703,7 +1688,6 @@ Grammar* XMLScanner::loadGrammar(const XMLCh* const systemId
(
XMLErrs::XMLException_Fatal
, e.getCode()
- , e.getType()
, e.getMessage()
);
return 0;
@@ -1718,7 +1702,6 @@ Grammar* XMLScanner::loadGrammar(const XMLCh* const systemId
(
XMLErrs::XMLException_Fatal
, e.getCode()
- , e.getType()
, e.getMessage()
);
return 0;
@@ -1740,7 +1723,6 @@ Grammar* XMLScanner::loadGrammar(const XMLCh* const systemId
(
XMLErrs::XMLException_Fatal
, e.getCode()
- , e.getType()
, e.getMessage()
);
return 0;
@@ -1757,7 +1739,6 @@ Grammar* XMLScanner::loadGrammar(const XMLCh* const systemId
(
XMLErrs::XMLException_Warning
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else if (excToCatch.getErrorType() >= XMLErrorReporter::ErrType_Fatal)
@@ -1765,7 +1746,6 @@ Grammar* XMLScanner::loadGrammar(const XMLCh* const systemId
(
XMLErrs::XMLException_Fatal
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
else
@@ -1773,7 +1753,6 @@ Grammar* XMLScanner::loadGrammar(const XMLCh* const systemId
(
XMLErrs::XMLException_Error
, excToCatch.getCode()
- , excToCatch.getType()
, excToCatch.getMessage()
);
return 0;
diff --git a/src/xercesc/validators/schema/SchemaValidator.cpp b/src/xercesc/validators/schema/SchemaValidator.cpp
index f413fc10a..39ce65e55 100644
--- a/src/xercesc/validators/schema/SchemaValidator.cpp
+++ b/src/xercesc/validators/schema/SchemaValidator.cpp
@@ -263,7 +263,7 @@ int SchemaValidator::checkContent (XMLElementDecl* const elemDecl
}
catch (XMLException& idve)
{
- emitError (XMLValid::DatatypeError, idve.getCode(), idve.getType(), idve.getMessage());
+ emitError (XMLValid::DatatypeError, idve.getCode(), idve.getMessage());
fErrorOccurred = true;
}
catch(const OutOfMemoryException&) {
@@ -442,7 +442,7 @@ void SchemaValidator::validateAttrValue (const XMLAttDef* attDef
}
catch (XMLException& idve) {
fErrorOccurred = true;
- emitError (XMLValid::DatatypeError, idve.getCode(), idve.getType(), idve.getMessage());
+ emitError (XMLValid::DatatypeError, idve.getCode(), idve.getMessage());
}
catch(const OutOfMemoryException&)
{
diff --git a/tools/NLS/Xlat/Xlat_ICUResourceBundle.cpp b/tools/NLS/Xlat/Xlat_ICUResourceBundle.cpp
index 2b78aaa68..9f08b2571 100644
--- a/tools/NLS/Xlat/Xlat_ICUResourceBundle.cpp
+++ b/tools/NLS/Xlat/Xlat_ICUResourceBundle.cpp
@@ -166,7 +166,7 @@ void ICUResBundFormatter::startOutput(const XMLCh* const msgLocale
XMLCh *tmpXMLStr = XMLString::transcode(".txt");
// ICU Resource Bundles now uses "root" as locale
- const XMLCh* locale = L"root";
+ XMLCh* locale = XMLString::transcode ("root");
XMLString::catString(tmpBuf, outPath);
XMLString::catString(tmpBuf, locale);
XMLString::catString(tmpBuf, tmpXMLStr );
@@ -184,5 +184,5 @@ void ICUResBundFormatter::startOutput(const XMLCh* const msgLocale
// Set the message delimiter
fwprintf(fOutFl, L"%s { \n", xmlStrToPrintable(locale) );
releasePrintableStr
-
+ XMLString::release(&locale);
}
--
GitLab