1 files changed, 97 insertions, 96 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore
index 7f95aaeca0..fc6c469837 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore
@@ -1,96 +1,97 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model1"
-    nsURI="http://www.eclipse.org/emf/CDO/tests/model1/1.0.0" nsPrefix="model1">
-  <eAnnotations source="teneo.jpa">
-    <details key="value" value="@hbGenericGenerators({@GenericGenerator(name=&quot;system-uuid&quot;, strategy = &quot;org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOUUIDHexGenerator&quot;)})"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="Address">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="street" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="city" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Company" eSuperTypes="#//Address">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="categories" upperBound="-1"
-        eType="#//Category" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="suppliers" upperBound="-1"
-        eType="#//Supplier" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="customers" upperBound="-1"
-        eType="#//Customer" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="purchaseOrders" upperBound="-1"
-        eType="#//PurchaseOrder" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="salesOrders" upperBound="-1"
-        eType="#//SalesOrder" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Supplier" eSuperTypes="#//Address">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="purchaseOrders" upperBound="-1"
-        eType="#//PurchaseOrder" eOpposite="#//PurchaseOrder/supplier"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="preferred" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Customer" eSuperTypes="#//Address">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="salesOrders" upperBound="-1"
-        eType="#//SalesOrder" eOpposite="#//SalesOrder/customer"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="orderByProduct" upperBound="-1"
-        eType="#//ProductToOrder" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Order" abstract="true">
-    <eAnnotations source="teneo.jpa">
-      <details key="value" value="@Entity(name=&quot;BaseOrder&quot;)"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="orderDetails" upperBound="-1"
-        eType="#//OrderDetail" containment="true" eOpposite="#//OrderDetail/order"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OrderDetail">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="order" lowerBound="1" eType="#//Order"
-        eOpposite="#//Order/orderDetails"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="product" eType="#//Product1"
-        eOpposite="#//Product1/orderDetails"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="price" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PurchaseOrder" eSuperTypes="#//Order">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="date" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="supplier" lowerBound="1"
-        eType="#//Supplier" eOpposite="#//Supplier/purchaseOrders"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SalesOrder" eSuperTypes="#//Order">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="customer" lowerBound="1"
-        eType="#//Customer" eOpposite="#//Customer/salesOrders"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Category">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="categories" upperBound="-1"
-        eType="#//Category" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="products" upperBound="-1"
-        eType="#//Product1" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Product1">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="teneo.jpa">
-        <details key="value" value="@Id"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="orderDetails" upperBound="-1"
-        eType="#//OrderDetail" eOpposite="#//OrderDetail/product"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="vat" eType="#//VAT" defaultValueLiteral="vat15"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="VAT">
-    <eLiterals name="vat0"/>
-    <eLiterals name="vat7" value="7"/>
-    <eLiterals name="vat15" value="15"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OrderAddress" eSuperTypes="#//Address #//Order #//OrderDetail">
-    <eAnnotations source="teneo.jpa">
-      <details key="value" value="@AssociationOverride(name=&quot;orderDetails&quot;, joinColumns=@JoinColumn(name=&quot;orderdetails_orderaddressid&quot;))"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="testAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductToOrder" instanceClassName="java.util.Map$Entry">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="key" eType="#//Product1"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//SalesOrder"/>
-  </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model1" nsURI="http://www.eclipse.org/emf/CDO/tests/model1/1.0.0"
+    nsPrefix="model1">
+  <eAnnotations source="teneo.jpa">
+    <details key="value" value="@hbGenericGenerators({@GenericGenerator(name=&quot;system-uuid&quot;, strategy = &quot;org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOUUIDHexGenerator&quot;)})"/>
+  </eAnnotations>
+  <eClassifiers xsi:type="ecore:EClass" name="Address">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="street" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="city" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Company" eSuperTypes="#//Address">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="categories" upperBound="-1"
+        eType="#//Category" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="suppliers" upperBound="-1"
+        eType="#//Supplier" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="customers" upperBound="-1"
+        eType="#//Customer" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="purchaseOrders" upperBound="-1"
+        eType="#//PurchaseOrder" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="salesOrders" upperBound="-1"
+        eType="#//SalesOrder" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Supplier" eSuperTypes="#//Address">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="purchaseOrders" upperBound="-1"
+        eType="#//PurchaseOrder" eOpposite="#//PurchaseOrder/supplier"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="preferred" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Customer" eSuperTypes="#//Address">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="salesOrders" upperBound="-1"
+        eType="#//SalesOrder" eOpposite="#//SalesOrder/customer"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="orderByProduct" upperBound="-1"
+        eType="#//ProductToOrder" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Order" abstract="true">
+    <eAnnotations source="teneo.jpa">
+      <details key="value" value="@Entity(name=&quot;BaseOrder&quot;)"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="orderDetails" upperBound="-1"
+        eType="#//OrderDetail" containment="true" eOpposite="#//OrderDetail/order"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="OrderDetail">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="order" lowerBound="1" eType="#//Order"
+        eOpposite="#//Order/orderDetails"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="product" eType="#//Product1"
+        eOpposite="#//Product1/orderDetails"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="price" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="PurchaseOrder" eSuperTypes="#//Order">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="date" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="supplier" lowerBound="1"
+        eType="#//Supplier" eOpposite="#//Supplier/purchaseOrders"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SalesOrder" eSuperTypes="#//Order">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="customer" lowerBound="1"
+        eType="#//Customer" eOpposite="#//Customer/salesOrders"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Category">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="categories" upperBound="-1"
+        eType="#//Category" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="products" upperBound="-1"
+        eType="#//Product1" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Product1">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="teneo.jpa">
+        <details key="value" value="@Id"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="orderDetails" upperBound="-1"
+        eType="#//OrderDetail" eOpposite="#//OrderDetail/product"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="vat" eType="#//VAT" defaultValueLiteral="vat15"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="otherVATs" upperBound="-1"
+        eType="#//VAT" defaultValueLiteral="vat15"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        transient="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="VAT">
+    <eLiterals name="vat0"/>
+    <eLiterals name="vat7" value="7"/>
+    <eLiterals name="vat15" value="15"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="OrderAddress" eSuperTypes="#//Address #//Order #//OrderDetail">
+    <eAnnotations source="teneo.jpa">
+      <details key="value" value="@AssociationOverride(name=&quot;orderDetails&quot;, joinColumns=@JoinColumn(name=&quot;orderdetails_orderaddressid&quot;))"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="testAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ProductToOrder" instanceClassName="java.util.Map$Entry">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="key" eType="#//Product1"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//SalesOrder"/>
+  </eClassifiers>
+</ecore:EPackage>