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
---
 .../tools/src/test/resources/TUSCANY1050.xsd       |  44 +++++++++
 .../emf-2.5/tools/src/test/resources/enum.xsd      |  50 +++++++++++
 .../resources/mixedRepeatingChoiceTestResult.xml   |  20 +++++
 .../src/test/resources/mixedStaticTestResult.xml   |  27 ++++++
 .../tools/src/test/resources/repeatingChoice.xsd   |  33 +++++++
 .../test/resources/repeatingChoiceTestResult.xml   |  25 ++++++
 .../emf-2.5/tools/src/test/resources/sdoModel.xsd  |  28 ++++++
 .../emf-2.5/tools/src/test/resources/sequences.xsd | 100 +++++++++++++++++++++
 .../twoRepeatingChoicesMixedTestResult.xml         |  20 +++++
 .../resources/twoRepeatingChoicesTestResult.xml    |  28 ++++++
 10 files changed, 375 insertions(+)
 create mode 100644 sdo-java/branches/emf-2.5/tools/src/test/resources/TUSCANY1050.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools/src/test/resources/enum.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
 create mode 100644 sdo-java/branches/emf-2.5/tools/src/test/resources/mixedStaticTestResult.xml
 create mode 100644 sdo-java/branches/emf-2.5/tools/src/test/resources/repeatingChoice.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools/src/test/resources/repeatingChoiceTestResult.xml
 create mode 100644 sdo-java/branches/emf-2.5/tools/src/test/resources/sdoModel.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools/src/test/resources/sequences.xsd
 create mode 100644 sdo-java/branches/emf-2.5/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
 create mode 100644 sdo-java/branches/emf-2.5/tools/src/test/resources/twoRepeatingChoicesTestResult.xml

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

diff --git a/sdo-java/branches/emf-2.5/tools/src/test/resources/TUSCANY1050.xsd b/sdo-java/branches/emf-2.5/tools/src/test/resources/TUSCANY1050.xsd
new file mode 100644
index 0000000000..a218eb574c
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools/src/test/resources/TUSCANY1050.xsd
@@ -0,0 +1,44 @@
+<?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://test.data" 
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+            elementFormDefault="qualified" 
+            targetNamespace="http://test.data">
+
+   <xsd:element name="description" type="tns:description"/>
+    <xsd:complexType name="description">
+        <xsd:sequence>
+            <xsd:element name="field1" type="xsd:string"/>
+            <xsd:element name="field2" type="xsd:string"/>
+            <xsd:element name="field3" type="xsd:string"/>
+            <xsd:element name="field4" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+
+    <xsd:element name="Wrapper" type="tns:Wrapper"/>
+    <xsd:complexType name="Wrapper">
+        <xsd:sequence>
+            <xsd:element name="description" nillable="true" type="tns:description"/>
+        </xsd:sequence>
+    </xsd:complexType>
+</xsd:schema>
+
diff --git a/sdo-java/branches/emf-2.5/tools/src/test/resources/enum.xsd b/sdo-java/branches/emf-2.5/tools/src/test/resources/enum.xsd
new file mode 100644
index 0000000000..6c906539a9
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools/src/test/resources/enum.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 
+  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:simpleType name="PriceClass">
+       <xsd:restriction base="xsd:string">
+           <xsd:enumeration value="Large"/>
+           <xsd:enumeration value="Medium"/>
+           <xsd:enumeration value="Small"/>
+       </xsd:restriction>
+   </xsd:simpleType>
+   
+   <xsd:complexType name="Quote">
+       <xsd:sequence>
+          <xsd:element name="symbol" type="xsd:string"/>
+          <xsd:element name="companyName" type="xsd:string"/>
+          <xsd:element name="priceClass" type="simple:PriceClass"/>
+          <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/src/test/resources/mixedRepeatingChoiceTestResult.xml b/sdo-java/branches/emf-2.5/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
new file mode 100644
index 0000000000..0aa17bb50a
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
@@ -0,0 +1,20 @@
+<?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.
+ -->
+<sequences:mrc xmlns:sequences="http://www.example.com/sequences"><b>1</b><a>foo</a>some mixed text<a>bar</a><b>2</b></sequences:mrc>
diff --git a/sdo-java/branches/emf-2.5/tools/src/test/resources/mixedStaticTestResult.xml b/sdo-java/branches/emf-2.5/tools/src/test/resources/mixedStaticTestResult.xml
new file mode 100644
index 0000000000..9136f0780d
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools/src/test/resources/mixedStaticTestResult.xml
@@ -0,0 +1,27 @@
+<?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.
+ -->
+<sequences:mixedStockQuote xmlns:sequences="http://www.example.com/sequences">
+  <symbol>fbnt</symbol>
+  <companyName>FlyByNightTechnology</companyName>
+  some text
+  <quotes><price>2000.0</price></quotes>
+  more text
+  <price>1000.0</price>
+</sequences:mixedStockQuote>
diff --git a/sdo-java/branches/emf-2.5/tools/src/test/resources/repeatingChoice.xsd b/sdo-java/branches/emf-2.5/tools/src/test/resources/repeatingChoice.xsd
new file mode 100644
index 0000000000..1d566da671
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools/src/test/resources/repeatingChoice.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:repchoice="http://www.example.com/repchoice" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/repchoice"> 
+  
+   <xsd:element name="rc" type="repchoice:RCType"/>
+
+	<xsd:complexType name="RCType">
+	  <xsd:choice maxOccurs="unbounded" minOccurs="0">
+	    <xsd:element name="s" type="xsd:string"/>
+	    <xsd:element name="i" type="xsd:int"/>
+	    <xsd:element name="f" type="xsd:float"/>
+	  </xsd:choice>
+	</xsd:complexType>
+
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools/src/test/resources/repeatingChoiceTestResult.xml b/sdo-java/branches/emf-2.5/tools/src/test/resources/repeatingChoiceTestResult.xml
new file mode 100644
index 0000000000..2719457b6d
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools/src/test/resources/repeatingChoiceTestResult.xml
@@ -0,0 +1,25 @@
+<?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.
+ -->
+<sequences:rc xmlns:sequences="http://www.example.com/sequences">
+  <b>1</b>
+  <a>foo</a>
+  <a>bar</a>
+  <b>2</b>
+</sequences:rc>
diff --git a/sdo-java/branches/emf-2.5/tools/src/test/resources/sdoModel.xsd b/sdo-java/branches/emf-2.5/tools/src/test/resources/sdoModel.xsd
new file mode 100644
index 0000000000..6b596c5b36
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools/src/test/resources/sdoModel.xsd
@@ -0,0 +1,28 @@
+<?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" xmlns:sdo="commonj.sdo" xmlns:sdoJava="commonj.sdo/java" targetNamespace="commonj.sdo"> 
+
+  <!-- Dummy XSD definition of special SDO ChangeSummaryType -->
+  <xsd:simpleType name="ChangeSummaryType" sdoJava:instanceClass="commonj.sdo.ChangeSummary">
+    <xsd:restriction base="xsd:string"/>
+  </xsd:simpleType>
+
+
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools/src/test/resources/sequences.xsd b/sdo-java/branches/emf-2.5/tools/src/test/resources/sequences.xsd
new file mode 100644
index 0000000000..b74a56eab7
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools/src/test/resources/sequences.xsd
@@ -0,0 +1,100 @@
+<?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:seq="http://www.example.com/sequences"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://www.example.com/sequences">
+
+	<xsd:element name="mixedStockQuote" type="seq:MixedQuote" />
+	<xsd:element name="rc" type="seq:RepeatingChoice" />
+	<xsd:element name="mrc" type="seq:MixedRepeatingChoice" />
+	<xsd:element name="rc2" type="seq:TwoRCs" />
+	<xsd:element name="mrc2" type="seq:TwoRCsMixed" />
+
+
+
+	<xsd:complexType mixed="true" name="MixedQuote">
+		<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="seq:MixedQuote" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+
+	<xsd:complexType name="RepeatingChoice">
+		<xsd:choice maxOccurs="unbounded" minOccurs="0">
+			<xsd:element name="a" type="xsd:string" />
+			<xsd:element name="b" type="xsd:int" />
+		</xsd:choice>
+	</xsd:complexType>
+
+
+	<xsd:complexType mixed="true" name="MixedRepeatingChoice">
+		<xsd:choice maxOccurs="unbounded" minOccurs="0">
+			<xsd:element name="a" type="xsd:string" />
+			<xsd:element name="b" type="xsd:int" />
+		</xsd:choice>
+	</xsd:complexType>
+
+
+	<xsd:complexType name="TwoRCs">
+		<xsd:sequence>
+
+			<xsd:choice maxOccurs="unbounded" minOccurs="0">
+				<xsd:element name="a" type="xsd:string" />
+				<xsd:element name="b" type="xsd:int" />
+			</xsd:choice>
+
+			<xsd:element name="split" type="xsd:string" />
+
+			<xsd:choice maxOccurs="unbounded" minOccurs="0">
+				<xsd:element name="y" type="xsd:string" />
+				<xsd:element name="z" type="xsd:int" />
+			</xsd:choice>
+
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType mixed="true" name="TwoRCsMixed">
+		<xsd:sequence>
+
+			<xsd:choice maxOccurs="unbounded" minOccurs="0">
+				<xsd:element name="a" type="xsd:string" />
+				<xsd:element name="b" type="xsd:int" />
+			</xsd:choice>
+
+			<xsd:element name="split" type="xsd:string" />
+
+			<xsd:choice maxOccurs="unbounded" minOccurs="0">
+				<xsd:element name="y" type="xsd:string" />
+				<xsd:element name="z" type="xsd:int" />
+			</xsd:choice>
+
+		</xsd:sequence>
+	</xsd:complexType>
+
+</xsd:schema>
diff --git a/sdo-java/branches/emf-2.5/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml b/sdo-java/branches/emf-2.5/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
new file mode 100644
index 0000000000..a62cd66b58
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
@@ -0,0 +1,20 @@
+<?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.
+ -->
+<sequences:rc2m xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sequences="http://www.example.com/sequences" xsi:type="sequences:TwoRCsMixed"><b>1</b>where will this appear?<a>foo</a><a>bar</a><b>2</b><split>pea</split><z>99</z><y>fred</y></sequences:rc2m>
diff --git a/sdo-java/branches/emf-2.5/tools/src/test/resources/twoRepeatingChoicesTestResult.xml b/sdo-java/branches/emf-2.5/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
new file mode 100644
index 0000000000..3585ad00d3
--- /dev/null
+++ b/sdo-java/branches/emf-2.5/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
@@ -0,0 +1,28 @@
+<?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.
+ -->
+<sequences:rc2 xmlns:sequences="http://www.example.com/sequences">
+  <b>1</b>
+  <a>foo</a>
+  <a>bar</a>
+  <b>2</b>
+  <split>banana</split>
+  <z>99</z>
+  <y>fred</y>
+</sequences:rc2>
-- 
cgit v1.2.3