From 1f0de49cbd279bee42be069c4bd53225faab215c Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 29 Sep 2010 07:10:57 +0000
Subject: TUSCANY-3679: Apply changes to update sdo impl to use EMF v2.5.
 Thanks to Elio Damaggio and Florian Pinel for the work

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1002496 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/resources/CustomerAccount.xsd         |  41 ++++++++
 .../src/main/resources/InternalInElement.xsd       |  31 ++++++
 .../emf-2.5/tools-test/src/main/resources/Open.xsd |  33 +++++++
 .../src/main/resources/extensible/customer.xsd     |  47 +++++++++
 .../src/main/resources/extensible/customers.xml    |  39 ++++++++
 .../src/main/resources/extensible/infostreet.xml   |  24 +++++
 .../src/main/resources/extensible/infostreet.xsd   |  36 +++++++
 .../src/main/resources/extensible/infozipcode.xml  |  24 +++++
 .../src/main/resources/extensible/infozipcode.xsd  |  36 +++++++
 .../src/main/resources/extensible/nonamespace.xsd  |  25 +++++
 .../tools-test/src/main/resources/listAccess.xsd   |  53 +++++++++++
 .../src/main/resources/mixedTypesStatic.xsd        |  41 ++++++++
 .../tools-test/src/main/resources/simple.xsd       |  41 ++++++++
 .../tools-test/src/main/resources/simpleNoIF.xsd   |  41 ++++++++
 .../tools-test/src/main/resources/simpleNoTns.xsd  |  37 ++++++++
 .../src/main/resources/simpleWithChangeSummary.xsd |  49 ++++++++++
 .../tools-test/src/main/resources/subgroup.xsd     |  48 ++++++++++
 .../tools-test/src/main/resources/subgroup1.xml    |  23 +++++
 .../resources/substitutionWithExtensionValues.xsd  | 105 +++++++++++++++++++++
 .../resources/substitutionWithExtensionValues1.xml |  48 ++++++++++
 .../resources/substitutionWithExtensionValues2.xsd |  62 ++++++++++++
 .../src/main/resources/xsdImportOnly.wsdl          |  55 +++++++++++
 .../src/main/resources/xsdImportOnly_1.xsd         |  37 ++++++++
 .../tools-test/src/main/resources/xsdlistitem.xsd  |  50 ++++++++++
 24 files changed, 1026 insertions(+)
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/CustomerAccount.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/InternalInElement.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/Open.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/customer.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/customers.xml
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infostreet.xml
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infostreet.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infozipcode.xml
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infozipcode.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/nonamespace.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/listAccess.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/mixedTypesStatic.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/simple.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/simpleNoIF.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/simpleNoTns.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/simpleWithChangeSummary.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/subgroup.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/subgroup1.xml
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/substitutionWithExtensionValues.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/substitutionWithExtensionValues1.xml
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/substitutionWithExtensionValues2.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/xsdImportOnly.wsdl
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/xsdImportOnly_1.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools-test/src/main/resources/xsdlistitem.xsd

(limited to 'sdo-java/branches/emf-2.5/tools-test/src/main/resources')

diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/CustomerAccount.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/CustomerAccount.xsd
new file mode 100644
index 0000000000..a720670e3b
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/CustomerAccount.xsd
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.    
+-->
+<xs:schema xmlns:sdo="commonj.sdo" xmlns:sdoJava="commonj.sdo/java" xmlns:stn_1="http://example.com/customer"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified"
+  targetNamespace="http://example.com/customer">
+
+  <xs:complexType abstract="false" name="Account">
+    <xs:sequence />
+    <xs:attribute default="0" name="accountNum" type="xs:int" />
+    <xs:attribute default="0" name="balance" type="xs:float" />
+  </xs:complexType>
+
+  <xs:element name="account" type="stn_1:Account" />
+
+  <xs:complexType abstract="false" name="Customer">
+    <xs:sequence>
+      <xs:element name="account" type="stn_1:Account" />
+    </xs:sequence>
+    <xs:attribute name="firstName" type="xs:string" />
+  </xs:complexType>
+
+  <xs:element name="customer" type="stn_1:Customer" />
+
+</xs:schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/InternalInElement.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/InternalInElement.xsd
new file mode 100644
index 0000000000..6144b1e117
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/InternalInElement.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  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.
+ -->
+ <xsd:schema xmlns:tns="http://www.example.com/internal" 
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+            targetNamespace="http://www.example.com/internal">
+
+  <xsd:element name="Wrapper" type="tns:Wrapper"  />
+  <xsd:complexType name="Wrapper" >
+    <xsd:sequence>
+      <xsd:element name="abc" type="xsd:integer"/>
+      <xsd:element name="internalAbc" type="xsd:integer"/>
+    </xsd:sequence>
+  </xsd:complexType>
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/Open.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/Open.xsd
new file mode 100644
index 0000000000..0f158e591a
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/Open.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+ -->
+<xsd:schema xmlns:open="http://www.example.com/open" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/open">
+  
+   
+    <xsd:attribute name="globAttribute" type="xsd:string"/>
+
+    <xsd:complexType name="OneElementAndAnyAttr">
+        <xsd:sequence>
+            <xsd:element name="name" type="xsd:string"/>
+        </xsd:sequence>
+        <xsd:anyAttribute processContents="lax"/>
+    </xsd:complexType>
+    
+
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/customer.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/customer.xsd
new file mode 100644
index 0000000000..1a0531e040
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/customer.xsd
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.    
+ -->
+ <xsd:schema xmlns="http://www.example.com/extensible/customer"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified"
+	targetNamespace="http://www.example.com/extensible/customer">
+	
+	<xsd:complexType name="CustomersType">
+		<xsd:sequence>
+			<xsd:element name="customer" type="CustomerType" maxOccurs="unbounded" />
+		</xsd:sequence>
+	</xsd:complexType>
+	
+	<xsd:complexType name="CustomerType">
+		<xsd:all>
+			<xsd:element name="name" type="CustNameType" />
+			<xsd:element name="number" type="xsd:integer" />
+			<xsd:element form="unqualified" name="info" type="InfoType" />
+		</xsd:all>
+	</xsd:complexType>
+	
+	<xsd:simpleType name="CustNameType">
+		<xsd:restriction base="xsd:string" />
+	</xsd:simpleType>
+	
+	<xsd:complexType name="InfoType" />
+	
+	<xsd:element name="customers" type="CustomersType" />
+	<xsd:element name="customer" type="CustomerType" />
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/customers.xml b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/customers.xml
new file mode 100644
index 0000000000..40558f6cf8
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/customers.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.    
+ -->
+ <customers xmlns="http://www.example.com/extensible/customer"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.example.com/extensible/customer customer.xsd">
+	<customer>
+		<name>Pat Walmsley</name>
+		<info xsi:type="ns1:InfoType" xmlns=""
+			xmlns:ns1="http://www.example.com/extensible/info/zipcode">
+			<zipcode>21043</zipcode>
+		</info>
+		<number>15465</number>
+	</customer>
+	<customer>
+		<name>Priscilla Walmsley</name>
+		<number>15466</number>
+		<info xsi:type="ns1:InfoType" xmlns=""
+			xmlns:ns1="http://www.example.com/extensible/info/street">
+			<street>341 Duckworth Way</street>
+		</info>
+	</customer>
+</customers>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infostreet.xml b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infostreet.xml
new file mode 100644
index 0000000000..c57b0b98c1
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infostreet.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.    
+ -->
+ <info xsi:type="ns1:InfoType" xmlns=""
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:ns1="http://www.example.com/extensible/info/street">
+	<street>21043 Jones Way</street>
+</info>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infostreet.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infostreet.xsd
new file mode 100644
index 0000000000..4b71628c89
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infostreet.xsd
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.    
+ -->
+ <xsd:schema xmlns="http://www.example.com/extensible/info/street"
+	xmlns:customer="http://www.example.com/extensible/customer"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="unqualified"
+	targetNamespace="http://www.example.com/extensible/info/street">
+	<xsd:import namespace="http://www.example.com/extensible/customer"
+		schemaLocation="customer.xsd" />
+	<xsd:complexType name="InfoType">
+		<xsd:complexContent>
+			<xsd:extension base="customer:InfoType">
+				<xsd:sequence>
+					<xsd:element name="street" type="xsd:string" />
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infozipcode.xml b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infozipcode.xml
new file mode 100644
index 0000000000..a5f551908a
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infozipcode.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.    
+ -->
+ <info xsi:type="ns1:InfoType" xmlns=""
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:ns1="http://www.example.com/extensible/info/zipcode">
+	<zipcode>21043</zipcode>
+</info>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infozipcode.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infozipcode.xsd
new file mode 100644
index 0000000000..cd1c55c138
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/infozipcode.xsd
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.    
+ -->
+ <xsd:schema xmlns="http://www.example.com/extensible/info/zipcode"
+	xmlns:customer="http://www.example.com/extensible/customer"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="unqualified"
+	targetNamespace="http://www.example.com/extensible/info/zipcode">
+	<xsd:import namespace="http://www.example.com/extensible/customer"
+		schemaLocation="customer.xsd" />
+	<xsd:complexType name="InfoType">
+		<xsd:complexContent>
+			<xsd:extension base="customer:InfoType">
+				<xsd:sequence>
+					<xsd:element name="zipcode" type="xsd:string" />
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/nonamespace.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/nonamespace.xsd
new file mode 100644
index 0000000000..b551c8aae2
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/extensible/nonamespace.xsd
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.    
+ -->
+ <xsd:schema xmlns:customer="http://www.example.com/extensible/customer"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<xsd:import namespace="http://www.example.com/extensible/customer"
+		schemaLocation="customer.xsd" />
+	<xsd:element name="info" type="customer:InfoType"></xsd:element>
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/listAccess.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/listAccess.xsd
new file mode 100644
index 0000000000..917ce78f8a
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/listAccess.xsd
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.    
+ -->
+ <xsd:schema
+          xmlns:getList="http://www.example.com/getList"
+          xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+          targetNamespace="http://www.example.com/getList">
+    	  
+
+    <xsd:element name="company" type="getList:Company"/>
+    <xsd:element name="employee" type="xsd:string"/>
+
+    <xsd:complexType name="Company">
+        <xsd:sequence>
+            <xsd:element name="openCompany" type="getList:OpenCompany"/>
+            <xsd:element name="closeCompany" type="getList:CloseCompany"/>
+        </xsd:sequence>
+    </xsd:complexType>
+	   
+
+    <xsd:complexType name="OpenCompany">
+        <xsd:sequence>
+            <xsd:element name="company" type="xsd:string"/>
+            <xsd:element name="employees" maxOccurs="unbounded" type="xsd:string"/>
+            <xsd:any maxOccurs="unbounded" namespace="##any"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    	   
+
+    <xsd:complexType name="CloseCompany">
+        <xsd:sequence>
+            <xsd:element name="company" type="xsd:string"/>
+            <xsd:element name="employees" maxOccurs="unbounded" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/mixedTypesStatic.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/mixedTypesStatic.xsd
new file mode 100644
index 0000000000..436c1ec9a4
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/mixedTypesStatic.xsd
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.    
+ -->
+ <xsd:schema xmlns:statictypes="http://www.example.com/mixedtypes/statictypes"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified"
+	targetNamespace="http://www.example.com/mixedtypes/statictypes">
+	
+	<xsd:complexType name="Customer">
+		<xsd:sequence>
+			<xsd:element name="number" type="xsd:integer" />
+			<xsd:element name="account" type="statictypes:Account" />
+			<xsd:element name="address" type="statictypes:Address" />
+		</xsd:sequence>
+	</xsd:complexType>
+	
+	<xsd:complexType name="Account" abstract="true" />
+	
+	<xsd:complexType name="Address">
+		<xsd:sequence>
+			<xsd:element name="street" type="xsd:string" />
+		</xsd:sequence>
+	</xsd:complexType>
+	
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/simple.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/simple.xsd
new file mode 100644
index 0000000000..aff9f9c5bf
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/simple.xsd
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.    
+ -->
+<xsd:schema 
+  targetNamespace="http://www.example.com/simple"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  xmlns:simple="http://www.example.com/simple"> 
+  
+   <xsd:element name="stockQuote" type="simple:Quote"/>
+   
+   <xsd:complexType name="Quote">
+       <xsd:sequence>
+          <xsd:element name="symbol" type="xsd:string"/>
+          <xsd:element name="companyName" type="xsd:string"/>
+          <xsd:element name="price" type="xsd:decimal"/>
+          <xsd:element name="open1" type="xsd:decimal"/>
+          <xsd:element name="high" type="xsd:decimal"/>
+          <xsd:element name="low" type="xsd:decimal"/>
+          <xsd:element name="volume" type="xsd:double"/>
+          <xsd:element name="change1" type="xsd:double"/>
+          <xsd:element name="quotes" type="simple:Quote" minOccurs="0" maxOccurs="unbounded"/>
+       </xsd:sequence>
+   </xsd:complexType>
+
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/simpleNoIF.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/simpleNoIF.xsd
new file mode 100644
index 0000000000..aff9f9c5bf
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/simpleNoIF.xsd
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.    
+ -->
+<xsd:schema 
+  targetNamespace="http://www.example.com/simple"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  xmlns:simple="http://www.example.com/simple"> 
+  
+   <xsd:element name="stockQuote" type="simple:Quote"/>
+   
+   <xsd:complexType name="Quote">
+       <xsd:sequence>
+          <xsd:element name="symbol" type="xsd:string"/>
+          <xsd:element name="companyName" type="xsd:string"/>
+          <xsd:element name="price" type="xsd:decimal"/>
+          <xsd:element name="open1" type="xsd:decimal"/>
+          <xsd:element name="high" type="xsd:decimal"/>
+          <xsd:element name="low" type="xsd:decimal"/>
+          <xsd:element name="volume" type="xsd:double"/>
+          <xsd:element name="change1" type="xsd:double"/>
+          <xsd:element name="quotes" type="simple:Quote" minOccurs="0" maxOccurs="unbounded"/>
+       </xsd:sequence>
+   </xsd:complexType>
+
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/simpleNoTns.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/simpleNoTns.xsd
new file mode 100644
index 0000000000..4702f57251
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/simpleNoTns.xsd
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.    
+ -->
+<xsd:schema 
+	xmlns="http://www.example.com/simpleNoTns"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  
+   <xsd:complexType name="Quote">
+       <xsd:sequence>
+          <xsd:element name="symbol" type="xsd:string"/>
+          <xsd:element name="companyName" type="xsd:string"/>
+          <xsd:element name="price" type="xsd:decimal"/>
+          <xsd:element name="open1" type="xsd:decimal"/>
+          <xsd:element name="high" type="xsd:decimal"/>
+          <xsd:element name="low" type="xsd:decimal"/>
+          <xsd:element name="volume" type="xsd:double"/>
+          <xsd:element name="change1" type="xsd:double"/>
+       </xsd:sequence>
+   </xsd:complexType>
+
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/simpleWithChangeSummary.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/simpleWithChangeSummary.xsd
new file mode 100644
index 0000000000..c81e10ee00
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/simpleWithChangeSummary.xsd
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.
+ -->
+<xsd:schema xmlns:sdo="commonj.sdo" xmlns:simpleCS="http://www.example.com/simpleCS" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" targetNamespace="http://www.example.com/simpleCS">
+  
+    		  
+  <xsd:import namespace="commonj.sdo" schemaLocation="sdoModel.xsd"/>
+  
+  <xsd:complexType name="QuoteBase">
+  	<xsd:complexContent>
+  	  <xsd:extension base="simpleCS:Quote">
+  	    <xsd:sequence>
+  	    	<xsd:element name="changes" type="sdo:ChangeSummaryType"/>
+  	    </xsd:sequence>
+  	  </xsd:extension>
+  	</xsd:complexContent>
+
+  </xsd:complexType>
+  		   
+  <xsd:element name="stockQuote" type="simpleCS:QuoteBase"/>
+
+  <xsd:complexType name="Quote">
+    <xsd:sequence>
+      <xsd:element name="symbol" type="xsd:string"/>
+      <xsd:element name="companyName" type="xsd:string"/>
+      <xsd:element name="price" type="xsd:decimal"/>
+      <xsd:element name="open1" type="xsd:decimal"/>
+      <xsd:element name="high" type="xsd:decimal"/>
+      <xsd:element name="low" type="xsd:decimal"/>
+      <xsd:element name="volume" type="xsd:double"/>
+      <xsd:element name="change1" type="xsd:double"/>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="quotes" type="simpleCS:Quote"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/subgroup.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/subgroup.xsd
new file mode 100644
index 0000000000..61e0642dfa
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/subgroup.xsd
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  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.
+ -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sg="http://example.com/subgroup" elementFormDefault="qualified" targetNamespace="http://example.com/subgroup">
+
+  <element name="a" type="sg:A"/>
+  
+  <complexType name="A">
+    <sequence>
+      <element maxOccurs="1" minOccurs="1" ref="sg:ge1"/> 
+    </sequence>
+  </complexType>
+
+  <element name="ge1" type="sg:B"/>
+  <element name="se1" substitutionGroup="sg:ge1" type="sg:Bprime"/>
+
+  <complexType name="B">
+    <sequence>
+        <element maxOccurs="1" name="imInTypeB" type="string"/>
+    </sequence>
+  </complexType>
+
+  <complexType name="Bprime">
+      <complexContent>
+          <extension base="sg:B">
+              <sequence>
+                  <element name="imInTypeBprime" type="string"/>
+              </sequence>
+          </extension>
+      </complexContent>
+  </complexType>
+</schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/subgroup1.xml b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/subgroup1.xml
new file mode 100644
index 0000000000..007aef9aa3
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/subgroup1.xml
@@ -0,0 +1,23 @@
+<!--
+ *  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.
+ -->
+<subgroup:a xmlns:subgroup="http://example.com/subgroup">
+  <subgroup:ge1>
+    <subgroup:imInTypeB>thisIsElB</subgroup:imInTypeB>
+  </subgroup:ge1>
+</subgroup:a>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/substitutionWithExtensionValues.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/substitutionWithExtensionValues.xsd
new file mode 100644
index 0000000000..72474a62eb
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/substitutionWithExtensionValues.xsd
@@ -0,0 +1,105 @@
+<xsd:schema 
+	targetNamespace="http://www.example.com/substitutionEV"
+	xmlns="http://www.example.com/substitutionEV"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:sev="http://www.example.com/substitutionEV"
+	elementFormDefault="qualified">
+	<!--
+		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.    
+	-->
+	<xsd:element name="results" type="sev:ResultsType" />
+
+	<xsd:element name="result" type="sev:ResultType" />
+	<xsd:element name="myResult" type="sev:MyResultType"
+		substitutionGroup="sev:result" />
+
+	<xsd:complexType name="ResultsType">
+		<xsd:sequence>
+			<xsd:element name="id" type="sev:IdType" />
+			<xsd:element ref="sev:result" minOccurs="0"
+				maxOccurs="unbounded" />
+			<xsd:element name="comment" type="sev:CommentType" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="ResultType">
+		<xsd:sequence>
+			<xsd:element name="id" type="sev:IdType" />
+			<xsd:element name="name" type="xsd:string" />
+			<xsd:element name="value" type="sev:ValueType" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="MyResultType">
+		<xsd:complexContent>
+			<xsd:extension base="sev:ResultType" />
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:simpleType name="IdType">
+		<xsd:restriction base="sev:AsciiStringType">
+			<xsd:maxLength value="32" />
+			<xsd:pattern value="[0-9a-fA-F]*" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="AsciiStringType">
+		<xsd:restriction base="xsd:string">
+			<xsd:pattern value="\p{IsBasicLatin}*" />
+		</xsd:restriction>
+	</xsd:simpleType>
+ 
+	<xsd:complexType name="ValueType">
+		<xsd:simpleContent>
+			<xsd:extension base="sev:Integer32Bit" />
+		</xsd:simpleContent>
+	</xsd:complexType>
+
+	<xsd:simpleType name="Integer32Bit">
+		<xsd:restriction base="xsd:integer">
+			<xsd:minInclusive value="0" />
+			<xsd:maxInclusive value="4290000000" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="CommentType">
+		<xsd:simpleContent>
+			<xsd:extension base="sev:AsciiStringType">
+				<xsd:attribute name="language" use="optional">
+					<xsd:simpleType>
+						<xsd:restriction base="xsd:string">
+							<xsd:enumeration value="English" />
+							<xsd:enumeration value="French" />
+							<xsd:enumeration value="Spanish" />
+						</xsd:restriction>
+					</xsd:simpleType>
+				</xsd:attribute>
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+
+	<xsd:complexType name="MyCommentType">
+		<xsd:simpleContent>
+			<xsd:restriction base="sev:CommentType">
+				<xsd:minLength value="0" />
+				<xsd:maxLength value="40" />
+			</xsd:restriction>
+		</xsd:simpleContent>
+	</xsd:complexType>
+
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/substitutionWithExtensionValues1.xml b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/substitutionWithExtensionValues1.xml
new file mode 100644
index 0000000000..45c592a333
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/substitutionWithExtensionValues1.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ * 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.
+-->
+<sev2:allResults xmlns:sev2="http://www.example.com/substitutionEV2">
+	<sev2:id>ZZZZZZZZZZZZZZZZZZZZ</sev2:id>
+	<sev2:results xmlns:sev="http://www.example.com/substitutionEV">
+		<sev:id>00000000000000000000</sev:id>
+		<sev:result>
+			<sev:id>11111111111111111111</sev:id>
+			<sev:name>name1</sev:name>
+			<sev:value>1</sev:value>
+		</sev:result>
+		<sev:myResult>
+			<sev:id>22222222222222222222</sev:id>
+			<sev:name>myName2</sev:name>
+			<sev:value>2</sev:value>
+		</sev:myResult>
+		<sev:comment>comment0</sev:comment>
+	</sev2:results>
+	<sev2:results xmlns:sev="http://www.example.com/substitutionEV">
+		<sev:id>AAAAAAAAAAAAAAAAAAAA</sev:id>
+		<sev:myResult>
+			<sev:id>BBBBBBBBBBBBBBBBBBBB</sev:id>
+			<sev:name>myNameB</sev:name>
+			<sev:value>11</sev:value>
+		</sev:myResult>
+		<sev:comment>commentA</sev:comment>
+	</sev2:results>
+	<sev2:comment language="English">
+		commentZZZZZZZZZZZZZZZZZZ
+	</sev2:comment>
+</sev2:allResults>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/substitutionWithExtensionValues2.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/substitutionWithExtensionValues2.xsd
new file mode 100644
index 0000000000..769cce4f65
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/substitutionWithExtensionValues2.xsd
@@ -0,0 +1,62 @@
+<xsd:schema 
+	targetNamespace="http://www.example.com/substitutionEV2"
+	xmlns="http://www.example.com/substitutionEV2"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:sev2="http://www.example.com/substitutionEV2"
+	xmlns:sev="http://www.example.com/substitutionEV"
+	elementFormDefault="qualified">
+	<!--
+		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.    
+	-->
+
+	<xsd:import namespace="http://www.example.com/substitutionEV"
+		schemaLocation="substitutionWithExtensionValues.xsd" />
+
+	<xsd:element name="allResults" type="sev2:AllResultsType" />
+
+	<xsd:complexType name="AllResultsType">
+		<xsd:sequence>
+			<xsd:element name="id" type="sev2:Id2Type" />
+			<xsd:element name="results" minOccurs="0" maxOccurs="unbounded"
+				type="sev2:Results2Type" />
+			<xsd:element name="comment" type="sev2:Comment2Type" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="Results2Type">
+		<xsd:complexContent>
+			<xsd:extension base="sev:ResultsType" />
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:simpleType name="Id2Type">
+		<xsd:restriction base="sev:IdType">
+			<xsd:maxLength value="10" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="Comment2Type">
+		<xsd:simpleContent>
+			<xsd:restriction base="sev:CommentType">
+				<xsd:minLength value="0" />
+				<xsd:maxLength value="20" />
+			</xsd:restriction>
+		</xsd:simpleContent>
+	</xsd:complexType>
+
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/xsdImportOnly.wsdl b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/xsdImportOnly.wsdl
new file mode 100644
index 0000000000..576997a0a4
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/xsdImportOnly.wsdl
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://xsdImportOnly/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="EchoService" targetNamespace="http://xsdImportOnly/">
+  <types>
+    <xsd:schema>
+      <xsd:import namespace="http://xsdImportOnly/" schemaLocation="xsdImportOnly_1.xsd"/>
+    </xsd:schema>
+  </types>
+  <message name="echo">
+    <part element="tns:echo" name="parameters"/>
+  </message>
+  <message name="echoResponse">
+    <part element="tns:echoResponse" name="parameters"/>
+  </message>
+  <portType name="Echo">
+    <operation name="echo">
+      <input message="tns:echo"/>
+      <output message="tns:echoResponse"/>
+    </operation>
+  </portType>
+  <binding name="EchoPortBinding" type="tns:Echo">
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <operation name="echo">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+  </binding>
+  <service name="EchoService">
+    <port binding="tns:EchoPortBinding" name="EchoPort">
+      <soap:address location="http://localhost:9080/w1/EchoService"/>
+    </port>
+  </service>
+</definitions> 
\ No newline at end of file
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/xsdImportOnly_1.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/xsdImportOnly_1.xsd
new file mode 100644
index 0000000000..a62c26d948
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/xsdImportOnly_1.xsd
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://xsdImportOnly/" targetNamespace="http://xsdImportOnly/" version="1.0">
+
+  <xs:element name="echo" type="tns:echo"/>
+
+  <xs:element name="echoResponse" type="tns:echoResponse"/>
+
+  <xs:complexType name="echo">
+    <xs:sequence>
+      <xs:element minOccurs="0" name="arg0" type="xs:string"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="echoResponse">
+    <xs:sequence>
+      <xs:element minOccurs="0" name="return" type="xs:string"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema> 
\ No newline at end of file
diff --git a/sdo-java/branches/emf-2.5/tools-test/src/main/resources/xsdlistitem.xsd b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/xsdlistitem.xsd
new file mode 100644
index 0000000000..e416efaa25
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools-test/src/main/resources/xsdlistitem.xsd
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  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.
+ -->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/AddressWithList" xmlns:address="http://www.example.org/AddressWithList" elementFormDefault="qualified">
+
+	<xsd:element name="Address" type="address:AddressType" />
+
+	<xsd:complexType name="SubCategoryType">
+		<xsd:simpleContent>
+			<xsd:extension base="xsd:string">
+				<xsd:attribute name="categoryType" type="address:CategoryType" default="myCat"/>
+				<xsd:attribute name="displayable" type="xsd:boolean" use="optional"/>
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+
+	<xsd:simpleType name="CategoryType">
+		<xsd:list itemType="xsd:string" />
+	</xsd:simpleType>
+	<xsd:simpleType name="CategoryType2">
+		<xsd:restriction base="xsd:string" />
+	</xsd:simpleType>
+
+
+
+	<xsd:complexType name="AddressType">
+		<xsd:sequence>
+			<xsd:element name="Street" type="xsd:string"></xsd:element>
+			<xsd:element name="City" type="xsd:string"></xsd:element>
+			<xsd:element name="Zip" type="xsd:string"></xsd:element>
+			<xsd:element name="SubCategory" type="address:SubCategoryType"></xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+</xsd:schema>
\ No newline at end of file
-- 
cgit v1.2.3