You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by kk...@apache.org on 2004/09/29 03:26:58 UTC
cvs commit: xml-xmlbeans/v2/src/xmlpublic/org/apache/xmlbeans XmlErrorCodes.java message.properties
kkrouse 2004/09/28 18:26:57
Modified: v2/src/typeimpl/org/apache/xmlbeans/impl/schema
StscChecker.java StscSimpleTypeResolver.java
StscTranslator.java
v2/src/typeimpl/org/apache/xmlbeans/impl/validator
Validator.java
v2/src/typeimpl/org/apache/xmlbeans/impl/values
JavaDecimalHolderEx.java JavaIntHolderEx.java
JavaIntegerHolderEx.java JavaLongHolderEx.java
v2/src/xmlpublic/org/apache/xmlbeans XmlErrorCodes.java
message.properties
Log:
- XMLBEANS-54: fixed totalDigits facet for xs:integer
- mixed content with fixed value constraint can't have element childrent
- validate mixed content against fixed value constraint
Revision Changes Path
1.6 +30 -5 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/StscChecker.java
Index: StscChecker.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/StscChecker.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StscChecker.java 24 Sep 2004 06:50:06 -0000 1.5
+++ StscChecker.java 29 Sep 2004 01:26:57 -0000 1.6
@@ -27,6 +27,7 @@
import org.apache.xmlbeans.XmlID;
import org.apache.xmlbeans.XmlAnySimpleType;
import org.apache.xmlbeans.XmlErrorCodes;
+import org.apache.xmlbeans.XmlString;
import org.apache.xmlbeans.impl.common.XBeanDebug;
import org.apache.xmlbeans.impl.common.QNameHelper;
@@ -138,7 +139,7 @@
new Object[] { QNameHelper.pretty(sAttrs[i].getName()),
constraintName,
valueConstraint,
- QNameHelper.readable(sAttrs[i].getType()) },
+ QNameHelper.pretty(sAttrs[i].getType().getName()) },
constraintLocation);
}
}
@@ -175,7 +176,7 @@
XmlAnySimpleType val = model.getDefaultValue();
if (!val.validate())
throw new Exception();
-
+
SchemaPropertyImpl sProp = (SchemaPropertyImpl)parentType.getElementProperty(model.getName());
if (sProp != null && sProp.getDefaultText() != null)
{
@@ -187,13 +188,37 @@
// move to 'fixed' or 'default' attribute on the element definition
String constraintName = (model.isFixed() ? "fixed" : "default");
XmlObject constraintLocation = location.selectAttribute("", constraintName);
-
+
StscState.get().error(XmlErrorCodes.ELEM_PROPERTIES$CONSTRAINT_VALID,
- new Object[] { QNameHelper.pretty(model.getName()),
+ new Object[] { QNameHelper.pretty(model.getName()),
constraintName,
valueConstraint,
- QNameHelper.readable(model.getType()) },
+ QNameHelper.pretty(model.getType().getName()) },
(constraintLocation==null ? location : constraintLocation));
+ }
+ }
+ else if (model.getType().getContentType() == SchemaType.MIXED_CONTENT)
+ {
+ if (!model.getType().getContentModel().isSkippable())
+ {
+ String constraintName = (model.isFixed() ? "fixed" : "default");
+ XmlObject constraintLocation = location.selectAttribute("", constraintName);
+
+ StscState.get().error(XmlErrorCodes.ELEM_DEFAULT_VALID$MIXED_AND_EMPTIABLE,
+ new Object[] { QNameHelper.pretty(model.getName()),
+ constraintName,
+ valueConstraint },
+ (constraintLocation==null ? location : constraintLocation));
+ }
+ else
+ {
+ // Element Default Valid (Immediate): cos-valid-default.2.2.2
+ // no need to validate the value; type is a xs:string
+ SchemaPropertyImpl sProp = (SchemaPropertyImpl)parentType.getElementProperty(model.getName());
+ if (sProp != null && sProp.getDefaultText() != null)
+ {
+ sProp.setDefaultValue(new XmlValueRef(XmlString.type.newValue(valueConstraint)));
+ }
}
}
else if (model.getType().getContentType() == SchemaType.ELEMENT_CONTENT)
1.7 +22 -7 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java
Index: StscSimpleTypeResolver.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StscSimpleTypeResolver.java 7 Aug 2004 01:31:35 -0000 1.6
+++ StscSimpleTypeResolver.java 29 Sep 2004 01:26:57 -0000 1.7
@@ -33,6 +33,8 @@
import org.apache.xmlbeans.XmlByte;
import org.apache.xmlbeans.XmlShort;
import org.apache.xmlbeans.XmlUnsignedByte;
+import org.apache.xmlbeans.XmlPositiveInteger;
+import org.apache.xmlbeans.XmlNonNegativeInteger;
import org.w3.x2001.xmlSchema.*;
public class StscSimpleTypeResolver
@@ -728,12 +730,10 @@
break;
case SchemaType.FACET_TOTAL_DIGITS:
- case SchemaType.FACET_FRACTION_DIGITS:
- boolean istotaldig = (code == SchemaType.FACET_TOTAL_DIGITS);
- XmlInteger dig = StscTranslator.buildNnInteger(facet.getValue());
+ XmlPositiveInteger dig = StscTranslator.buildPosInteger(facet.getValue());
if (dig == null)
{
- state.error("Must be a nonnegative integer", XmlErrorCodes.FACET_VALUE_MALFORMED, facet);
+ state.error("Must be a positive integer", XmlErrorCodes.FACET_VALUE_MALFORMED, facet);
break;
}
if (fixedFacets[code] && !myFacets[code].valueEquals(dig))
@@ -746,12 +746,27 @@
if (dig.compareValue(myFacets[SchemaType.FACET_TOTAL_DIGITS]) > 0)
state.error(XmlErrorCodes.DATATYPE_TOTAL_DIGITS_RESTRICTION, null, facet);
}
- if (!istotaldig && myFacets[SchemaType.FACET_FRACTION_DIGITS] != null)
+ myFacets[code] = dig;
+ break;
+
+ case SchemaType.FACET_FRACTION_DIGITS:
+ XmlNonNegativeInteger fdig = StscTranslator.buildNnInteger(facet.getValue());
+ if (fdig == null)
{
- if (dig.compareValue(myFacets[SchemaType.FACET_FRACTION_DIGITS]) > 0)
+ state.error("Must be a nonnegative integer", XmlErrorCodes.FACET_VALUE_MALFORMED, facet);
+ break;
+ }
+ if (fixedFacets[code] && !myFacets[code].valueEquals(fdig))
+ {
+ state.error(XmlErrorCodes.FACET_FIXED, null, facet);
+ continue;
+ }
+ if (myFacets[SchemaType.FACET_FRACTION_DIGITS] != null)
+ {
+ if (fdig.compareValue(myFacets[SchemaType.FACET_FRACTION_DIGITS]) > 0)
state.error(XmlErrorCodes.DATATYPE_FRACTION_DIGITS_RESTRICTION, null, facet);
}
- myFacets[code] = dig;
+ myFacets[code] = fdig;
break;
case SchemaType.FACET_MIN_EXCLUSIVE:
1.12 +32 -2 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java
Index: StscTranslator.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StscTranslator.java 26 Aug 2004 21:10:34 -0000 1.11
+++ StscTranslator.java 29 Sep 2004 01:26:57 -0000 1.12
@@ -30,6 +30,8 @@
import org.apache.xmlbeans.impl.values.XmlIntegerImpl;
import org.apache.xmlbeans.impl.values.XmlValueOutOfRangeException;
import org.apache.xmlbeans.impl.values.NamespaceContext;
+import org.apache.xmlbeans.impl.values.XmlPositiveIntegerImpl;
+import org.apache.xmlbeans.impl.values.XmlNonNegativeIntegerImpl;
import org.apache.xmlbeans.impl.regex.RegularExpression;
import org.apache.xmlbeans.soap.SOAPArrayType;
import org.apache.xmlbeans.XmlObject;
@@ -46,6 +48,8 @@
import org.apache.xmlbeans.SchemaGlobalAttribute;
import org.apache.xmlbeans.XmlAnySimpleType;
import org.apache.xmlbeans.XmlInteger;
+import org.apache.xmlbeans.XmlNonNegativeInteger;
+import org.apache.xmlbeans.XmlPositiveInteger;
import javax.xml.namespace.QName;
@@ -1218,7 +1222,7 @@
return SchemaLocalAttribute.OPTIONAL;
}
- static XmlInteger buildNnInteger(XmlAnySimpleType value)
+ static BigInteger buildBigInt(XmlAnySimpleType value)
{
if (value == null)
return null;
@@ -1239,9 +1243,34 @@
StscState.get().error(XmlErrorCodes.INVALID_VALUE, new Object[] { text, "nonNegativeInteger" }, value);
return null;
}
+
+ return bigInt;
+ }
+
+
+ static XmlNonNegativeInteger buildNnInteger(XmlAnySimpleType value)
+ {
+ BigInteger bigInt = buildBigInt(value);
+ try
+ {
+ XmlNonNegativeIntegerImpl i = new XmlNonNegativeIntegerImpl();
+ i.set(bigInt);
+ i.setImmutable();
+ return i;
+ }
+ catch (XmlValueOutOfRangeException e)
+ {
+ StscState.get().error("Internal error processing number", XmlErrorCodes.MALFORMED_NUMBER, value);
+ return null;
+ }
+ }
+
+ static XmlPositiveInteger buildPosInteger(XmlAnySimpleType value)
+ {
+ BigInteger bigInt = buildBigInt(value);
try
{
- XmlIntegerImpl i = new XmlIntegerImpl();
+ XmlPositiveIntegerImpl i = new XmlPositiveIntegerImpl();
i.set(bigInt);
i.setImmutable();
return i;
@@ -1252,6 +1281,7 @@
return null;
}
}
+
private static Object getUserData(XmlObject pos)
{
1.21 +23 -2 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/validator/Validator.java
Index: Validator.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/validator/Validator.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Validator.java 26 Sep 2004 05:08:38 -0000 1.20
+++ Validator.java 29 Sep 2004 01:26:57 -0000 1.21
@@ -59,6 +59,7 @@
import org.apache.xmlbeans.XmlOptions;
import org.apache.xmlbeans.SimpleValue;
import org.apache.xmlbeans.SchemaProperty;
+import org.apache.xmlbeans.XmlString;
import java.math.BigDecimal;
import java.util.Collection;
@@ -282,6 +283,14 @@
return;
}
+ if (!state._isNil && state._field != null && state._field.isFixed())
+ {
+ emitFieldError(event, XmlErrorCodes.ELEM_LOCALLY_VALID$FIXED_WITH_CONTENT,
+ new Object[] { QNameHelper.pretty(state._field.getName()) },
+ state._field.getName(), state._type, null,
+ XmlValidationError.ELEMENT_NOT_ALLOWED, state._type);
+ }
+
if (!state.visit( name ))
{
findDetailedErrorBegin(event ,state , name);
@@ -820,6 +829,19 @@
_constraintEngine.text( event, state._type, value, false );
}
+ else if (state._canHaveMixedContent)
+ {
+ // handles cvc-elt.5.2.2.2.1, checking mixed content against fixed.
+ // if we see <mixedType>a</b>c</mixedType>, we validate against
+ // the first 'a' text and we check the content of mixedType to
+ // be empty in beginElem(). we don't care about checking against
+ // the 'c' text since there will already be an error for <b/>
+ String value =
+ validateSimpleType(
+ XmlString.type, field, event, emptyContent, true );
+
+ _constraintEngine.text( event, XmlString.type, value, false );
+ }
else if (emptyContent)
{
_constraintEngine.text( event, state._type, null, true );
@@ -849,7 +871,6 @@
}
else
{
- // BUGBUG: can this happen? if not a SchemaLocalElement it should be an attribute, right?
// KHK: cvc-complex-type.2.1 or .2.3
// todo (dutta) offendingQName = not sure how to get this(event.getName()??);
emitError(event, "Can't have mixed content", event.getName(),
@@ -1165,7 +1186,7 @@
String errorCode = null;
// see rule 5 of cvc-elt: Element Locally Valid (Element)
- if (type.getContentType() == SchemaType.MIXED_CONTENT)
+ if (field.getType().getContentType() == SchemaType.MIXED_CONTENT)
errorCode = XmlErrorCodes.ELEM_LOCALLY_VALID$FIXED_VALID_MIXED_CONTENT;
else if (type.isSimpleType())
errorCode = XmlErrorCodes.ELEM_LOCALLY_VALID$FIXED_VALID_SIMPLE_TYPE;
1.5 +2 -2 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/values/JavaDecimalHolderEx.java
Index: JavaDecimalHolderEx.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/values/JavaDecimalHolderEx.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JavaDecimalHolderEx.java 23 Sep 2004 23:45:59 -0000 1.4
+++ JavaDecimalHolderEx.java 29 Sep 2004 01:26:57 -0000 1.5
@@ -91,7 +91,7 @@
if (v.scale() > scale)
{
context.invalid(XmlErrorCodes.DATATYPE_FRACTION_DIGITS_VALID,
- new Object[] { new Integer(v.scale()), new Integer(scale), QNameHelper.readable(sType) });
+ new Object[] { new Integer(v.scale()), v, new Integer(scale), QNameHelper.readable(sType) });
return;
}
}
@@ -108,7 +108,7 @@
if (len > tdf)
{
context.invalid(XmlErrorCodes.DATATYPE_TOTAL_DIGITS_VALID,
- new Object[] { temp, new Integer(tdf), QNameHelper.readable(sType) });
+ new Object[] { new Integer(len), temp, new Integer(tdf), QNameHelper.readable(sType) });
return;
}
}
1.6 +1 -1 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/values/JavaIntHolderEx.java
Index: JavaIntHolderEx.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/values/JavaIntHolderEx.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JavaIntHolderEx.java 23 Sep 2004 23:45:59 -0000 1.5
+++ JavaIntHolderEx.java 29 Sep 2004 01:26:57 -0000 1.6
@@ -86,7 +86,7 @@
if (len > m)
{
context.invalid(XmlErrorCodes.DATATYPE_TOTAL_DIGITS_VALID,
- new Object[] { temp, new Integer(getIntValue(td)), QNameHelper.readable(sType) });
+ new Object[] { new Integer(len), temp, new Integer(getIntValue(td)), QNameHelper.readable(sType) });
return;
}
}
1.4 +4 -4 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/values/JavaIntegerHolderEx.java
Index: JavaIntegerHolderEx.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/values/JavaIntegerHolderEx.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaIntegerHolderEx.java 23 Sep 2004 23:45:59 -0000 1.3
+++ JavaIntegerHolderEx.java 29 Sep 2004 01:26:57 -0000 1.4
@@ -20,7 +20,7 @@
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlErrorCodes;
import org.apache.xmlbeans.SchemaType;
-import org.apache.xmlbeans.XmlInt;
+import org.apache.xmlbeans.XmlPositiveInteger;
import org.apache.xmlbeans.impl.common.ValidationContext;
import org.apache.xmlbeans.impl.common.QNameHelper;
@@ -74,17 +74,17 @@
private static void validateValue(BigInteger v, SchemaType sType, ValidationContext context)
{
// total digits
- XmlInt td = (XmlInt)sType.getFacet(SchemaType.FACET_TOTAL_DIGITS);
+ XmlPositiveInteger td = (XmlPositiveInteger)sType.getFacet(SchemaType.FACET_TOTAL_DIGITS);
if (td != null)
{
String temp = v.toString();
int len = temp.length();
if (len > 0 && temp.charAt(0) == '-')
len -= 1;
- if (len > td.getIntValue())
+ if (len > td.getBigIntegerValue().intValue())
{
context.invalid(XmlErrorCodes.DATATYPE_TOTAL_DIGITS_VALID,
- new Object[] { temp, new Integer(td.getIntValue()), QNameHelper.readable(sType) });
+ new Object[] { new Integer(len), temp, new Integer(td.getBigIntegerValue().intValue()), QNameHelper.readable(sType) });
return;
}
}
1.6 +1 -1 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/values/JavaLongHolderEx.java
Index: JavaLongHolderEx.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/values/JavaLongHolderEx.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JavaLongHolderEx.java 23 Sep 2004 23:45:59 -0000 1.5
+++ JavaLongHolderEx.java 29 Sep 2004 01:26:57 -0000 1.6
@@ -86,7 +86,7 @@
if (len > m)
{
context.invalid(XmlErrorCodes.DATATYPE_TOTAL_DIGITS_VALID,
- new Object[] { temp, new Long(m), QNameHelper.readable(sType) });
+ new Object[] { new Integer(len), temp, new Long(m), QNameHelper.readable(sType) });
return;
}
}
1.6 +12 -0 xml-xmlbeans/v2/src/xmlpublic/org/apache/xmlbeans/XmlErrorCodes.java
Index: XmlErrorCodes.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/xmlpublic/org/apache/xmlbeans/XmlErrorCodes.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XmlErrorCodes.java 26 Sep 2004 05:08:38 -0000 1.5
+++ XmlErrorCodes.java 29 Sep 2004 01:26:57 -0000 1.6
@@ -286,6 +286,12 @@
public static final String ELEM_LOCALLY_VALID$XSI_TYPE_BLOCK_RESTRICTION = "cvc-elt.4.3c";
/**
+ * cvc-elt.5.2.2.1: See clause 5.2.2.1 of
+ * <a href="http://www.w3c.org/TR/xmlschema-1/#cvc-elt">XMLSchema Structures 1.0: Element Locally Valid (Element)</a>
+ */
+ public static final String ELEM_LOCALLY_VALID$FIXED_WITH_CONTENT = "cvc-elt.5.2.2.1";
+
+ /**
* cvc-elt.5.2.2.2.1: See clause 5.2.2.2.1 of
* <a href="http://www.w3c.org/TR/xmlschema-1/#cvc-elt">XMLSchema Structures 1.0: Element Locally Valid (Element)</a>
*/
@@ -1088,6 +1094,12 @@
* <a href="http://www.w3c.org/TR/xmlschema-1/#cos-valid-default">XMLSchema Structures 1.0: Element Default Valid (Immediate)</a>
*/
public static final String ELEM_DEFAULT_VALID$SIMPLE_TYPE_OR_MIXED = "cos-valid-default.2.1";
+
+ /**
+ * cos-valid-default.2.2.2: See clause 2.2.2 of
+ * <a href="http://www.w3c.org/TR/xmlschema-1/#cos-valid-default">XMLSchema Structures 1.0: Element Default Valid (Immediate)</a>
+ */
+ public static final String ELEM_DEFAULT_VALID$MIXED_AND_EMPTIABLE = "cos-valid-default.2.2.2";
/**
* ct-props-correct: See
1.6 +18 -12 xml-xmlbeans/v2/src/xmlpublic/org/apache/xmlbeans/message.properties
Index: message.properties
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/xmlpublic/org/apache/xmlbeans/message.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- message.properties 26 Sep 2004 05:08:38 -0000 1.5
+++ message.properties 29 Sep 2004 01:26:57 -0000 1.6
@@ -138,6 +138,9 @@
cvc-elt.4.3d = \
Derived type ''{0}'' may not be substituted for element ''{1}''
+cvc-elt.5.2.2.1 = \
+Element ''{0}'' is fixed and not nil so is not allowed to have element children
+
cvc-elt.5.2.2.2.1 = \
The value ''{0}'' does not equal the fixed value ''{1}''
#The value ''{0}'' does not equal the fixed value ''{1}'' of ''{2}''
@@ -156,7 +159,7 @@
Facet Valid
cvc-fractionDigits-valid = \
-Decimal fractional digits ({0}) does not match fractional digits facet ({1}) for ''{2}''
+Decimal fractional digits ({0}) of value ''{1}'' does not match fractionDigits facet ({2}) for ''{3}''
cvc-id.2 = \
Duplicate ID value ''{0}''
@@ -183,40 +186,40 @@
List value ''{0}'' has {1} items but requires {2} items per length facet for ''{3}''
cvc-maxExclusive-valid = \
-{0} value ({1}) is greater than or equal to max exclusive facet ({2}) for ''{3}''
+{0} value ({1}) is greater than or equal to maxExclusive facet ({2}) for ''{3}''
cvc-maxInclusive-valid = \
-{0} value ({1}) is greater than max inclusive facet ({2}) for ''{3}''
+{0} value ({1}) is greater than maxInclusive facet ({2}) for ''{3}''
cvc-maxLength-valid = \
maxLength Valid
cvc-maxLength-valid.1.1 = \
-{0} length ({0}) is greater than max length facet ({1}) for ''{2}''
+{0} length ({0}) is greater than maxLength facet ({1}) for ''{2}''
cvc-maxLength-valid.1.2 = \
-{0} encoded data has only {1} bytes, more than max length facet ({2}) for ''{3}''
+{0} encoded data has only {1} bytes, more than maxLength facet ({2}) for ''{3}''
cvc-maxLength-valid.2 = \
-List value ''{0}'' has {1} items, more than max length facet ({2}) for ''{3}''
+List value ''{0}'' has {1} items, more than maxLength facet ({2}) for ''{3}''
cvc-minExclusive-valid = \
-{0} value ({1}) is less than or equal to min exclusive facet ({2}) for ''{3}''
+{0} value ({1}) is less than or equal to minExclusive facet ({2}) for ''{3}''
cvc-minInclusive-valid = \
-{0} value ({1}) is less than or min inclusive facet ({2}) for ''{3}''
+{0} value ({1}) is less than minInclusive facet ({2}) for ''{3}''
cvc-minLength-valid = \
minLength Valid
cvc-minLength-valid.1.1 = \
-{0} length ({0}) is less than min length facet ({1}) for ''{2}''
+{0} length ({0}) is less than minLength facet ({1}) for ''{2}''
cvc-minLength-valid.1.2 = \
-{0} encoded data has only {1} bytes, fewer than min length facet ({2}) for ''{3}''
+{0} encoded data has only {1} bytes, fewer than minLength facet ({2}) for ''{3}''
cvc-minLength-valid.2 = \
-List value ''{0}'' has only {1} items, fewer than min length facet ({2}) for ''{3}''
+List value ''{0}'' has only {1} items, fewer than minLength facet ({2}) for ''{3}''
cvc-model-group = \
Element Sequence Valid
@@ -240,7 +243,7 @@
String Valid
cvc-totalDigits-valid = \
-The total digits ({0}) is greater than total digits facet ({1}) for ''{2}''
+The total digits ({0}) of value ''{1}'' is greater than the totalDigits facet ({2}) for ''{3}''
cvc-type = \
Element Locally Valid (Type)
@@ -539,6 +542,9 @@
cos-valid-default.2.1 = \
The {0} element cannot have a default value ''{1}'' because its type has {2} content only.
+
+cos-valid-default.2.2.2 = \
+The {0} element cannot have a {1} value ''{2}'' because it's content is mixed but not emptiable.
ct-props-correct = \
Complex Type Definition Properties Correct
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org