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 2010/11/10 20:24:55 UTC
svn commit: r1033656 - in
/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override: ./
scenario_1/ scenario_2/ scenario_3/ scenario_4/ scenario_5/
Author: knoaman
Date: Wed Nov 10 19:24:54 2010
New Revision: 1033656
URL: http://svn.apache.org/viewvc?rev=1033656&view=rev
Log:
Testing for <xs:override> by Udayanga Wickramasinghe (with some minor changes).
Jira bug: https://issues.apache.org/jira/browse/XERCESJ-1433
Added:
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/BaseOverrideTest.java (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideHandlerTest.java (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideIntegrationTest.java (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideTestSuite.java (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideTrasformTest.java (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/XSDHandlerDelegate.java (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden1.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden2.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding-copy.xsd
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding1.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding2.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result1.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result2.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/A.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/B.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/C.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/A.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/B.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/C.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/A.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/B.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/C.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/A.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/B.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/C.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/A.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/B.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/C.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA_1.xsd (with props)
xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA_2.xsd (with props)
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/BaseOverrideTest.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/BaseOverrideTest.java?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/BaseOverrideTest.java (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/BaseOverrideTest.java Wed Nov 10 19:24:54 2010
@@ -0,0 +1,76 @@
+/*
+ * 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 schema.override;
+
+import java.io.File;
+import java.net.URI;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.xerces.util.DOMUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+import schema.annotations.TestCase;
+
+/**
+ * @version $Id$
+ */
+public class BaseOverrideTest extends TestCase {
+
+ public BaseOverrideTest() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public BaseOverrideTest(String test) {
+ super(test);
+ // TODO Auto-generated constructor stub
+ }
+
+ public static Document parseXmlDom(String name) {
+ Document document = null;
+ try {
+
+ // getting the default implementation of DOM builder
+ DocumentBuilderFactory factory
+ = DocumentBuilderFactory.newInstance();
+ DocumentBuilder builder = factory.newDocumentBuilder();
+
+ // parsing the XML file
+ document = builder.parse(new File(new URI(name)));
+
+ } catch (Exception e) {
+ // catching all exceptions
+ System.out.println();
+ System.out.println(e.toString());
+ }
+ return document;
+ }
+
+ protected String getLocalName(Node node){
+ String localName = "";
+ localName = DOMUtil.getLocalName(node);
+ if(localName.indexOf(":") > -1){
+ return localName.split(":")[1];
+ }
+
+ return localName;
+ }
+
+}
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/BaseOverrideTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/BaseOverrideTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideHandlerTest.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideHandlerTest.java?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideHandlerTest.java (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideHandlerTest.java Wed Nov 10 19:24:54 2010
@@ -0,0 +1,393 @@
+/*
+ * 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 schema.override;
+
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedList;
+
+import org.apache.xerces.impl.Constants;
+import org.apache.xerces.impl.XMLErrorReporter;
+import org.apache.xerces.impl.xs.SchemaSymbols;
+import org.apache.xerces.impl.xs.XSConstraints;
+import org.apache.xerces.impl.xs.XSMessageFormatter;
+import org.apache.xerces.impl.xs.traversers.XSDHandler;
+import org.apache.xerces.impl.xs.traversers.override.DOMOverrideImpl;
+import org.apache.xerces.impl.xs.traversers.override.OverrideTransformationManager;
+import org.apache.xerces.util.DOMUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * @version $Id$
+ */
+public class OverrideHandlerTest extends BaseOverrideTest {
+
+ Hashtable fId2DocMap ;
+ OverrideTransformationManager fOverrideHandler;
+ LinkedList fDependencyList ;
+ String fDirectedGraph;
+
+ public static void main(String args[]) {
+ junit.textui.TestRunner.run(OverrideHandlerTest.class);
+ }
+
+ public OverrideHandlerTest(){
+ fId2DocMap = createId2DocMapScenario_1();
+
+ }
+
+ protected void setUp(){
+ fDependencyList = new LinkedList();
+ fDirectedGraph = "";
+ XSHandlerDelegate schemaHandler = new XSHandlerDelegate(Constants.SCHEMA_VERSION_1_1, null);
+ fOverrideHandler = new OverrideTransformationManager(schemaHandler, new DOMOverrideImpl(schemaHandler));
+ }
+
+
+ public void testHasGlobalDecerations(){
+ String[] testSchemas = {"schemaA.xsd","schemaA_1.xsd"};
+ OverrideTransformationManager overrideHandler = new OverrideTransformationManager(null, null);
+
+ Document dom1 = parseXmlDom(getResourceURL(testSchemas[0]));
+ assertFalse(overrideHandler.hasGlobalDecl(dom1.getDocumentElement()));
+
+ dom1 = parseXmlDom(getResourceURL(testSchemas[1]));
+ assertTrue(overrideHandler.hasGlobalDecl(dom1.getDocumentElement()));
+
+ }
+
+ public void testHasCompositionalDecerations(){
+ String[] testSchemas = {"schemaA.xsd","schemaA_1.xsd","schemaA_2.xsd"};
+ OverrideTransformationManager overrideHandler = new OverrideTransformationManager(null, null);
+
+ Document dom1 = parseXmlDom(getResourceURL(testSchemas[0]));
+ assertTrue(overrideHandler.hasCompositionalDecl(dom1.getDocumentElement()));
+
+ dom1 = parseXmlDom(getResourceURL(testSchemas[1]));
+ assertTrue(overrideHandler.hasCompositionalDecl(dom1.getDocumentElement()));
+
+ dom1 = parseXmlDom(getResourceURL(testSchemas[2]));
+ assertFalse(overrideHandler.hasCompositionalDecl(dom1.getDocumentElement()));
+
+ }
+
+ public void testDependencyNoSchemaRepeats(){
+ TestNode root = createDependancyMap1();
+ String id = "A.xsd";
+ Element domSchemaRoot = (Element) fId2DocMap.get(id);
+ fDirectedGraph = id;
+ fOverrideHandler.checkSchemaRoot(id, null,domSchemaRoot);
+ performDependencyChecking(root,domSchemaRoot);
+ System.out.println(fDirectedGraph);
+
+ }
+
+ public void testDependencySchemaRepeats(){
+ fId2DocMap = createId2DocMapScenario_2();
+ TestNode root = createDependancyMap2();
+ String id = "A.xsd";
+ Element domSchemaRoot = (Element) fId2DocMap.get(id);
+ fDirectedGraph = id;
+ fOverrideHandler.checkSchemaRoot(id, null,domSchemaRoot);
+ performDependencyChecking(root,domSchemaRoot);
+ System.out.println(fDirectedGraph);
+
+ }
+
+ public void testDependencySchemaRepeats_Collision(){
+ fId2DocMap = createId2DocMapScenario_3();
+ TestNode root = createDependancyMap3();
+ String id = "A.xsd";
+ Element domSchemaRoot = (Element) fId2DocMap.get(id);
+ fDirectedGraph = id;
+ fOverrideHandler.checkSchemaRoot(id, null,domSchemaRoot);
+ performDependencyChecking(root,domSchemaRoot);
+ System.out.println(fDirectedGraph);
+
+ }
+
+ public void testDependencySchemaRepeats_Cycles(){
+ fId2DocMap = createId2DocMapScenario_4();
+ TestNode root = createDependancyMap4();
+ String id = "A.xsd";
+ Element domSchemaRoot = (Element) fId2DocMap.get(id);
+ fDirectedGraph = id;
+ fOverrideHandler.checkSchemaRoot(id, null,domSchemaRoot);
+ performDependencyChecking(root,domSchemaRoot);
+ System.out.println(fDirectedGraph);
+
+ }
+
+ public void testDependencySchemaRepeats_Collision_2(){
+ fId2DocMap = createId2DocMapScenario_5();
+ TestNode root = createDependancyMap5();
+ String id = "A.xsd";
+ Element domSchemaRoot = (Element) fId2DocMap.get(id);
+ fDirectedGraph = id;
+ fOverrideHandler.checkSchemaRoot(id, null,domSchemaRoot);
+ performDependencyChecking(root,domSchemaRoot);
+ System.out.println(fDirectedGraph);
+
+ }
+ //"A inc B inc C";
+ public TestNode createDependancyMap1(){
+ TestNode parent = new TestNode();
+ parent.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+
+ TestNode child = new TestNode();
+ child.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+ parent.addChildNode(child);
+
+ TestNode desc = new TestNode();
+ desc.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+ child.addChildNode(desc);
+
+ fillDependencyList(parent);
+ return parent;
+ }
+
+ public TestNode createDependancyMap2(){
+ TestNode parent = new TestNode();
+ parent.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+
+ TestNode child = new TestNode();
+ child.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+ parent.addChildNode(child);
+
+ TestNode desc = new TestNode();
+ desc.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+ child.addChildNode(desc);
+
+ TestNode desc2 = new TestNode();
+ desc2.expectedState = OverrideTransformationManager.STATE_DUPLICATE;
+ desc.addChildNode(desc2);
+
+ fillDependencyList(parent);
+ return parent;
+ }
+
+ public TestNode createDependancyMap3(){
+ TestNode parent = new TestNode();
+ parent.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+
+ TestNode child = new TestNode();
+ child.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+ parent.addChildNode(child);
+
+ TestNode desc = new TestNode();
+ desc.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+ child.addChildNode(desc);
+
+ TestNode desc2 = new TestNode();
+ desc2.expectedState = OverrideTransformationManager.STATE_COLLISION;
+ desc.addChildNode(desc2);
+
+ fillDependencyList(parent);
+ return parent;
+ }
+
+ public TestNode createDependancyMap4(){
+ //A
+ TestNode parent = new TestNode();
+ parent.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+ //-->B
+ TestNode child = new TestNode();
+ child.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+ parent.addChildNode(child);
+ //-->C
+ TestNode desc = new TestNode();
+ desc.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+ child.addChildNode(desc);
+ //-->A'
+ TestNode desc2 = new TestNode();
+ desc2.expectedState = OverrideTransformationManager.STATE_CONTINUE;
+ desc.addChildNode(desc2);
+ //-->B'
+ TestNode desc3 = new TestNode();
+ desc3.expectedState = OverrideTransformationManager.STATE_CONTINUE;
+ desc2.addChildNode(desc3);
+ //-->C'
+ TestNode desc4 = new TestNode();
+ desc4.expectedState = OverrideTransformationManager.STATE_DUPLICATE;
+ desc3.addChildNode(desc4);
+
+ fillDependencyList(parent);
+ return parent;
+ }
+
+ public TestNode createDependancyMap5(){
+ //A
+ TestNode parent = new TestNode();
+ parent.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+ //-->B
+ TestNode child = new TestNode();
+ child.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+ parent.addChildNode(child);
+ //-->C
+ TestNode desc = new TestNode();
+ desc.expectedState = OverrideTransformationManager.STATE_INCLUDE;
+ child.addChildNode(desc);
+ //-->A'
+ TestNode desc2 = new TestNode();
+ desc2.expectedState = OverrideTransformationManager.STATE_CONTINUE;
+ desc.addChildNode(desc2);
+ //-->B'
+ TestNode desc3 = new TestNode();
+ desc3.expectedState = OverrideTransformationManager.STATE_COLLISION;
+ desc2.addChildNode(desc3);
+
+
+ fillDependencyList(parent);
+ return parent;
+ }
+
+ private void fillDependencyList(TestNode parent){
+ if(parent!=null){
+ fDependencyList.add(parent);
+ Iterator children = parent.getChildren();
+
+ while(children.hasNext()){
+ fillDependencyList((TestNode)children.next());
+ }
+ }
+ }
+
+ public void print(int state){
+ if(state == OverrideTransformationManager.STATE_DUPLICATE){
+ System.out.println("CYCLE");
+ }
+ else if(state == OverrideTransformationManager.STATE_CONTINUE){
+ System.out.println("CONTINUE");
+ }
+ else if(state == OverrideTransformationManager.STATE_COLLISION){
+ System.out.println("COLLISION");
+ }
+ else{
+ System.out.println("INCLUDE");
+ }
+ }
+
+ public void performDependencyChecking(TestNode tNode,Element root){
+ assertEquals(tNode.expectedState, fOverrideHandler.getCurrentState());
+ print(tNode.expectedState);
+ fDependencyList.removeFirst();
+ if(root == null){
+ return;
+ }
+
+ for (Element child = DOMUtil.getFirstChildElement(root);
+ child != null;
+ child = DOMUtil.getNextSiblingElement(child)){
+
+ String localName = getLocalName(child);
+
+ if (localName.equals(SchemaSymbols.ELT_ANNOTATION)){
+ continue;
+ }
+ else if(localName.equals(SchemaSymbols.ELT_INCLUDE)){
+ String id = DOMUtil.getAttrValue(child, SchemaSymbols.ATT_SCHEMALOCATION);
+ System.out.println("<include> id : " + id);
+ Element domNode = (Element) fId2DocMap.get(id);
+ Element target = (Element) fOverrideHandler.transform(id, null, domNode);
+ fDirectedGraph+= "--inc-->" + id;
+ performDependencyChecking((TestNode)fDependencyList.getFirst(), target);
+ if(fOverrideHandler.getCurrentState() == OverrideTransformationManager.STATE_DUPLICATE ||
+ fOverrideHandler.getCurrentState() == OverrideTransformationManager.STATE_COLLISION)
+ fDirectedGraph+= "\n";
+ }
+ else if(localName.equals(SchemaSymbols.ELT_REDEFINE)){
+
+ }
+ else if(localName.equals(SchemaSymbols.ELT_OVERRIDE)){
+ String id = DOMUtil.getAttrValue(child, SchemaSymbols.ATT_SCHEMALOCATION);
+ System.out.println("<override> id : " + id);
+ Element domNode = (Element) fId2DocMap.get(id);
+ Element overridden = (Element)fOverrideHandler.transform(id, child, domNode);
+ fDirectedGraph+= "--ov-->" + id;
+ performDependencyChecking((TestNode)fDependencyList.getFirst(), overridden);
+ if(fOverrideHandler.getCurrentState() == OverrideTransformationManager.STATE_DUPLICATE ||
+ fOverrideHandler.getCurrentState() == OverrideTransformationManager.STATE_COLLISION)
+ fDirectedGraph+= "\n";
+ }
+ }
+ }
+
+ public Hashtable createId2DocMapScenario_1(){
+ Hashtable map = new Hashtable();
+ map.put("A.xsd",parseXmlDom(getResourceURL("scenario_1/A.xsd")).getDocumentElement());
+ map.put("B.xsd",parseXmlDom(getResourceURL("scenario_1/B.xsd")).getDocumentElement());
+ map.put("C.xsd",parseXmlDom(getResourceURL("scenario_1/C.xsd")).getDocumentElement());
+
+ return map;
+ }
+
+ public Hashtable createId2DocMapScenario_2(){
+ Hashtable map = new Hashtable();
+ map.put("A.xsd",parseXmlDom(getResourceURL("scenario_2/A.xsd")).getDocumentElement());
+ map.put("B.xsd",parseXmlDom(getResourceURL("scenario_2/B.xsd")).getDocumentElement());
+ map.put("C.xsd",parseXmlDom(getResourceURL("scenario_2/C.xsd")).getDocumentElement());
+
+ return map;
+ }
+
+ public Hashtable createId2DocMapScenario_3(){
+ Hashtable map = new Hashtable();
+ map.put("A.xsd",parseXmlDom(getResourceURL("scenario_3/A.xsd")).getDocumentElement());
+ map.put("B.xsd",parseXmlDom(getResourceURL("scenario_3/B.xsd")).getDocumentElement());
+ map.put("C.xsd",parseXmlDom(getResourceURL("scenario_3/C.xsd")).getDocumentElement());
+
+ return map;
+ }
+
+ public Hashtable createId2DocMapScenario_4(){
+ Hashtable map = new Hashtable();
+ map.put("A.xsd",parseXmlDom(getResourceURL("scenario_4/A.xsd")).getDocumentElement());
+ map.put("B.xsd",parseXmlDom(getResourceURL("scenario_4/B.xsd")).getDocumentElement());
+ map.put("C.xsd",parseXmlDom(getResourceURL("scenario_4/C.xsd")).getDocumentElement());
+
+ return map;
+ }
+
+ public Hashtable createId2DocMapScenario_5(){
+ Hashtable map = new Hashtable();
+ map.put("A.xsd",parseXmlDom(getResourceURL("scenario_5/A.xsd")).getDocumentElement());
+ map.put("B.xsd",parseXmlDom(getResourceURL("scenario_5/B.xsd")).getDocumentElement());
+ map.put("C.xsd",parseXmlDom(getResourceURL("scenario_5/C.xsd")).getDocumentElement());
+
+ return map;
+ }
+
+ static class TestNode{
+ ArrayList children = new ArrayList();
+ int expectedState;
+
+ public TestNode(){
+ }
+
+ public void addChildNode(TestNode child){
+ children.add(child);
+ }
+
+ public Iterator getChildren(){
+ return this.children.iterator();
+ }
+
+ }
+}
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideHandlerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideHandlerTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideIntegrationTest.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideIntegrationTest.java?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideIntegrationTest.java (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideIntegrationTest.java Wed Nov 10 19:24:54 2010
@@ -0,0 +1,25 @@
+/*
+ * 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 schema.override;
+
+/**
+ * @version $Id$
+ */
+public class OverrideIntegrationTest extends BaseOverrideTest {
+
+}
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideIntegrationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideIntegrationTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideTestSuite.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideTestSuite.java?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideTestSuite.java (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideTestSuite.java Wed Nov 10 19:24:54 2010
@@ -0,0 +1,42 @@
+/*
+ * 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 schema.override;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import schema.annotations.AllTests;
+import schema.annotations.XSAttributeGroupAnnotationsTest;
+
+/**
+ * @version $Id$
+ */
+public class OverrideTestSuite {
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(OverrideTestSuite.suite());
+ }
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for Schema Annotations");
+ //$JUnit-BEGIN$
+ suite.addTestSuite(OverrideTrasformTest.class);
+ suite.addTestSuite(OverrideHandlerTest.class);
+
+ return suite;
+ }
+}
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideTestSuite.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideTestSuite.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideTrasformTest.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideTrasformTest.java?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideTrasformTest.java (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideTrasformTest.java Wed Nov 10 19:24:54 2010
@@ -0,0 +1,87 @@
+/*
+ * 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 schema.override;
+
+import org.apache.xerces.impl.Constants;
+import org.apache.xerces.impl.xs.traversers.override.DOMOverrideImpl;
+import org.apache.xerces.impl.xs.traversers.override.OverrideTransformer;
+import org.apache.xerces.impl.xs.traversers.override.exception.OverrideTransformException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * @version $Id$
+ */
+public class OverrideTrasformTest extends BaseOverrideTest {
+
+ String[] fOverridingDocs = {"overriding.xsd","overriding1.xsd","overriding2.xsd"};
+ String[] fOverriddenDocs = {"overridden.xsd","overridden1.xsd","overridden2.xsd"};
+ String[] fExpectedDocs = {"result.xsd","result1.xsd","result2.xsd"};
+ OverrideTransformer fTransformer = new DOMOverrideImpl(new XSHandlerDelegate(Constants.SCHEMA_VERSION_1_1, null));
+
+ protected void setUp(){
+
+ }
+
+ public void testNormalOverrideTransform(){
+ doOverrideTest(fOverridingDocs[0],fOverriddenDocs[0], fExpectedDocs[0]);
+ }
+
+ public void testOverrideWithMerge(){
+ doOverrideTest(fOverridingDocs[1],fOverriddenDocs[1], fExpectedDocs[1]);
+ }
+
+ public void testOverrideWithInclude(){
+ doOverrideTest(fOverridingDocs[2],fOverriddenDocs[2], fExpectedDocs[2]);
+ }
+
+ public void doOverrideTest(String overridingElem,String overriddenElem,String exResultElem){
+ Document dom1 = parseXmlDom(getResourceURL(overridingElem));
+ NodeList list = dom1.getDocumentElement().getChildNodes();
+ Node overrideElem = list.item(1);
+
+ Document dom2 = parseXmlDom(getResourceURL(overriddenElem));
+ Node overridenElem = dom2.getDocumentElement();
+ Node overridenElem2 = overridenElem;
+
+
+ Node result=null;
+ try {
+ result = fTransformer.transform((Element)overrideElem, (Element)overridenElem2);
+ } catch (OverrideTransformException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ //This is the transformed overridden schema
+ Document resultDoc = parseXmlDom(getResourceURL(exResultElem));
+ Node resultElem = resultDoc.getDocumentElement();
+ result.normalize();
+ resultElem.normalize();
+
+ assertTrue("Error performing Override Transformations",resultElem.isEqualNode(result));
+ }
+
+
+
+ public static void main(String args[]) {
+ junit.textui.TestRunner.run(OverrideTrasformTest.class);
+ }
+
+}
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideTrasformTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/OverrideTrasformTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/XSDHandlerDelegate.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/XSDHandlerDelegate.java?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/XSDHandlerDelegate.java (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/XSDHandlerDelegate.java Wed Nov 10 19:24:54 2010
@@ -0,0 +1,41 @@
+/*
+ * 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 schema.override;
+
+import org.apache.xerces.impl.XMLErrorReporter;
+import org.apache.xerces.impl.xs.XSConstraints;
+import org.apache.xerces.impl.xs.XSMessageFormatter;
+import org.apache.xerces.impl.xs.traversers.XSDHandler;
+import org.w3c.dom.Element;
+
+/**
+ * @version $Id$
+ */
+class XSHandlerDelegate extends XSDHandler {
+
+ private XMLErrorReporter fErrorReporter = new XMLErrorReporter();
+
+ XSHandlerDelegate(short schemaVersion, XSConstraints xsConstraints) {
+ super(schemaVersion, xsConstraints);
+ }
+
+ public void reportSchemaError(String key, Object[] args, Element ele) {
+ fErrorReporter.reportError(XSMessageFormatter.SCHEMA_DOMAIN,
+ key, args, XMLErrorReporter.SEVERITY_ERROR, null);
+ }
+}
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/XSDHandlerDelegate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/XSDHandlerDelegate.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,17 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="firstName"/>
+ <xs:element name="lastName"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="personName"/>
+
+
+ <xs:element name="developer" type="developerType"/>
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden1.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden1.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden1.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden1.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,28 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+
+ <xs:override schemaLocation="overridden_a.xsd">
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="firstName"/>
+ </xs:sequence>
+ </xs:complexType>
+
+
+</xs:override>
+
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="firstName"/>
+ <xs:element name="lastName"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="personName"/>
+
+
+ <xs:element name="developer" type="developerType"/>
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden1.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden1.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden2.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden2.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden2.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden2.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,18 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+<xs:include schemaLocation="http://www.w3schools.com/schema/customer.xsd"/>
+
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="firstName"/>
+ <xs:element name="lastName"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="personName"/>
+
+
+ <xs:element name="developer" type="developerType"/>
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden2.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overridden2.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding-copy.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding-copy.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding-copy.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding-copy.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,18 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+ <xs:override schemaLocation="overridden-copy.xsd">
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:string"/>
+ <xs:include schemaLocation="dummy.xsd"/>
+ </xs:override>
+
+</xs:schema>
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,19 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+
+ <xs:override schemaLocation="overridden.xsd">
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:string"/>
+ </xs:override>
+
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding1.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding1.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding1.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding1.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,19 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+
+ <xs:override schemaLocation="overridden.xsd">
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:string"/>
+ </xs:override>
+
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding1.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding1.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding2.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding2.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding2.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding2.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,19 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+
+ <xs:override schemaLocation="overridden.xsd">
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:string"/>
+ </xs:override>
+
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding2.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/overriding2.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,14 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.moinc.org" elementFormDefault="qualified" targetNamespace="http://www.moinc.org" version="1.1">
+
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:string"/>
+
+
+ <xs:element name="developer" type="developerType"/>
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result1.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result1.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result1.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result1.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,26 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.moinc.org" elementFormDefault="qualified" targetNamespace="http://www.moinc.org" version="1.1">
+
+
+ <xs:override schemaLocation="overridden_a.xsd">
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+
+<xs:element name="addressee" type="xs:string"/></xs:override>
+
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:string"/>
+
+
+ <xs:element name="developer" type="developerType"/>
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result1.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result1.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result2.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result2.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result2.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result2.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,24 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.moinc.org" elementFormDefault="qualified" targetNamespace="http://www.moinc.org" version="1.1">
+<xs:override schemaLocation="http://www.w3schools.com/schema/customer.xsd">
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:string"/>
+ </xs:override>
+
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:string"/>
+
+
+ <xs:element name="developer" type="developerType"/>
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result2.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/result2.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/A.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/A.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/A.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/A.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,19 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+
+ <xs:override schemaLocation="B.xsd">
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName" type="xs:string"/>
+ <xs:element name="surname" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:int"/>
+ </xs:override>
+
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/A.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/A.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/B.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/B.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/B.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/B.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,10 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+ <xs:include schemaLocation="C.xsd"/>
+
+ <xs:element name="addressee" type="xs:string"/>
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/B.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/B.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/C.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/C.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/C.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/C.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,15 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="firstName"/>
+ <xs:element name="lastName"/>
+ </xs:sequence>
+ </xs:complexType>
+
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/C.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_1/C.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/A.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/A.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/A.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/A.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,19 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+
+ <xs:override schemaLocation="B.xsd">
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:int"/>
+ </xs:override>
+
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/A.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/A.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/B.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/B.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/B.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/B.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,10 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+ <xs:include schemaLocation="C.xsd"/>
+
+ <xs:element name="addressee" type="xs:string"/>
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/B.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/B.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/C.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/C.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/C.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/C.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,16 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+ <xs:include schemaLocation="A.xsd"/>
+
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="firstName"/>
+ <xs:element name="lastName"/>
+ </xs:sequence>
+ </xs:complexType>
+
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/C.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_2/C.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/A.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/A.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/A.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/A.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,19 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+
+ <xs:override schemaLocation="B.xsd">
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:string"/>
+ </xs:override>
+
+ <xs:element name="addressee" type="xs:int"/>
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/A.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/A.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/B.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/B.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/B.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/B.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,10 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+ <xs:include schemaLocation="C.xsd"/>
+
+ <xs:element name="addressee" type="xs:string"/>
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/B.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/B.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/C.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/C.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/C.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/C.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,16 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+ <xs:include schemaLocation="A.xsd"/>
+
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="firstName"/>
+ <xs:element name="lastName"/>
+ </xs:sequence>
+ </xs:complexType>
+
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/C.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_3/C.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/A.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/A.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/A.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/A.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,18 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+
+ <xs:override schemaLocation="B.xsd">
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:string"/>
+ </xs:override>
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/A.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/A.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/B.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/B.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/B.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/B.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,8 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+ <xs:include schemaLocation="C.xsd"/>
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/B.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/B.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/C.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/C.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/C.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/C.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,18 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+ <xs:override schemaLocation="A.xsd">
+ <xs:element name="developer" type="xs:string"/>
+ </xs:override>
+
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="firstName"/>
+ <xs:element name="lastName"/>
+ </xs:sequence>
+ </xs:complexType>
+
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/C.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_4/C.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/A.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/A.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/A.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/A.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,18 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+
+ <xs:override schemaLocation="B.xsd">
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:string"/>
+ </xs:override>
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/A.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/A.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/B.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/B.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/B.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/B.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,9 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+ <xs:include schemaLocation="C.xsd"/>
+
+ <xs:element name="age" type="xs:int"/>
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/B.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/B.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/C.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/C.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/C.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/C.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,18 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+ <xs:override schemaLocation="A.xsd">
+ <xs:element name="developer" type="xs:string"/>
+ </xs:override>
+
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="firstName"/>
+ <xs:element name="lastName"/>
+ </xs:sequence>
+ </xs:complexType>
+
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/C.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/scenario_5/C.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,19 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+
+ <xs:override schemaLocation="overridden.xsd">
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:string"/>
+ </xs:override>
+
+
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA_1.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA_1.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA_1.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA_1.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,28 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+
+ <xs:override schemaLocation="overridden.xsd">
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ <xs:element name="surname"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="addressee" type="xs:string"/>
+ </xs:override>
+
+ <xs:element name="addressee" type="personName"/>
+
+
+ <xs:element name="developer" type="developerType"/>
+
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA_1.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA_1.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA_2.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA_2.xsd?rev=1033656&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA_2.xsd (added)
+++ xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA_2.xsd Wed Nov 10 19:24:54 2010
@@ -0,0 +1,16 @@
+<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+targetNamespace="http://www.moinc.org"
+xmlns="http://www.moinc.org"
+elementFormDefault="qualified">
+
+ <xs:element name="addressee" type="personName"/>
+
+
+ <xs:element name="developer" type="developerType"/>
+
+ <xs:complexType name="personName">
+ <xs:sequence>
+ <xs:element name="givenName"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA_2.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/tests/schema/override/schemaA_2.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