Author: mukulg
Date: Tue Sep 24 05:37:26 2019
New Revision: 1867420

URL: http://svn.apache.org/viewvc?rev=1867420&view=rev
Log:
committing improvement to xsd error messages. previously, multi sentence error 
messages had extra space between the error sentences, which is fixed by this 
commit.

Modified:
    
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
    
xerces/java/trunk/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties

Modified: 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
URL: 
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties?rev=1867420&r1=1867419&r2=1867420&view=diff
==============================================================================
--- 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
 (original)
+++ 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
 Tue Sep 24 05:37:26 2019
@@ -112,7 +112,7 @@
         cvc-assertion-failure-mesg = cvc-assertion-failure-mesg: {0} {1}
         cvc-assertions-valid = cvc-assertions-valid: Value ''{0}'' is not 
facet-valid with respect to assertion ''{1}''. {2}
         cvc-assertions-valid-union-elem = cvc-assertions-valid-union-elem: 
Value ''{0}'' is not facet-valid with respect to the specified assertions, on 
type ''{2}'' on element ''{1}''.
-        cvc-assertions-valid-union-attr = cvc-assertions-valid-union-attr: 
Value ''{0}'' is not facet-valid with respect to the specified assertions, on 
type ''{3}'' on attribute ''{2}'/@'{1}''.         
+        cvc-assertions-valid-union-attr = cvc-assertions-valid-union-attr: 
Value ''{0}'' is not facet-valid with respect to the specified assertions, on 
type ''{3}'' on attribute ''{2}'/@'{1}''.        
         cvc-xpath.3.13.4.2a = cvc-xpath.3.13.4.2a: XPST0003 - Assertion XPath 
expression (''{0}'') on the schema type ''{1}'' couldn''t compile successfully.
         cvc-xpath.3.13.4.2b = cvc-xpath.3.13.4.2b: An assert XPath expression 
such as (''{0}'') containing / or //, on the schema type ''{1}'', cannot yield 
a valid result (since an assert tree is rooted at a parentless element).
         
@@ -128,12 +128,12 @@
         src-attribute.5 = src-attribute.5: The property ''fixed'' is present 
in attribute ''{0}'', so the value of ''use'' must not be ''prohibited''.
         src-attribute.6.2 = src-attribute.6.2: Since attribute ''{0}'' 
contains the 'targetNamespace' attribute, the 'form' attribute must be absent.
         src-attribute.6.3.1 = src-attribute.6.3.1: Since attribute ''{0}'' 
contains the 'targetNamespace' attribute and <schema> does not have a 
'targetNamespace' attribute or its value is different from the value of 
'targetNamespace' of ''{0}'', ''{0}'' must have a <complexType> as an ancestor.
-        src-attribute.6.3.2 = src-attribute.6.3.2: Since attribute ''{0}'' 
contains the 'targetNamespace' attribute and <schema> does not have a 
'targetNamespace' attribute or its value is different from the value of 
'targetNamespace' of ''{0}'', there must be a <restriction> ancestor between 
''{0}'' and the nearest <complexType> ancestor, and the value of the 'base' 
attribute of <restriction> does not match the name of 'xs:anyType'.  
+        src-attribute.6.3.2 = src-attribute.6.3.2: Since attribute ''{0}'' 
contains the 'targetNamespace' attribute and <schema> does not have a 
'targetNamespace' attribute or its value is different from the value of 
'targetNamespace' of ''{0}'', there must be a <restriction> ancestor between 
''{0}'' and the nearest <complexType> ancestor, and the value of the 'base' 
attribute of <restriction> does not match the name of 'xs:anyType'. 
         src-attribute_group.2 = src-attribute_group.2: The intersection of 
wildcards is not expressible for attribute group ''{0}''.
         src-attribute_group.3 = src-attribute_group.3: Circular definitions 
detected for attribute group ''{0}''. Recursively following attribute group 
references eventually leads back to itself.
-        src-ct.1 = src-ct.1: Complex Type Definition Representation Error for 
type ''{0}''.  When <complexContent> is used, the base type must be a 
complexType. ''{1}'' is a simpleType.
-        src-ct.2.1 = src-ct.2.1: Complex Type Definition Representation Error 
for type ''{0}''.  When <simpleContent> is used, the base type must be a 
complexType whose content type is simple, or, only if restriction is specified, 
a complex type with mixed content and emptiable particle, or, only if extension 
is specified, a simple type. ''{1}'' satisfies none of these conditions.
-        src-ct.2.2 = src-ct.2.2: Complex Type Definition Representation Error 
for type ''{0}''.  When a complexType with simpleContent restricts a 
complexType with mixed content and emptiable particle, then there must be a 
<simpleType> among the children of <restriction>.
+        src-ct.1 = src-ct.1: Complex Type Definition Representation Error for 
type ''{0}''. When <complexContent> is used, the base type must be a 
complexType. ''{1}'' is a simpleType.
+        src-ct.2.1 = src-ct.2.1: Complex Type Definition Representation Error 
for type ''{0}''. When <simpleContent> is used, the base type must be a 
complexType whose content type is simple, or, only if restriction is specified, 
a complex type with mixed content and emptiable particle, or, only if extension 
is specified, a simple type. ''{1}'' satisfies none of these conditions.
+        src-ct.2.2 = src-ct.2.2: Complex Type Definition Representation Error 
for type ''{0}''. When a complexType with simpleContent restricts a complexType 
with mixed content and emptiable particle, then there must be a <simpleType> 
among the children of <restriction>.
         src-ct.4 = src-ct.4: Complex Type Definition Representation Error for 
type ''{0}''. The intersection of wildcards is not expressible.
         src-ct.5 = src-ct.5: Complex Type Definition Representation Error for 
type ''{0}''. The union of wildcards is not expressible.
         src-ct.6 = src-ct.5: Complex Type Definition Representation Error for 
type ''{0}''. If <openContent> is present and the actual value of its mode 
[attribute] is not 'none', then there must be an <any> among the [children] of 
<openContent>.
@@ -189,27 +189,27 @@
         src-type-alternative.3.12.13.2 = src-type-alternative.3.12.13.2: Type 
definition missing for type atlernative. A ''type'' attribute, or a 
''complexType'' child element, or a ''simpleType'' child element must be 
present.
         src-wildcard.1 = src-wildcard.1: The properties ''namespace'' and 
''notNamespace'' cannot both be present in a wildcard declaration. Use only one 
of them.
         src-cip.1 = src-cip.1: The attribute ''{0}'' does not belong to schema 
versioning namespace (http://www.w3.org/2007/XMLSchema-versioning). Only 
following attributes are available for schema versioning namespace : 
''minVersion'', ''maxVersion'', ''typeAvailable'', ''typeUnavailable'', 
''facetAvailable'' and ''facetUnavailable''.
-        src-assert.3.13.1 = src-assert.3.13.1: The mandatory attribute 
''test'' does not appear on the element ''{0}'', within type definition 
''{1}''.          
+        src-assert.3.13.1 = src-assert.3.13.1: The mandatory attribute 
''test'' does not appear on the element ''{0}'', within type definition 
''{1}''.         
 
 #constraint valid (3.X.6)
 
-        ag-props-correct.2 = ag-props-correct.2: Error for attribute group 
''{0}''.  Duplicate attribute uses with the same name and target namespace are 
specified.  Name of duplicate attribute use is ''{1}''.
-        ag-props-correct.3 = ag-props-correct.3: Error for attribute group 
''{0}''.  Two attribute declarations, ''{1}'' and ''{2}'' have types which are 
derived from ID.
+        ag-props-correct.2 = ag-props-correct.2: Error for attribute group 
''{0}''. Duplicate attribute uses with the same name and target namespace are 
specified. Name of duplicate attribute use is ''{1}''.
+        ag-props-correct.3 = ag-props-correct.3: Error for attribute group 
''{0}''. Two attribute declarations, ''{1}'' and ''{2}'' have types which are 
derived from ID.
         a-props-correct.2 = a-props-correct.2: Invalid value constraint value 
''{1}'' in attribute ''{0}''.
         a-props-correct.3 = a-props-correct.3: Attribute ''{0}'' cannot use 
''fixed'' or ''default'', because the attribute''s '{'type definition'}' is ID, 
or is derived from ID.
         au-props-correct.2 = au-props-correct.2: In the attribute declaration 
of ''{0}'', a fixed value of ''{1}'' was specified. So if the attribute use 
referring to ''{0}'' also has a '{'value constraint'}', it must be fixed and 
its value must be ''{1}''.
         cos-all-limited.1.2 = cos-all-limited.1.2: An 'all' model group must 
appear in a particle with '{'min occurs'}' = '{'max occurs'}' = 1, and that 
particle must be part of a pair which constitutes the '{'content type'}' of a 
complex type definition.
         cos-all-limited.1.3 = cos-all-limited.1.3: When an xs:group particle 
occurs as child of xs:all, then following condition must hold on xs:group 
particle, '{'min occurs'}' = '{'max occurs'}' = 1.
         cos-all-limited.2 = cos-all-limited.2: The '{'max occurs'}' of an 
element in an ''all'' model group must be 0 or 1. The value ''{0}'' for element 
''{1}'' is invalid.
-        cos-all-limited.2-xs11 = cos-all-limited.2-xs11: Incorrect schema 
instruction ''{0}'' found as child of ''xs:group'' that is referred by this 
group reference. Groups that are referred from ''xs:all'', are allowed to 
contain only ''xs:all'' themselves.         
+        cos-all-limited.2-xs11 = cos-all-limited.2-xs11: Incorrect schema 
instruction ''{0}'' found as child of ''xs:group'' that is referred by this 
group reference. Groups that are referred from ''xs:all'', are allowed to 
contain only ''xs:all'' themselves.        
         cos-applicable-facets = cos-applicable-facets: Facet ''{0}'' is not 
allowed by type {1}.
-        cos-ct-extends.1.1 = cos-ct-extends.1.1: Type ''{0}'' was derived by 
extension from type ''{1}''.  However, the ''final'' attribute of ''{1}'' 
forbids derivation by extension.
+        cos-ct-extends.1.1 = cos-ct-extends.1.1: Type ''{0}'' was derived by 
extension from type ''{1}''. However, the ''final'' attribute of ''{1}'' 
forbids derivation by extension.
         cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: The 
content type of a derived type and that of its base must both be mixed or both 
be element-only. Type ''{0}'' is element only, but its base type is not.
         cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: The 
content type of a derived type and that of its base must both be mixed or both 
be element-only. Type ''{0}'' is mixed, but its base type is not.
         cos-ct-extends.1.4.3.2.2.3 = cos-ct-extends.1.4.3.2.2.3: The open 
content of the base type is not absent and the content type of the derived type 
must have a ''suffix'' or ''interleave'' mode. Type ''{0}'' has an open content 
with a ''none'' mode.
         cos-ct-extends.1.4.3.2.2.3.3 = cos-ct-extends.1.4.3.2.2.3.3: The open 
content of a derived type and that of its base must both have a ''suffix'' 
mode. Type ''{0}'' has an open content with a ''suffix'' mode, but its base 
type is not.
         cos-ct-extends.1.4.3.2.2.3.4 = cos-ct-extends.1.4.3.2.2.3.4: The 
namespace constraint of the wildcard on the open content of the base type must 
be a subset of the namespace constraint of the wildcard on the open content of 
the derived type. This is not the case for type ''{0}''.
-        cos-content-act-restrict.5.3 = cos-content-act-restrict.5.3: Error for 
type ''{0}''. The attribute use ''{1}'' in this type has value of 
''inheritable'', which is inconsistent with the value in the base type.    
+        cos-content-act-restrict.5.3 = cos-content-act-restrict.5.3: Error for 
type ''{0}''. The attribute use ''{1}'' in this type has value of 
''inheritable'', which is inconsistent with the value in the base type.   
         cos-element-consistent = cos-element-consistent: Error for type 
''{0}''. Multiple elements with name ''{1}'', with different types, appear in 
the model group.
         cos-element-consistent.4.a = cos-element-consistent.4: A wildcard 
matched a global element ''{0}'' whose type ''{1}'' is not validly derived from 
the type definition, ''{2}'', of a local element with the same name.
         cos-element-consistent.4.b = cos-element-consistent.4: Error for type 
''{0}''. Multiple elements with name ''{1}'', with non equivalent type tables, 
appear in the model group.
@@ -227,23 +227,23 @@
         cos-valid-default.2.2.2 = cos-valid-default.2.2.2: Since element 
''{0}'' has a '{'value constraint'}' and its type definition has mixed 
'{'content type'}', then the particle of the '{'content type'}' must be 
emptiable.
         c-props-correct.2 = c-props-correct.2: Cardinality of Fields for 
keyref ''{0}'' and key ''{1}'' must match each other.
         ct-props-correct.3 = ct-props-correct.3: Circular definitions detected 
for complex type ''{0}''. This means that ''{0}'' is contained in its own type 
hierarchy, which is an error.
-        ct-props-correct.4 = ct-props-correct.4: Error for type ''{0}''. 
Duplicate attribute uses with the same name and target namespace are specified. 
 Name of duplicate attribute use is ''{1}''.
+        ct-props-correct.4 = ct-props-correct.4: Error for type ''{0}''. 
Duplicate attribute uses with the same name and target namespace are specified. 
Name of duplicate attribute use is ''{1}''.
         ct-props-correct.5 = ct-props-correct.5: Error for type ''{0}''. Two 
attribute declarations, ''{1}'' and ''{2}'' have types which are derived from 
ID.
-        derivation-ok-restriction.1 = derivation-ok-restriction.1: Type 
''{0}'' was derived by restriction from type ''{1}''.  However, ''{1}'' has a 
'{'final'}' property that forbids derivation by restriction.
-        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: 
Error for type ''{0}''.  The attribute use ''{1}'' in this type has a ''use'' 
value of ''{2}'', which is inconsistent with the value of ''required'' in a 
matching attribute use in the base type.
-        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: 
Error for type ''{0}''.  The attribute use ''{1}'' in this type has type 
''{2}'', which is not validly derived from ''{3}'', the type of the matching 
attribute use in the base type.
-        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: 
Error for type ''{0}''.  The attribute use ''{1}'' in this type has an 
effective value constraint which is not fixed, and the effective value 
constraint of the matching attribute use in the base type is fixed.
-        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: 
Error for type ''{0}''.  The attribute use ''{1}'' in this type has an 
effective value constraint fixed with a value of ''{2}'', which is not 
consistent with the value of ''{3}'' for the fixed effective value constraint 
of the matching attribute use in the base type.
-        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: 
Error for type ''{0}''.  The attribute use ''{1}'' in this type does not have a 
matching attribute use in the base, and the base type does not have a wildcard 
attribute.
-        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: 
Error for type ''{0}''.  The attribute use ''{1}'' in this type does not have a 
matching attribute use in the base, and the wildcard in the base type does not 
allow the namespace ''{2}'' of this attribute use.
-        derivation-ok-restriction.3 = derivation-ok-restriction.3: Error for 
type ''{0}''.  The attribute use ''{1}'' in the base type has REQUIRED as true, 
but there is no matching attribute use in the derived type.
-        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: Error 
for type ''{0}''.  The derivation has an attribute wildcard, but the base does 
not have one.
-        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: Error 
for type ''{0}''.  The wildcard in the derivation is not a valid wildcard 
subset of the one in the base.
-        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: Error 
for type ''{0}''.  The process contents of the wildcard in the derivation ({1}) 
is weaker than that in the base ({2}).
-        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: 
Error for type ''{0}''.  The simple content type of this type, ''{1}'', is not 
a valid restriction of the simple content type of the base, ''{2}''.
-        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: 
Error for type ''{0}''.  The content type of this type is empty, but the 
content type of the base, ''{1}'', is not empty or emptiable.
-        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: 
Error for type ''{0}''.  The content type of this type is mixed, but the 
content type of the base, ''{1}'', is not.
-        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: 
Error for type ''{0}''.  The particle of the type is not a valid restriction of 
the particle of the base.
+        derivation-ok-restriction.1 = derivation-ok-restriction.1: Type 
''{0}'' was derived by restriction from type ''{1}''. However, ''{1}'' has a 
'{'final'}' property that forbids derivation by restriction.
+        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: 
Error for type ''{0}''. The attribute use ''{1}'' in this type has a ''use'' 
value of ''{2}'', which is inconsistent with the value of ''required'' in a 
matching attribute use in the base type.
+        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: 
Error for type ''{0}''. The attribute use ''{1}'' in this type has type 
''{2}'', which is not validly derived from ''{3}'', the type of the matching 
attribute use in the base type.
+        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: 
Error for type ''{0}''. The attribute use ''{1}'' in this type has an effective 
value constraint which is not fixed, and the effective value constraint of the 
matching attribute use in the base type is fixed.
+        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: 
Error for type ''{0}''. The attribute use ''{1}'' in this type has an effective 
value constraint fixed with a value of ''{2}'', which is not consistent with 
the value of ''{3}'' for the fixed effective value constraint of the matching 
attribute use in the base type.
+        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: 
Error for type ''{0}''. The attribute use ''{1}'' in this type does not have a 
matching attribute use in the base, and the base type does not have a wildcard 
attribute.
+        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: 
Error for type ''{0}''. The attribute use ''{1}'' in this type does not have a 
matching attribute use in the base, and the wildcard in the base type does not 
allow the namespace ''{2}'' of this attribute use.
+        derivation-ok-restriction.3 = derivation-ok-restriction.3: Error for 
type ''{0}''. The attribute use ''{1}'' in the base type has REQUIRED as true, 
but there is no matching attribute use in the derived type.
+        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: Error 
for type ''{0}''. The derivation has an attribute wildcard, but the base does 
not have one.
+        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: Error 
for type ''{0}''. The wildcard in the derivation is not a valid wildcard subset 
of the one in the base.
+        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: Error 
for type ''{0}''. The process contents of the wildcard in the derivation ({1}) 
is weaker than that in the base ({2}).
+        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: 
Error for type ''{0}''. The simple content type of this type, ''{1}'', is not a 
valid restriction of the simple content type of the base, ''{2}''.
+        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: 
Error for type ''{0}''. The content type of this type is empty, but the content 
type of the base, ''{1}'', is not empty or emptiable.
+        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: 
Error for type ''{0}''. The content type of this type is mixed, but the content 
type of the base, ''{1}'', is not.
+        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: 
Error for type ''{0}''. The particle of the type is not a valid restriction of 
the particle of the base.
         enumeration-required-notation = enumeration-required-notation: The 
NOTATION type, ''{0}'' used by {2} ''{1}'', must have an enumeration facet 
value which specifies the notation elements used by this type.
         enumeration-valid-restriction = enumeration-valid-restriction: 
Enumeration value ''{0}'' is not in the value space of the base type, {1}.
         e-props-correct.2 = e-props-correct.2: Invalid value constraint value 
''{1}'' in element ''{0}''.
@@ -270,7 +270,7 @@
         maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: 
Error for type ''{2}''. The maxInclusive value =''{0}'' must be >= minInclusive 
of the base type ''{1}''.
         maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: 
Error for type ''{2}''. The maxInclusive value =''{0}'' must be > minExclusive 
of the base type ''{1}''.
         maxLength-valid-restriction = maxLength-valid-restriction: In the 
definition of {2}, maxLength value = ''{0}'' must be <= that of the base type 
''{1}''.
-        mg-props-correct.2 = mg-props-correct.2: Circular definitions detected 
for group ''{0}''. Recursively following the '{'term'}' values of the particles 
leads to a particle whose '{'term'}' is the group itself.           
+        mg-props-correct.2 = mg-props-correct.2: Circular definitions detected 
for group ''{0}''. Recursively following the '{'term'}' values of the particles 
leads to a particle whose '{'term'}' is the group itself.          
         minExclusive-less-than-equal-to-maxExclusive = 
minExclusive-less-than-equal-to-maxExclusive: In the definition of {2}, 
minExclusive value = ''{0}'' must be <= maxExclusive value = ''{1}''.
         minExclusive-less-than-maxInclusive = 
minExclusive-less-than-maxInclusive: In the definition of {2}, minExclusive 
value = ''{0}'' must be < maxInclusive value = ''{1}''.
         minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: 
Error for type ''{2}''. The minExclusive value =''{0}'' must be >= minExclusive 
of the base type ''{1}''.
@@ -315,7 +315,7 @@
 #        We're using sch-props-correct.2 instead of the old src-redefine.1
 #        src-redefine.1 = src-redefine.1: The component ''{0}'' is begin 
redefined, but its corresponding component isn't in the schema document being 
redefined (with namespace ''{2}''), but in a different document, with namespace 
''{1}''.
         sch-props-correct.2 = sch-props-correct.2: A schema cannot contain two 
global components with the same name; this schema contains two occurrences of 
''{0}''.
-        st-props-correct.1 = st-props-correct.1: ''itemType'' of xs:list and 
''memberTypes'' of xs:union cannot refer to special types, xs:anyAtomicType or 
xs:anySimpleType. The ''{1}'' component of simpleType ''{0}'' violates this 
constraint.  
+        st-props-correct.1 = st-props-correct.1: ''itemType'' of xs:list and 
''memberTypes'' of xs:union cannot refer to special types, xs:anyAtomicType or 
xs:anySimpleType. The ''{1}'' component of simpleType ''{0}'' violates this 
constraint. 
         st-props-correct.2 = st-props-correct.2: Circular definitions have 
been detected for simple type ''{0}''. This means that ''{0}'' is contained in 
its own type hierarchy, which is an error.
         st-props-correct.3 = st-props-correct.3: Error for type ''{0}''. The 
value of '{'final'}' of the '{'base type definition'}', ''{1}'', forbids 
derivation by restriction.
         totalDigits-valid-restriction = totalDigits-valid-restriction: In the 
definition of {2}, the value ''{0}'' for the facet ''totalDigits'' is invalid, 
because it must be <= the value for ''totalDigits'' which was set to ''{1}'' in 
one of the ancestor types.
@@ -327,7 +327,7 @@
                minScale-totalDigits = minScale-totalDigits: In the definition 
of {2}, value of minScale = ''{0}'' must be <= value of maxScale = ''{1}''.
                cvc-maxScale-valid = cvc-maxScale-valid: For type {2}, and 
value {0}, it is an error for the value of precision ''{3}'' to be greater than 
the value of maxScale ''{1}''.
                cvc-minScale-valid = cvc-minScale-valid: For type {2}, and 
value {0}, it is an error for the value of precision ''{3}'' to be less than 
the value of minScale ''{1}''. 
-               cvc-explicitTimezone-valid = cvc-explicitTimezone-valid: Value 
''{0}'' is not facet-valid with respect to explicitTimezone ''{1}'' for type 
''{2}''.  
+               cvc-explicitTimezone-valid = cvc-explicitTimezone-valid: Value 
''{0}'' is not facet-valid with respect to explicitTimezone ''{1}'' for type 
''{2}''. 
                maxScale-valid-restriction = maxScale-valid-restriction: In the 
definition of {2}, maxScale value = ''{0}'' must be <= that of the base type 
''{1}''.
                minScale-valid-restriction = minScale-valid-restriction: In the 
definition of {2}, minScale value = ''{0}'' must be >= that of the base type 
''{1}''.
                timezone-valid-restriction = timezone-valid-restriction: In the 
definition of {0}, the value ''{1}'' for the facet ''explicitTimezone'' is 
invalid, because the value for ''explicitTimezone'' has been set to ''{2}'' in 
one of the ancestor types.
@@ -341,8 +341,8 @@
         s4s-elt-must-match.1 = s4s-elt-must-match.1: The content of ''{0}'' 
must match {1}. A problem was found starting at: {2}.
         s4s-elt-must-match.2 = s4s-elt-must-match.2: The content of ''{0}'' 
must match {1}. Not enough elements were found.
         # the "invalid-content" messages provide less information than the 
"must-match" counterparts above. They're used for complex types when providing 
a "match" would be an information dump
-        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: The content of 
''{0}'' is invalid.  Element ''{1}'' is invalid, misplaced, or occurs too often.
-        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: The content of 
''{0}'' is invalid.  Element ''{1}'' cannot be empty.
+        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: The content of 
''{0}'' is invalid. Element ''{1}'' is invalid, misplaced, or occurs too often.
+        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: The content of 
''{0}'' is invalid. Element ''{1}'' cannot be empty.
         s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: Elements of 
type ''{0}'' cannot appear after declarations as children of a <schema> element.
         s4s-elt-schema-ns = s4s-elt-schema-ns: The namespace of element 
''{0}'' must be from the schema namespace, ''http://www.w3.org/2001/XMLSchema''.
         s4s-elt-character = s4s-elt-character: Non-whitespace characters are 
not allowed in schema elements other than ''xs:appinfo'' and 
''xs:documentation''. Saw ''{0}''.
@@ -354,7 +354,7 @@
         c-general-xpath-ns = c-general-xpath-ns: A namespace prefix in XPath 
expression ''{0}'' was not bound to a namespace.
         c-cta-xpath = c-cta-xpath: The XPath expression ''{0}'' couldn''t 
compile successfully in ''{1}'' mode, during CTA evaluation.
         c-cta-xpath-b = c-cta-xpath-b: The CTA XPath expression such as 
(''{0}'') containing / or //, while in ''{1}'' mode, cannot yield a valid 
result (since a CTA tree is rooted at a parentless element).
-        c-cta-xpath-serr = c-cta-xpath-serr: The XPath expression ''{0}'' 
couldn''t compile successfully in ''{1}'' mode, during CTA evaluation. A static 
error ''{2}'' occured in the XPath expression.  
+        c-cta-xpath-serr = c-cta-xpath-serr: The XPath expression ''{0}'' 
couldn''t compile successfully in ''{1}'' mode, during CTA evaluation. A static 
error ''{2}'' occured in the XPath expression. 
         c-selector-xpath = c-selector-xpath: The selector value = ''{0}'' is 
not valid; selector xpaths cannot contain attributes.
         EmptyTargetNamespace = EmptyTargetNamespace: In schema document 
''{0}'', the value of the ''targetNamespace'' attribute cannot be an empty 
string.
         FacetValueFromBase = FacetValueFromBase: In the declaration of type 
''{0}'', value ''{1}'' of facet ''{2}'' must be from the value space of the 
base type, ''{3}''.
@@ -367,7 +367,7 @@
         TargetNamespace.2 = TargetNamespace.2: Expecting no namespace, but the 
schema document has a target namespace of ''{1}''.
         UndeclaredEntity = UndeclaredEntity: Entity ''{0}'' is not declared.
         UndeclaredPrefix = UndeclaredPrefix: Cannot resolve ''{0}'' as a 
QName: the prefix ''{1}'' is not declared.
-        FacetsContradict = FacetsContradict: For simpleType definition 
''{2}'', the enumeration value ''{0}'' contradicts with value of ''{1}'' facet. 
 
+        FacetsContradict = FacetsContradict: For simpleType definition 
''{2}'', the enumeration value ''{0}'' contradicts with value of ''{1}'' facet. 
 
 # JAXP 1.2 schema source property errors
 

Modified: 
xerces/java/trunk/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties?rev=1867420&r1=1867419&r2=1867420&view=diff
==============================================================================
--- 
xerces/java/trunk/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties 
(original)
+++ 
xerces/java/trunk/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties 
Tue Sep 24 05:37:26 2019
@@ -117,9 +117,9 @@
         src-attribute.4 = src-attribute.4: Attribute ''{0}'' has both a 
''type'' attribute and an anonymous ''simpleType'' child. Only one of these is 
allowed for an attribute.
         src-attribute_group.2 = src-attribute_group.2: The intersection of 
wildcards is not expressible for attribute group ''{0}''.
         src-attribute_group.3 = src-attribute_group.3: Circular definitions 
detected for attribute group ''{0}''. Recursively following attribute group 
references eventually leads back to itself.
-        src-ct.1 = src-ct.1: Complex Type Definition Representation Error for 
type ''{0}''.  When <complexContent> is used, the base type must be a 
complexType. ''{1}'' is a simpleType.
-        src-ct.2.1 = src-ct.2.1: Complex Type Definition Representation Error 
for type ''{0}''.  When <simpleContent> is used, the base type must be a 
complexType whose content type is simple, or, only if restriction is specified, 
a complex type with mixed content and emptiable particle, or, only if extension 
is specified, a simple type. ''{1}'' satisfies none of these conditions.
-        src-ct.2.2 = src-ct.2.2: Complex Type Definition Representation Error 
for type ''{0}''.  When a complexType with simpleContent restricts a 
complexType with mixed content and emptiable particle, then there must be a 
<simpleType> among the children of <restriction>.
+        src-ct.1 = src-ct.1: Complex Type Definition Representation Error for 
type ''{0}''. When <complexContent> is used, the base type must be a 
complexType. ''{1}'' is a simpleType.
+        src-ct.2.1 = src-ct.2.1: Complex Type Definition Representation Error 
for type ''{0}''. When <simpleContent> is used, the base type must be a 
complexType whose content type is simple, or, only if restriction is specified, 
a complex type with mixed content and emptiable particle, or, only if extension 
is specified, a simple type. ''{1}'' satisfies none of these conditions.
+        src-ct.2.2 = src-ct.2.2: Complex Type Definition Representation Error 
for type ''{0}''. When a complexType with simpleContent restricts a complexType 
with mixed content and emptiable particle, then there must be a <simpleType> 
among the children of <restriction>.
         src-ct.4 = src-ct.4: Complex Type Definition Representation Error for 
type ''{0}''. The intersection of wildcards is not expressible.
         src-ct.5 = src-ct.5: Complex Type Definition Representation Error for 
type ''{0}''. The union of wildcards is not expressible.
         src-element.1 = src-element.1: The properties ''default'' and 
''fixed'' cannot both be present in element declaration ''{0}''. Use only one 
of them.
@@ -161,15 +161,15 @@
 
 #constraint valid (3.X.6)
 
-        ag-props-correct.2 = ag-props-correct.2: Error for attribute group 
''{0}''.  Duplicate attribute uses with the same name and target namespace are 
specified.  Name of duplicate attribute use is ''{1}''.
-        ag-props-correct.3 = ag-props-correct.3: Error for attribute group 
''{0}''.  Two attribute declarations, ''{1}'' and ''{2}'' have types which are 
derived from ID.
+        ag-props-correct.2 = ag-props-correct.2: Error for attribute group 
''{0}''. Duplicate attribute uses with the same name and target namespace are 
specified. Name of duplicate attribute use is ''{1}''.
+        ag-props-correct.3 = ag-props-correct.3: Error for attribute group 
''{0}''. Two attribute declarations, ''{1}'' and ''{2}'' have types which are 
derived from ID.
         a-props-correct.2 = a-props-correct.2: Invalid value constraint value 
''{1}'' in attribute ''{0}''.
         a-props-correct.3 = a-props-correct.3: Attribute ''{0}'' cannot use 
''fixed'' or ''default'', because the attribute''s '{'type definition'}' is ID, 
or is derived from ID.
         au-props-correct.2 = au-props-correct.2: In the attribute declaration 
of ''{0}'', a fixed value of ''{1}'' was specified. So if the attribute use 
referring to ''{0}'' also has a '{'value constraint'}', it must be fixed and 
its value must be ''{1}''.
         cos-all-limited.1.2 = cos-all-limited.1.2: An 'all' model group must 
appear in a particle with '{'min occurs'}' = '{'max occurs'}' = 1, and that 
particle must be part of a pair which constitutes the '{'content type'}' of a 
complex type definition.
         cos-all-limited.2 = cos-all-limited.2: The '{'max occurs'}' of an 
element in an ''all'' model group must be 0 or 1. The value ''{0}'' for element 
''{1}'' is invalid.
         cos-applicable-facets = cos-applicable-facets: Facet ''{0}'' is not 
allowed by type {1}.
-        cos-ct-extends.1.1 = cos-ct-extends.1.1: Type ''{0}'' was derived by 
extension from type ''{1}''.  However, the ''final'' attribute of ''{1}'' 
forbids derivation by extension.
+        cos-ct-extends.1.1 = cos-ct-extends.1.1: Type ''{0}'' was derived by 
extension from type ''{1}''. However, the ''final'' attribute of ''{1}'' 
forbids derivation by extension.
         cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: The 
content type of a derived type and that of its base must both be mixed or both 
be element-only. Type ''{0}'' is element only, but its base type is not.
         cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: The 
content type of a derived type and that of its base must both be mixed or both 
be element-only. Type ''{0}'' is mixed, but its base type is not.
         cos-element-consistent = cos-element-consistent: Error for type 
''{0}''. Multiple elements with name ''{1}'', with different types, appear in 
the model group.
@@ -186,23 +186,23 @@
         cos-valid-default.2.2.2 = cos-valid-default.2.2.2: Since element 
''{0}'' has a '{'value constraint'}' and its type definition has mixed 
'{'content type'}', then the particle of the '{'content type'}' must be 
emptiable.
         c-props-correct.2 = c-props-correct.2: Cardinality of Fields for 
keyref ''{0}'' and key ''{1}'' must match each other.
         ct-props-correct.3 = ct-props-correct.3: Circular definitions detected 
for complex type ''{0}''. This means that ''{0}'' is contained in its own type 
hierarchy, which is an error.
-        ct-props-correct.4 = ct-props-correct.4: Error for type ''{0}''. 
Duplicate attribute uses with the same name and target namespace are specified. 
 Name of duplicate attribute use is ''{1}''.
+        ct-props-correct.4 = ct-props-correct.4: Error for type ''{0}''. 
Duplicate attribute uses with the same name and target namespace are specified. 
Name of duplicate attribute use is ''{1}''.
         ct-props-correct.5 = ct-props-correct.5: Error for type ''{0}''. Two 
attribute declarations, ''{1}'' and ''{2}'' have types which are derived from 
ID.
-        derivation-ok-restriction.1 = derivation-ok-restriction.1: Type 
''{0}'' was derived by restriction from type ''{1}''.  However, ''{1}'' has a 
'{'final'}' property that forbids derivation by restriction.
-        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: 
Error for type ''{0}''.  The attribute use ''{1}'' in this type has a ''use'' 
value of ''{2}'', which is inconsistent with the value of ''required'' in a 
matching attribute use in the base type.
-        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: 
Error for type ''{0}''.  The attribute use ''{1}'' in this type has type 
''{2}'', which is not validly derived from ''{3}'', the type of the matching 
attribute use in the base type.
-        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: 
Error for type ''{0}''.  The attribute use ''{1}'' in this type has an 
effective value constraint which is not fixed, and the effective value 
constraint of the matching attribute use in the base type is fixed.
-        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: 
Error for type ''{0}''.  The attribute use ''{1}'' in this type has an 
effective value constraint fixed with a value of ''{2}'', which is not 
consistent with the value of ''{3}'' for the fixed effective value constraint 
of the matching attribute use in the base type.
-        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: 
Error for type ''{0}''.  The attribute use ''{1}'' in this type does not have a 
matching attribute use in the base, and the base type does not have a wildcard 
attribute.
-        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: 
Error for type ''{0}''.  The attribute use ''{1}'' in this type does not have a 
matching attribute use in the base, and the wildcard in the base type does not 
allow the namespace ''{2}'' of this attribute use.
-        derivation-ok-restriction.3 = derivation-ok-restriction.3: Error for 
type ''{0}''.  The attribute use ''{1}'' in the base type has REQUIRED as true, 
but there is no matching attribute use in the derived type.
-        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: Error 
for type ''{0}''.  The derivation has an attribute wildcard, but the base does 
not have one.
-        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: Error 
for type ''{0}''.  The wildcard in the derivation is not a valid wildcard 
subset of the one in the base.
-        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: Error 
for type ''{0}''.  The process contents of the wildcard in the derivation ({1}) 
is weaker than that in the base ({2}).
-        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: 
Error for type ''{0}''.  The simple content type of this type, ''{1}'', is not 
a valid restriction of the simple content type of the base, ''{2}''.
-        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: 
Error for type ''{0}''.  The content type of this type is empty, but the 
content type of the base, ''{1}'', is not empty or emptiable.
-        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: 
Error for type ''{0}''.  The content type of this type is mixed, but the 
content type of the base, ''{1}'', is not.
-        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: 
Error for type ''{0}''.  The particle of the type is not a valid restriction of 
the particle of the base.
+        derivation-ok-restriction.1 = derivation-ok-restriction.1: Type 
''{0}'' was derived by restriction from type ''{1}''. However, ''{1}'' has a 
'{'final'}' property that forbids derivation by restriction.
+        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: 
Error for type ''{0}''. The attribute use ''{1}'' in this type has a ''use'' 
value of ''{2}'', which is inconsistent with the value of ''required'' in a 
matching attribute use in the base type.
+        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: 
Error for type ''{0}''. The attribute use ''{1}'' in this type has type 
''{2}'', which is not validly derived from ''{3}'', the type of the matching 
attribute use in the base type.
+        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: 
Error for type ''{0}''. The attribute use ''{1}'' in this type has an effective 
value constraint which is not fixed, and the effective value constraint of the 
matching attribute use in the base type is fixed.
+        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: 
Error for type ''{0}''. The attribute use ''{1}'' in this type has an effective 
value constraint fixed with a value of ''{2}'', which is not consistent with 
the value of ''{3}'' for the fixed effective value constraint of the matching 
attribute use in the base type.
+        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: 
Error for type ''{0}''. The attribute use ''{1}'' in this type does not have a 
matching attribute use in the base, and the base type does not have a wildcard 
attribute.
+        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: 
Error for type ''{0}''. The attribute use ''{1}'' in this type does not have a 
matching attribute use in the base, and the wildcard in the base type does not 
allow the namespace ''{2}'' of this attribute use.
+        derivation-ok-restriction.3 = derivation-ok-restriction.3: Error for 
type ''{0}''. The attribute use ''{1}'' in the base type has REQUIRED as true, 
but there is no matching attribute use in the derived type.
+        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: Error 
for type ''{0}''. The derivation has an attribute wildcard, but the base does 
not have one.
+        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: Error 
for type ''{0}''. The wildcard in the derivation is not a valid wildcard subset 
of the one in the base.
+        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: Error 
for type ''{0}''. The process contents of the wildcard in the derivation ({1}) 
is weaker than that in the base ({2}).
+        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: 
Error for type ''{0}''. The simple content type of this type, ''{1}'', is not a 
valid restriction of the simple content type of the base, ''{2}''.
+        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: 
Error for type ''{0}''. The content type of this type is empty, but the content 
type of the base, ''{1}'', is not empty or emptiable.
+        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: 
Error for type ''{0}''. The content type of this type is mixed, but the content 
type of the base, ''{1}'', is not.
+        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: 
Error for type ''{0}''. The particle of the type is not a valid restriction of 
the particle of the base.
         enumeration-required-notation = enumeration-required-notation: The 
NOTATION type, ''{0}'' used by {2} ''{1}'', must have an enumeration facet 
value which specifies the notation elements used by this type.
         enumeration-valid-restriction = enumeration-valid-restriction: 
Enumeration value ''{0}'' is not in the value space of the base type, {1}.
         e-props-correct.2 = e-props-correct.2: Invalid value constraint value 
''{1}'' in element ''{0}''.
@@ -288,8 +288,8 @@
         s4s-elt-must-match.1 = s4s-elt-must-match.1: The content of ''{0}'' 
must match {1}. A problem was found starting at: {2}.
         s4s-elt-must-match.2 = s4s-elt-must-match.2: The content of ''{0}'' 
must match {1}. Not enough elements were found.
         # the "invalid-content" messages provide less information than the 
"must-match" counterparts above. They're used for complex types when providing 
a "match" would be an information dump
-        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: The content of 
''{0}'' is invalid.  Element ''{1}'' is invalid, misplaced, or occurs too often.
-        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: The content of 
''{0}'' is invalid.  Element ''{1}'' cannot be empty.
+        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: The content of 
''{0}'' is invalid. Element ''{1}'' is invalid, misplaced, or occurs too often.
+        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: The content of 
''{0}'' is invalid. Element ''{1}'' cannot be empty.
         s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: Elements of 
type ''{0}'' cannot appear after declarations as children of a <schema> element.
         s4s-elt-schema-ns = s4s-elt-schema-ns: The namespace of element 
''{0}'' must be from the schema namespace, ''http://www.w3.org/2001/XMLSchema''.
         s4s-elt-character = s4s-elt-character: Non-whitespace characters are 
not allowed in schema elements other than ''xs:appinfo'' and 
''xs:documentation''. Saw ''{0}''.



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to