You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2008/09/10 04:31:07 UTC

svn commit: r693686 - in /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces: impl/dv/ impl/xs/ impl/xs/assertion/ impl/xs/traversers/ xs/

Author: knoaman
Date: Tue Sep  9 19:31:06 2008
New Revision: 693686

URL: http://svn.apache.org/viewvc?rev=693686&view=rev
Log:
Partial implementation of <assert> - recognize assert for simple type declarations. Submitted by Mukul Ghandi

Added:
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/Test.java   (with props)
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertImpl.java   (with props)
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSAssert.java   (with props)
Modified:
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/XSFacets.java
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SchemaSymbols.java
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSConstants.java
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSSimpleTypeDefinition.java

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/XSFacets.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/XSFacets.java?rev=693686&r1=693685&r2=693686&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/XSFacets.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/XSFacets.java Tue Sep  9 19:31:06 2008
@@ -19,9 +19,9 @@
 
 import java.util.Vector;
 
+import org.apache.xerces.impl.xs.util.XSObjectListImpl;
 import org.apache.xerces.xs.XSAnnotation;
 import org.apache.xerces.xs.XSObjectList;
-import org.apache.xerces.impl.xs.util.XSObjectListImpl;
 
 /**
  * The class used to pass all facets to {@link XSSimpleType#applyFacets}.
@@ -29,6 +29,7 @@
  * @xerces.internal 
  *
  * @author Sandy Gao, IBM
+ * @author Mukul Gandhi, IBM, modified to support XML Schema 1.1 'assertions'
  *
  * @version $Id$
  */
@@ -102,7 +103,10 @@
      */
     public String minExclusive;
     
-    
+    /*
+     * Vector containing reference to the assert facets. introduced in XML Schema 1.1
+     */
+    public Vector assertFacets;
    
     public XSAnnotation lengthAnnotation;
     public XSAnnotation minLengthAnnotation;
@@ -117,6 +121,9 @@
     public XSAnnotation minInclusiveAnnotation;
     public XSAnnotation minExclusiveAnnotation;
     
+    // the annotations of the assertions are stored in XSAssertImpl objects
+    // stored in the 'assertFacets' Vector. 
+    
     public void reset(){
         lengthAnnotation = null;
         minLengthAnnotation = null;
@@ -130,5 +137,6 @@
         maxExclusiveAnnotation = null;
         minInclusiveAnnotation = null;
         minExclusiveAnnotation = null;
+        assertFacets = null;
     }
 }

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SchemaSymbols.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SchemaSymbols.java?rev=693686&r1=693685&r2=693686&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SchemaSymbols.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SchemaSymbols.java Tue Sep  9 19:31:06 2008
@@ -50,6 +50,7 @@
 
     // all possible schema element names
     public static final String ELT_ALL                  = "all".intern();
+    public static final String ELT_ASSERT               = "assert".intern();
     public static final String ELT_ALTERNATIVE          = "alternative".intern();
     public static final String ELT_ANNOTATION           = "annotation".intern();
     public static final String ELT_ANY                  = "any".intern();

Added: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/Test.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/Test.java?rev=693686&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/Test.java (added)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/Test.java Tue Sep  9 19:31:06 2008
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.xerces.impl.xs.assertion;
+
+import org.apache.xerces.impl.xpath.XPath20;
+import org.apache.xerces.xs.XSAssert;
+
+/**
+ * XML schema assertion 'test' attribute
+ * 
+ * @author Mukul Gandhi, IBM
+ * @version $Id$
+ */
+public class Test {
+
+    /** The assertion component to which the test belongs */
+    protected final XSAssert fAssert;
+
+    /** XPath 2.0 expression */
+    protected final XPath20 fXPath;
+
+    /** Constructs a test for assertion component */
+    public Test(XPath20 xpath, XSAssert assertion) {
+        fXPath = xpath;
+        fAssert = assertion;
+    }
+
+    public XSAssert getAssertion() {
+        return fAssert;
+    }
+
+    /** Returns the test XPath */
+    public XPath20 getXPath() {
+        return fXPath;
+    }
+
+    public String toString() {
+        return fXPath.toString();
+    }
+}

Propchange: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/Test.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/Test.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertImpl.java?rev=693686&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertImpl.java (added)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertImpl.java Tue Sep  9 19:31:06 2008
@@ -0,0 +1,134 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.xerces.impl.xs.assertion;
+
+import org.apache.xerces.xs.XSAssert;
+import org.apache.xerces.xs.XSConstants;
+import org.apache.xerces.xs.XSNamespaceItem;
+import org.apache.xerces.xs.XSObjectList;
+import org.apache.xerces.xs.XSTypeDefinition;
+
+/**
+ * XML Schema assertion component
+ * 
+ * @author Mukul Gandhi, IBM
+ */
+public class XSAssertImpl implements XSAssert {
+
+    /** The type definition associated with the assertion component */
+    // This could be a simple type, or a complex type
+    protected XSTypeDefinition fTypeDefinition;
+
+    /** The restricted XPath 2.0 expression that represents the test attribute */
+    protected Test fTestExpr = null;
+    
+    /** Optional annotations */
+    protected XSObjectList fAnnotations = null;
+
+    /** Default XPath namespace */
+    protected String fXPathDefaultNamespace = null;
+
+    /** Constructor */
+    public XSAssertImpl(XSTypeDefinition type,
+            XSObjectList annotations) {
+        // An assert component must correspond to a type        
+        fTypeDefinition = type;
+        fAnnotations = annotations;
+    }
+
+    /** Sets the test attribute value */
+    public void setTest(Test expr) {
+        fTestExpr = expr;
+    }
+
+    public void setAnnotations(XSObjectList annotations) {
+        fAnnotations = annotations;
+    }
+
+    public void setXPathDefauleNamespace(String namespace) {
+        fXPathDefaultNamespace = namespace;
+    }
+
+    public String getXPathDefaultNamespace() {
+        return fXPathDefaultNamespace;
+    }
+
+    /** Returns a String representation of this object */
+    public String toString() {
+        String s = super.toString();
+        int index1 = s.lastIndexOf('$');
+        if (index1 != -1) {
+            return s.substring(index1 + 1);
+        }
+        int index2 = s.lastIndexOf('.');
+        if (index2 != -1) {
+            return s.substring(index2 + 1);
+        }
+        return s;
+    }
+
+    public boolean equals(XSAssertImpl assertComponent) {
+        // ToDo
+        return false;
+    }
+
+    /** Get the optional annotations */
+    public XSObjectList getAnnotations() {
+        return fAnnotations;
+    }
+
+    public String getTestStr() {
+        return fTestExpr.toString();
+    }
+
+    public Test getTest() {
+        return fTestExpr;
+    }
+
+    public XSTypeDefinition getTypeDefinition() {
+        return fTypeDefinition;
+    }
+
+    /**
+     * @see org.apache.xerces.xs.XSObject#getName()
+     */
+    public String getName() {
+        return null;
+    }
+
+    /**
+     * @see org.apache.xerces.xs.XSObject#getNamespace()
+     */
+    public String getNamespace() {
+        return null;
+    }
+
+    /**
+     * @see org.apache.xerces.xs.XSObject#getNamespaceItem()
+     */
+    public XSNamespaceItem getNamespaceItem() {
+        return null;
+    }
+
+    /**
+     * Get the type of the object
+     */
+    public short getType() {
+        return XSConstants.ASSERTION;
+    }
+}

Propchange: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertImpl.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java?rev=693686&r1=693685&r2=693686&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java Tue Sep  9 19:31:06 2008
@@ -145,7 +145,7 @@
     // used to store the map from element name to attribute list
     // for 14 global elements
     private static final Hashtable fEleAttrsMapG = new Hashtable(29);
-    // for 39 local elememnts
+    // for 39 local elements
     private static final Hashtable fEleAttrsMapL = new Hashtable(79);
 
     // used to initialize fEleAttrsMap
@@ -942,6 +942,16 @@
         attrList.put(SchemaSymbols.ATT_XPATH_DEFAULT_NS, allAttrs[ATT_DEFAULT_XPATH_NS_N]);
         // TODO: use 1.1 map
         fEleAttrsMapL.put(SchemaSymbols.ELT_ALTERNATIVE, attrList);
+        
+        // for element "assert" - local // mukul
+        attrList = Container.getContainer(3);
+        // id = ID
+        attrList.put(SchemaSymbols.ATT_ID, allAttrs[ATT_ID_N]);
+        // test = an XPath expression
+        attrList.put(SchemaSymbols.ATT_TEST, allAttrs[ATT_TEST_XPATH_R]);
+        // xpathDefaultNamespace = (anyURI | (##defaultNamespace | ##targetNamespace | ##local))
+        attrList.put(SchemaSymbols.ATT_XPATH_DEFAULT_NS, allAttrs[ATT_DEFAULT_XPATH_NS_N]);
+        fEleAttrsMapL.put(SchemaSymbols.ELT_ASSERT, attrList);
     }
 
     // used to resolver namespace prefixes

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java?rev=693686&r1=693685&r2=693686&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java Tue Sep  9 19:31:06 2008
@@ -23,6 +23,8 @@
 import org.apache.xerces.impl.dv.XSFacets;
 import org.apache.xerces.impl.dv.XSSimpleType;
 import org.apache.xerces.impl.validation.ValidationState;
+import org.apache.xerces.impl.xpath.XPath20;
+import org.apache.xerces.impl.xpath.XPathException;
 import org.apache.xerces.impl.xs.SchemaGrammar;
 import org.apache.xerces.impl.xs.SchemaSymbols;
 import org.apache.xerces.impl.xs.XSAnnotationImpl;
@@ -32,6 +34,8 @@
 import org.apache.xerces.impl.xs.XSElementDecl;
 import org.apache.xerces.impl.xs.XSParticleDecl;
 import org.apache.xerces.impl.xs.XSWildcardDecl;
+import org.apache.xerces.impl.xs.assertion.Test;
+import org.apache.xerces.impl.xs.assertion.XSAssertImpl;
 import org.apache.xerces.impl.xs.util.XInt;
 import org.apache.xerces.impl.xs.util.XSObjectListImpl;
 import org.apache.xerces.util.DOMUtil;
@@ -52,6 +56,7 @@
  * @author Elena Litani, IBM
  * @author Rahul Srivastava, Sun Microsystems Inc.
  * @author Neeraj Bajaj, Sun Microsystems Inc.
+ * @author Mukul Gandhi, IBM, modified to support XML Schema 1.1 'assertions'
  *
  * @version $Id$
  */
@@ -278,6 +283,7 @@
         String facet;
         boolean hasQName = containsQName(baseValidator);
         Vector enumData = null;
+        Vector assertData = null;
         XSObjectListImpl enumAnnotations = null;
         XSObjectListImpl patternAnnotations = null;
         Vector enumNSDecls = hasQName ? new Vector() : null;       
@@ -369,7 +375,75 @@
                     reportSchemaError("s4s-elt-must-match.1", new Object[]{"pattern", "(annotation?)", DOMUtil.getLocalName(child)}, child);
                 }
             }
-            else {
+            // process 'assert' facet. introduced in XML Schema 1.1
+            else if (facet.equals(SchemaSymbols.ELT_ASSERT)) {                
+                attrs = fAttrChecker.checkAttributes(content, false, schemaDoc);
+                String test = (String) attrs[XSAttributeChecker.ATTIDX_XPATH];
+                String defaultNamespace = (String) attrs[XSAttributeChecker.ATTIDX_XPATHDEFAULTNS];
+
+                if (test != null) {                    
+                    // get 'annotation'
+                    Element childNode = DOMUtil.getFirstChildElement(content);
+                    XSAnnotationImpl annotation = null;
+                    // first child could be an annotation
+                    if (childNode != null
+                            && DOMUtil.getLocalName(childNode).equals(
+                                    SchemaSymbols.ELT_ANNOTATION)) {
+                        annotation = traverseAnnotationDecl(childNode, attrs,
+                                false, schemaDoc);
+                        // now move on to the next child element
+                        childNode = DOMUtil.getNextSiblingElement(childNode);
+                        
+                        if (childNode != null) {
+                         // it's an error to have something after the annotation, in 'assert'
+                         reportSchemaError("xxx-define this",
+                               new Object[] { DOMUtil.getLocalName(childNode) },
+                                              childNode);    
+                        }
+                    } else {
+                        String text = DOMUtil.getSyntheticAnnotation(childNode);
+                        if (text != null) {
+                            annotation = traverseSyntheticAnnotation(childNode,
+                                    text, attrs, false, schemaDoc);
+                        }                        
+                    }
+                    
+                    XSObjectList annotations = null;
+                    if (annotation != null) {
+                        annotations = new XSObjectListImpl();
+                        ((XSObjectListImpl)annotations).add(annotation);
+                    }
+                    else {
+                        //if no annotations are present add an empty list to the assertion
+                        annotations = XSObjectListImpl.EMPTY_LIST;
+                    }
+                    
+                    XSAssertImpl assertImpl = new XSAssertImpl(baseValidator, annotations);
+                    Test testExpr = null;
+                    //set the test attribute value
+                    try {
+                        testExpr = new Test(new XPath20(test, fSymbolTable, 
+                                       schemaDoc.fNamespaceSupport), assertImpl);
+                    }
+                    catch (XPathException e) {
+                        //if the xpath is invalid create a Test without an expression
+                        reportSchemaError(e.getKey(), new Object[] { test }, content);
+                        testExpr = new Test(null, assertImpl);
+                    }
+                    
+                    assertImpl.setTest(testExpr);
+                    assertImpl.setXPathDefauleNamespace(defaultNamespace);
+                    if (assertData == null) {
+                        assertData = new Vector();
+                    }
+                    assertData.addElement(assertImpl);
+                } else {
+                    // 'test' attribute is mandatory in assert element
+                    reportSchemaError("src-assert.3.13.1",
+                            new Object[] { DOMUtil.getLocalName(content) },
+                            content);
+                }
+            } else {
                 if (facet.equals(SchemaSymbols.ELT_MINLENGTH)) {
                     currentFacet = XSSimpleType.FACET_MINLENGTH;
                 }
@@ -513,6 +587,10 @@
             xsFacets.pattern = fPattern.toString();
             xsFacets.patternAnnotations = patternAnnotations;
         }
+        if (assertData != null) {
+           facetsPresent |= XSSimpleType.FACET_ASSERT;
+           xsFacets.assertFacets = assertData;
+        }
         
         fPattern.setLength(0);
         

Added: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSAssert.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSAssert.java?rev=693686&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSAssert.java (added)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSAssert.java Tue Sep  9 19:31:06 2008
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.xerces.xs;
+
+/**
+ * This interface represents the XML Schema assertion component. Assertion
+ * components were first introduced in the XML schema structures 1.1
+ * specification, as a means of constraining the existence and values of 
+ * related elements and attributes.
+ * 
+ * @author Mukul Gandhi, IBM
+ * @version $Id$
+ */
+public interface XSAssert extends XSObject {
+
+    /**
+     * A sequence of [annotations] or an empty <code>XSObjectList</code>.
+     */
+    public XSObjectList getAnnotations();
+
+    /**
+     * [test]: a restricted XPath 2.0 expression.
+     */
+    public String getTestStr();
+
+    /**
+     * [type definition]: a valid type definition component
+     */
+    public XSTypeDefinition getTypeDefinition();
+}

Propchange: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSAssert.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSAssert.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSConstants.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSConstants.java?rev=693686&r1=693685&r2=693686&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSConstants.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSConstants.java Tue Sep  9 19:31:06 2008
@@ -84,6 +84,11 @@
      * The object describes a XML schema type alternative
      */
     public static final short TYPE_ALTERNATIVE          = 15;
+    
+    /**
+     * The object describes a XML Schema assertion
+     */
+    public static final short ASSERTION                 = 16;
 
     // Derivation constants
     /**

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSSimpleTypeDefinition.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSSimpleTypeDefinition.java?rev=693686&r1=693685&r2=693686&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSSimpleTypeDefinition.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSSimpleTypeDefinition.java Tue Sep  9 19:31:06 2008
@@ -97,6 +97,8 @@
      * 4.3.5 enumeration.
      */
     public static final short FACET_ENUMERATION         = 2048;
+    
+    public static final short FACET_ASSERT              = 4096;
 
     /**
      * A constant defined for the 'ordered' fundamental facet: not ordered.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org