You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by sa...@apache.org on 2010/10/18 18:27:31 UTC

svn commit: r1023888 - in /xerces/java/branches/xml-schema-1.1-dev/tests/scd: BaseTest.java HasDefaultNamespace.java HasTargetNamespace.java NoTargetNamespace.java dd.xsd po1.xsd po2.xsd

Author: sandygao
Date: Mon Oct 18 16:27:31 2010
New Revision: 1023888

URL: http://svn.apache.org/viewvc?rev=1023888&view=rev
Log:
Setting SVN properties for new files.

Modified:
    xerces/java/branches/xml-schema-1.1-dev/tests/scd/BaseTest.java   (contents, props changed)
    xerces/java/branches/xml-schema-1.1-dev/tests/scd/HasDefaultNamespace.java   (contents, props changed)
    xerces/java/branches/xml-schema-1.1-dev/tests/scd/HasTargetNamespace.java   (contents, props changed)
    xerces/java/branches/xml-schema-1.1-dev/tests/scd/NoTargetNamespace.java   (contents, props changed)
    xerces/java/branches/xml-schema-1.1-dev/tests/scd/dd.xsd   (props changed)
    xerces/java/branches/xml-schema-1.1-dev/tests/scd/po1.xsd   (contents, props changed)
    xerces/java/branches/xml-schema-1.1-dev/tests/scd/po2.xsd   (props changed)

Modified: xerces/java/branches/xml-schema-1.1-dev/tests/scd/BaseTest.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/scd/BaseTest.java?rev=1023888&r1=1023887&r2=1023888&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/scd/BaseTest.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/scd/BaseTest.java Mon Oct 18 16:27:31 2010
@@ -35,7 +35,7 @@ import org.w3c.dom.bootstrap.DOMImplemen
 
 
 /**
- * @version $Id: $
+ * @version $Id$
  */
 public class BaseTest implements DOMErrorHandler {
     private SCDResolver resolver;

Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/scd/BaseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/scd/BaseTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: xerces/java/branches/xml-schema-1.1-dev/tests/scd/HasDefaultNamespace.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/scd/HasDefaultNamespace.java?rev=1023888&r1=1023887&r2=1023888&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/scd/HasDefaultNamespace.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/scd/HasDefaultNamespace.java Mon Oct 18 16:27:31 2010
@@ -20,7 +20,7 @@ package scd;
 /**
  * Tests for the SCD API that designate components of a schema that
  * has a default namespace.
- * @version $Id: $
+ * @version $Id$
  * @author Ishan Jayawardena udeshike@gmail.com
  */
 public class HasDefaultNamespace extends BaseTest {

Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/scd/HasDefaultNamespace.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/scd/HasDefaultNamespace.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: xerces/java/branches/xml-schema-1.1-dev/tests/scd/HasTargetNamespace.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/scd/HasTargetNamespace.java?rev=1023888&r1=1023887&r2=1023888&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/scd/HasTargetNamespace.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/scd/HasTargetNamespace.java Mon Oct 18 16:27:31 2010
@@ -25,7 +25,7 @@ import org.apache.xerces.xs.XSObject;
  * Tests for the SCD API that designate components of a schema that
  * has a target namespace. 
  * @author Ishan Jayawardena udeshike@gmail.com
- * @version $Id: $
+ * @version $Id$
  */
 public class HasTargetNamespace extends BaseTest {
 

Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/scd/HasTargetNamespace.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/scd/HasTargetNamespace.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: xerces/java/branches/xml-schema-1.1-dev/tests/scd/NoTargetNamespace.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/scd/NoTargetNamespace.java?rev=1023888&r1=1023887&r2=1023888&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/scd/NoTargetNamespace.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/scd/NoTargetNamespace.java Mon Oct 18 16:27:31 2010
@@ -1,129 +1,129 @@
-/*
- * 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 scd;
-
-import org.apache.xerces.util.NamespaceSupport;
-import org.apache.xerces.xni.NamespaceContext;
-import org.apache.xerces.xs.XSObject;
-
-import junit.framework.TestCase;
-
-/**
- * @author Ishan Jayawardena udeshike@gmail.com
- * @version $Id: $
- */
-public class NoTargetNamespace extends TestCase {
-
-    private BaseTest fNoTargetNamespace = new BaseTest("tests/scd/po1.xsd");
-
-    public NoTargetNamespace(String name) {
-        super(name);
-    }
-
-    /* (non-Javadoc)
-     * @see junit.framework.TestCase#setUp()
-     */
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    /* (non-Javadoc)
-     * @see junit.framework.TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    /**
-     * Test method for {@link org.apache.xerces.impl.scd.SCDResolver#resolve(java.lang.String)}.
-     */
-    public void testResolveString() {
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::PurchaseOrderType)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::PurchaseOrderType/model::sequence/schemaElement::shipTo)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::PurchaseOrderType/attributeUse::*)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::PurchaseOrderType/model::sequence/schemaElement::billTo)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/schemaElement::comment)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::PurchaseOrderType/model::sequence/schemaElement::items)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::PurchaseOrderType/schemaAttribute::orderDate)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::USAddress)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::USAddress/model::sequence/schemaElement::name)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::USAddress/model::sequence/schemaElement::street)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::USAddress/model::sequence/schemaElement::city)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::USAddress/model::sequence/schemaElement::state)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::USAddress/model::sequence/schemaElement::zip)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::USAddress/schemaAttribute::country)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::Items)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(//quantity)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::Items/model::sequence/schemaElement::item/type::0)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::Items/model::sequence/schemaElement::item/type::0/model::sequence/schemaElement::productName)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::Items/model::sequence/schemaElement::item/type::0/model::sequence/schemaElement::quantity/type::0/facet::maxExclusive)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::Items/model::sequence/schemaElement::item/type::0/component::partNum)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::SKU)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::SKU/facet::pattern)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/annotation::*)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::Items/model::sequence/schemaElement::item/type::0/model::sequence/schemaElement::*[3])").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::Items/component::comment)").isEmpty());
-        /// abbreviated SCDs
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/~PurchaseOrderType)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/~PurchaseOrderType/shipTo)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/comment)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/~PurchaseOrderType/items)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/~Items/item/~0)").isEmpty());
-        // next two do not work
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/~Items/item/productName)").isEmpty());
-        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/~Items/item/quantity/~0)").isEmpty());
-    }
-
-    /**
-     * Test method for {@link org.apache.xerces.impl.scd.SCDResolver#resolve(java.lang.String, org.apache.xerces.xni.NamespaceContext)}.
-     */
-    public void testResolveStringNamespaceContext() {
-        // define a namespace context
-        NamespaceContext nsContext = new NamespaceSupport();
-        nsContext.declarePrefix(null, null);
-        // get a schema component
-        XSObject currentComponent = fNoTargetNamespace.testResolveString("xscd(/type::Items)").item(0);
-        // evaluate
-        assertEquals(false, fNoTargetNamespace.testResolveStringNamespaceContextXSObject(
-                "./model::sequence/schemaElement::item/type::0//schemaAttribute::partNum",
-                nsContext,
-                currentComponent).isEmpty());
-    }
-
-    /**
-     * Test method for {@link org.apache.xerces.impl.scd.SCDResolver#resolve(java.lang.String, org.apache.xerces.xni.NamespaceContext, org.apache.xerces.xs.XSObject)}.
-     */
-    public void testResolveStringNamespaceContextXSObject() {
-        XSObject currentComponent = fNoTargetNamespace.testResolveString("xscd(/type::Items)").item(0);
-        assertEquals(false, fNoTargetNamespace.testResolveStringXSObject(
-                "xscd(./model::sequence/schemaElement::item/type::0//schemaAttribute::partNum)",
-                currentComponent).isEmpty());
-    }
-
-    /**
-     * Test method for {@link org.apache.xerces.impl.scd.SCDResolver#resolve(java.lang.String, org.apache.xerces.xs.XSObject)}.
-     */
-    public void testResolveStringXSObject() {
-        NamespaceContext nsContext = new NamespaceSupport();
-        nsContext.declarePrefix(null, null);
-        assertEquals(false, fNoTargetNamespace.testResolveStringNamespaceContext(
-                "/type::Items/model::sequence/schemaElement::item/type::0//schemaAttribute::partNum",
-                nsContext).isEmpty());
-    }
-
-}
+/*
+ * 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 scd;
+
+import org.apache.xerces.util.NamespaceSupport;
+import org.apache.xerces.xni.NamespaceContext;
+import org.apache.xerces.xs.XSObject;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Ishan Jayawardena udeshike@gmail.com
+ * @version $Id$
+ */
+public class NoTargetNamespace extends TestCase {
+
+    private BaseTest fNoTargetNamespace = new BaseTest("tests/scd/po1.xsd");
+
+    public NoTargetNamespace(String name) {
+        super(name);
+    }
+
+    /* (non-Javadoc)
+     * @see junit.framework.TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    /* (non-Javadoc)
+     * @see junit.framework.TestCase#tearDown()
+     */
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Test method for {@link org.apache.xerces.impl.scd.SCDResolver#resolve(java.lang.String)}.
+     */
+    public void testResolveString() {
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::PurchaseOrderType)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::PurchaseOrderType/model::sequence/schemaElement::shipTo)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::PurchaseOrderType/attributeUse::*)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::PurchaseOrderType/model::sequence/schemaElement::billTo)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/schemaElement::comment)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::PurchaseOrderType/model::sequence/schemaElement::items)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::PurchaseOrderType/schemaAttribute::orderDate)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::USAddress)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::USAddress/model::sequence/schemaElement::name)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::USAddress/model::sequence/schemaElement::street)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::USAddress/model::sequence/schemaElement::city)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::USAddress/model::sequence/schemaElement::state)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::USAddress/model::sequence/schemaElement::zip)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::USAddress/schemaAttribute::country)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::Items)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(//quantity)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::Items/model::sequence/schemaElement::item/type::0)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::Items/model::sequence/schemaElement::item/type::0/model::sequence/schemaElement::productName)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::Items/model::sequence/schemaElement::item/type::0/model::sequence/schemaElement::quantity/type::0/facet::maxExclusive)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::Items/model::sequence/schemaElement::item/type::0/component::partNum)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::SKU)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::SKU/facet::pattern)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/annotation::*)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::Items/model::sequence/schemaElement::item/type::0/model::sequence/schemaElement::*[3])").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/type::Items/component::comment)").isEmpty());
+        /// abbreviated SCDs
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/~PurchaseOrderType)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/~PurchaseOrderType/shipTo)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/comment)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/~PurchaseOrderType/items)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/~Items/item/~0)").isEmpty());
+        // next two do not work
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/~Items/item/productName)").isEmpty());
+        assertEquals(false, fNoTargetNamespace.testResolveString("xscd(/~Items/item/quantity/~0)").isEmpty());
+    }
+
+    /**
+     * Test method for {@link org.apache.xerces.impl.scd.SCDResolver#resolve(java.lang.String, org.apache.xerces.xni.NamespaceContext)}.
+     */
+    public void testResolveStringNamespaceContext() {
+        // define a namespace context
+        NamespaceContext nsContext = new NamespaceSupport();
+        nsContext.declarePrefix(null, null);
+        // get a schema component
+        XSObject currentComponent = fNoTargetNamespace.testResolveString("xscd(/type::Items)").item(0);
+        // evaluate
+        assertEquals(false, fNoTargetNamespace.testResolveStringNamespaceContextXSObject(
+                "./model::sequence/schemaElement::item/type::0//schemaAttribute::partNum",
+                nsContext,
+                currentComponent).isEmpty());
+    }
+
+    /**
+     * Test method for {@link org.apache.xerces.impl.scd.SCDResolver#resolve(java.lang.String, org.apache.xerces.xni.NamespaceContext, org.apache.xerces.xs.XSObject)}.
+     */
+    public void testResolveStringNamespaceContextXSObject() {
+        XSObject currentComponent = fNoTargetNamespace.testResolveString("xscd(/type::Items)").item(0);
+        assertEquals(false, fNoTargetNamespace.testResolveStringXSObject(
+                "xscd(./model::sequence/schemaElement::item/type::0//schemaAttribute::partNum)",
+                currentComponent).isEmpty());
+    }
+
+    /**
+     * Test method for {@link org.apache.xerces.impl.scd.SCDResolver#resolve(java.lang.String, org.apache.xerces.xs.XSObject)}.
+     */
+    public void testResolveStringXSObject() {
+        NamespaceContext nsContext = new NamespaceSupport();
+        nsContext.declarePrefix(null, null);
+        assertEquals(false, fNoTargetNamespace.testResolveStringNamespaceContext(
+                "/type::Items/model::sequence/schemaElement::item/type::0//schemaAttribute::partNum",
+                nsContext).isEmpty());
+    }
+
+}

Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/scd/NoTargetNamespace.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/scd/NoTargetNamespace.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/scd/dd.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/scd/dd.xsd
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: xerces/java/branches/xml-schema-1.1-dev/tests/scd/po1.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/scd/po1.xsd?rev=1023888&r1=1023887&r2=1023888&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/scd/po1.xsd (original)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/scd/po1.xsd Mon Oct 18 16:27:31 2010
@@ -1,56 +1,56 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <xsd:annotation>
-        <xsd:documentation xml:lang="en"> Purchase order schema for Example.com.
-            Copyright 2000 Example.com. All rights reserved.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:element name="purchaseOrder" type="PurchaseOrderType" />
-    <xsd:element name="comment" type="xsd:string" />
-    <xsd:complexType name="PurchaseOrderType">
-        <xsd:sequence>
-            <xsd:element name="shipTo" type="USAddress" />
-            <xsd:element name="billTo" type="USAddress" />
-            <xsd:element ref="comment" minOccurs="0" />
-            <xsd:element name="items" type="Items" />
-        </xsd:sequence>
-        <xsd:attribute name="orderDate" type="xsd:date" />
-    </xsd:complexType>
-    <xsd:complexType name="USAddress">
-        <xsd:sequence>
-            <xsd:element name="name" type="xsd:string" />
-            <xsd:element name="street" type="xsd:string" />
-            <xsd:element name="city" type="xsd:string" />
-            <xsd:element name="state" type="xsd:string" />
-            <xsd:element name="zip" type="xsd:decimal" />
-        </xsd:sequence>
-        <xsd:attribute name="country" type="xsd:NMTOKEN" fixed="US" />
-    </xsd:complexType>
-    <xsd:complexType name="Items">
-        <xsd:sequence>
-            <xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="productName" type="xsd:string" />
-                        <xsd:element name="quantity">
-                            <xsd:simpleType>
-                                <xsd:restriction base="xsd:positiveInteger">
-                                    <xsd:maxExclusive value="100" />
-                                </xsd:restriction>
-                            </xsd:simpleType>
-                        </xsd:element>
-                        <xsd:element name="USPrice" type="xsd:decimal" />
-                        <xsd:element ref="comment" minOccurs="0" />
-                        <xsd:element name="shipDate" type="xsd:date" minOccurs="0" />
-                    </xsd:sequence>
-                    <xsd:attribute name="partNum" type="SKU" use="required" />
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <!-- Stock Keeping Unit, a code for identifying products -->
-    <xsd:simpleType name="SKU">
-        <xsd:restriction base="xsd:string">
-            <xsd:pattern value="\d{3}-[A-Z]{2}" />
-        </xsd:restriction>
-    </xsd:simpleType>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <xsd:annotation>
+        <xsd:documentation xml:lang="en"> Purchase order schema for Example.com.
+            Copyright 2000 Example.com. All rights reserved.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:element name="purchaseOrder" type="PurchaseOrderType" />
+    <xsd:element name="comment" type="xsd:string" />
+    <xsd:complexType name="PurchaseOrderType">
+        <xsd:sequence>
+            <xsd:element name="shipTo" type="USAddress" />
+            <xsd:element name="billTo" type="USAddress" />
+            <xsd:element ref="comment" minOccurs="0" />
+            <xsd:element name="items" type="Items" />
+        </xsd:sequence>
+        <xsd:attribute name="orderDate" type="xsd:date" />
+    </xsd:complexType>
+    <xsd:complexType name="USAddress">
+        <xsd:sequence>
+            <xsd:element name="name" type="xsd:string" />
+            <xsd:element name="street" type="xsd:string" />
+            <xsd:element name="city" type="xsd:string" />
+            <xsd:element name="state" type="xsd:string" />
+            <xsd:element name="zip" type="xsd:decimal" />
+        </xsd:sequence>
+        <xsd:attribute name="country" type="xsd:NMTOKEN" fixed="US" />
+    </xsd:complexType>
+    <xsd:complexType name="Items">
+        <xsd:sequence>
+            <xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="productName" type="xsd:string" />
+                        <xsd:element name="quantity">
+                            <xsd:simpleType>
+                                <xsd:restriction base="xsd:positiveInteger">
+                                    <xsd:maxExclusive value="100" />
+                                </xsd:restriction>
+                            </xsd:simpleType>
+                        </xsd:element>
+                        <xsd:element name="USPrice" type="xsd:decimal" />
+                        <xsd:element ref="comment" minOccurs="0" />
+                        <xsd:element name="shipDate" type="xsd:date" minOccurs="0" />
+                    </xsd:sequence>
+                    <xsd:attribute name="partNum" type="SKU" use="required" />
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <!-- Stock Keeping Unit, a code for identifying products -->
+    <xsd:simpleType name="SKU">
+        <xsd:restriction base="xsd:string">
+            <xsd:pattern value="\d{3}-[A-Z]{2}" />
+        </xsd:restriction>
+    </xsd:simpleType>
 </xsd:schema>
\ No newline at end of file

Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/scd/po1.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/scd/po1.xsd
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/scd/po2.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/scd/po2.xsd
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



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