[170217]

73 files changed, 1199 insertions, 234 deletions

diff --git a/examples/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
index 1e631c18c..209b5fc2f 100644
--- a/examples/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
@@ -22,7 +22,6 @@ Export-Package: extlibrary,
  main.impl,
  main.util,
  org.eclipse.emf.teneo.samples,
- org.eclipse.emf.teneo.samples.emf.annotations,
  org.eclipse.emf.teneo.samples.emf.annotations.associationoverride,
  org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.model,
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/extlibrary.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/extlibrary.Book.jdo
index 919533f25..5e7b27ab5 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/extlibrary.Book.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/extlibrary.Book.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:13 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:34:52 CET 2006 -->
 <jdo>
 	<package name="extlibrary.impl">
 		<class name="extlibrary.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/main.ChildObject2.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/main.ChildObject2.jdo
index 49071c768..6c145083a 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/main.ChildObject2.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/main.ChildObject2.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:32:16 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:36:00 CET 2006 -->
 <jdo>
 	<package name="main.impl">
 		<class name="main.impl.ChildObject2Impl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.basic.Basic.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.basic.Basic.jdo
index 2b284c425..acf8c9fb5 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.basic.Basic.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.basic.Basic.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:26 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:20:01 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.basic.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.basic.impl.BasicImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="basic" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.Book.jdo
index 192419917..638622ffd 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.Book.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.Book.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:22 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:19:57 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.column.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.column.Book.jdo
index 494926d11..544b6eb12 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.column.Book.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.column.Book.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:27 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:20:02 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="mybooktable" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.compositeid.Parent.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.compositeid.Parent.jdo
index ddf92d97d..7e1c0225e 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.compositeid.Parent.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.compositeid.Parent.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:23 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:19:58 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ParentImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="application">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.duplicates.ChildItem.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.duplicates.ChildItem.jdo
index a1f748388..91930dc77 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.duplicates.ChildItem.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.duplicates.ChildItem.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:29 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:20:04 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ChildItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="childitem" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.Book.jdo
index ccb9ab020..d4d6d8e9b 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.Book.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.Book.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:20 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:19:55 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="mybooktable" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.id.IdentityID.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.id.IdentityID.jdo
index 7f44a45f1..a2efb208f 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.id.IdentityID.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.id.IdentityID.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:28 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:20:03 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.IdentityIDImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="identityid" identity-type="application">
@@ -36,5 +36,15 @@
 			<version strategy="version-number" column="e_version"/>
 			<field name="myid" persistence-modifier="persistent" primary-key="true" value-strategy="increment" indexed="true"/>
 		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="tablegeneratorid" identity-type="application">
+			<implements name="org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="DTYPE" strategy="value-map" value="TableGeneratorID"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="myid" persistence-modifier="persistent" primary-key="true" value-strategy="increment" indexed="true" strategy="increment" sequence-table-name="TGEN" sequence-name-column-name="null" sequence-nextval-column-name="VAL_COL"/>
+		</class>
 	</package>
 </jdo>
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.Address.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.Address.jdo
index 8e6955cae..d3b605b21 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.Address.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.Address.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:28 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:20:03 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="application">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lazy.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lazy.Book.jdo
index c65ca48e3..8884f28d0 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lazy.Book.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lazy.Book.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:24 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:19:59 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lob.Person.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lob.Person.jdo
index 2582ece2f..5200a52da 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lob.Person.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lob.Person.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:22 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:19:56 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="person" identity-type="application">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.manytomany.Cntr.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.manytomany.Cntr.jdo
index 9c83d6832..29f9d750d 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.manytomany.Cntr.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.manytomany.Cntr.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:25 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:20:00 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.CntrImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="cntr" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.AddIDDocument.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.AddIDDocument.jdo
index bd658a8c6..cefd40c73 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.AddIDDocument.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.AddIDDocument.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:19 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:19:54 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.AddIDDocumentImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="addiddocument" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem.jdo
index 95bf44415..04867ddbb 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:30 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:20:05 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.MyItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="myitem" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.Printer.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.Printer.jdo
index 2439ab40c..4ab72b178 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.Printer.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.Printer.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:21 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:19:56 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.impl.PrinterImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="printer" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.set.ContainedItem.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.set.ContainedItem.jdo
index 554797cdb..acb4be687 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.set.ContainedItem.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.set.ContainedItem.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:31 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:20:06 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="containeditem" identity-type="datastore">
@@ -50,6 +50,7 @@
 				<collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" dependent-element="false">
 					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
 				</collection>
+				<order column="ITEMLIST_ITEM_IDX"/>
 				<column name="item_itemlist_id" allows-null="true"/>
 				<foreign-key delete-action="restrict" update-action="cascade"/>
 			</field>
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.toone.Address.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.toone.Address.jdo
index 2eb71b50b..c1fb976d6 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.toone.Address.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.toone.Address.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:24 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:19:58 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.Item.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.Item.jdo
index a9bc63636..0e9fadbdf 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.Item.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.Item.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:26 CET 2006 -->
+<!--	Generated by Teneo on Thu Jan 25 00:20:01 CET 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="MYITEMTABLE" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachelist.Contacts.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachelist.Contacts.jdo
index b6394893c..fab382c7e 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachelist.Contacts.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachelist.Contacts.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:34 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:34:09 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.detach.detachelist.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.detach.detachelist.impl.ContactsImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="contacts" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.Contacts.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.Contacts.jdo
index 3eff92e78..c79d73430 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.Contacts.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.Contacts.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:35 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:34:10 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl.ContactsImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="contacts" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachtest.TestA.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachtest.TestA.jdo
index c38e092e7..c4b356511 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachtest.TestA.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachtest.TestA.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:34 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:34:08 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestAImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="testa" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.elist.featuremap.PriceByQuantityType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.elist.featuremap.PriceByQuantityType.jdo
index 9187b17b0..d09621380 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.elist.featuremap.PriceByQuantityType.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.elist.featuremap.PriceByQuantityType.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:37 CET 2006 -->
+<!--	Generated by Teneo on Thu Dec 28 20:38:36 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.PriceByQuantityTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="pricebyquantitytype" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1to1.ContainedChildNR.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1to1.ContainedChildNR.jdo
index cefa149be..86dbce621 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1to1.ContainedChildNR.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1to1.ContainedChildNR.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:40 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:34:18 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildNRImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="containedchildnr" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1ton.Main.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1ton.Main.jdo
index c4f45ef4d..b6681c718 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1ton.Main.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1ton.Main.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:41 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:34:19 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.MainImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="main" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relationntom.Main.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relationntom.Main.jdo
index 4504d049c..e670efbdd 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relationntom.Main.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relationntom.Main.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:30:42 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:34:20 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl.MainImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="main" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.accounting.Account.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.accounting.Account.jdo
index 1ad12f72d..4255014b7 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.accounting.Account.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.accounting.Account.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:19 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:34:58 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="account" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.catalog.CatalogType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.catalog.CatalogType.jdo
index 531317672..55adf5e3d 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.catalog.CatalogType.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.catalog.CatalogType.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:25 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:05 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.CatalogTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="catalogtype" identity-type="application">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.epo2.Item.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.epo2.Item.jdo
index 39adc4912..e9d7741cc 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.epo2.Item.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.epo2.Item.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:17 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:34:57 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="item" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.forum.Forum.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.forum.Forum.jdo
index 626c73706..8248ca937 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.forum.Forum.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.forum.Forum.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:24 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:04 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.ForumImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="forum" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.inv.PType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.inv.PType.jdo
index c40e1ae35..1fa08b766 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.inv.PType.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.inv.PType.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:14 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:34:54 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="ptype" identity-type="application">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.library.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.library.Book.jdo
index b8398de2a..aeb70e4d8 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.library.Book.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.library.Book.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:10 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:34:49 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.play.ActType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.play.ActType.jdo
index f860ef34f..f0705aa7e 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.play.ActType.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.play.ActType.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:21 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:00 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.play.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.ActTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="acttype" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.product.ProductType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.product.ProductType.jdo
index fd00aa38c..e1c66644f 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.product.ProductType.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.product.ProductType.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:22 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:02 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.product.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="producttype" identity-type="application">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.DocumentRoot.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.DocumentRoot.jdo
index abef47807..4d87b8061 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.DocumentRoot.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.DocumentRoot.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:23 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:03 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="item" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.Book.jdo
index ce6b591f9..8b37a58fc 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.Book.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.Book.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:16 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:34:56 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.sunBooks.AuthorsType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.sunBooks.AuthorsType.jdo
index a09026730..1c57e1175 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.sunBooks.AuthorsType.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.sunBooks.AuthorsType.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:12 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:34:51 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.AuthorsTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="authorstype" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.workflow.Workflow.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.workflow.Workflow.jdo
index 5a1f5fcc3..fe7cc559a 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.workflow.Workflow.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.workflow.Workflow.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:11 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:34:50 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.A.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.A.jdo
index b1dca8e77..656bf07ed 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.A.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.A.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:32:05 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:47 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.AImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="a" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.A.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.A.jdo
index 5ca18adef..b1a7ff59a 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.A.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.A.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:57 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:40 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.AImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="a" identity-type="application">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.Element.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.Element.jdo
index cd9b699ab..714f6c49e 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.Element.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.Element.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:51 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:32 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.ElementImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="element" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Book.jdo
index b6b6c47f2..61b5a5200 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Book.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Book.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:45 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:27 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.Address.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.Address.jdo
index 66f4902ce..3bdb97477 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.Address.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.Address.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:55 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:37 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.Address.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.Address.jdo
index 2a0f7e873..78c912e45 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.Address.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.Address.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:32:00 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:43 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.statesByCountry.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.statesByCountry.jdo
index e37ea8b31..62ce31bea 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.statesByCountry.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.statesByCountry.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:48 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:30 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl.statesByCountryImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="statesbycountry" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.statesByCountry.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.statesByCountry.jdo
index 2765d1966..671f70a89 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.statesByCountry.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.statesByCountry.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:49 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:31 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.impl.statesByCountryImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="statesbycountry" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.DocumentRoot.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.DocumentRoot.jdo
index 0cb4f74af..5dcf3df7e 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.DocumentRoot.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.DocumentRoot.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:53 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:35 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.LetterBodyTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="letterbodytype" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.A.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.A.jdo
index 545355cab..643a41bcd 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.A.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.A.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:52 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:34 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.AImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="a" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.Member.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.Member.jdo
index ee92942f4..d54988f7d 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.Member.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.Member.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:56 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:38 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl.MemberImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.PurchaseOrder.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.PurchaseOrder.jdo
index 965e22917..8ed1fca24 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.PurchaseOrder.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.PurchaseOrder.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:59 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:41 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.PurchaseOrderImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="purchaseorder" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleList.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleList.jdo
index ce4a6a1c5..92c23fe3b 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleList.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleList.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:31:47 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:28 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleListImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="simplelist" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.ComplexNumber.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.ComplexNumber.jdo
index 808530fc6..cc33da737 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.ComplexNumber.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.ComplexNumber.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:32:02 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:44 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.ComplexNumberImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="complexnumber" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.ComplexAAA.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.ComplexAAA.jdo
index aa621be2e..8452c4434 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.ComplexAAA.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.ComplexAAA.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:32:03 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:35:46 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexAAAImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="complexaaa" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.abstractreference.Address.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.abstractreference.Address.jdo
index e377e6ea6..03b93f524 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.abstractreference.Address.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.abstractreference.Address.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:32:24 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:36:08 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl">
 		<class name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.bagduplicate.Person.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.bagduplicate.Person.jdo
index 15ef5efe8..5facf87ff 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.bagduplicate.Person.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.bagduplicate.Person.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:32:19 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:36:03 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl">
 		<class name="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl.PersonImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="person" identity-type="application">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.enumtest.Item.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.enumtest.Item.jdo
index 881f2ac8c..1c4c3b412 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.enumtest.Item.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.enumtest.Item.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:32:21 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:36:05 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.issues.enumtest.impl">
 		<class name="org.eclipse.emf.teneo.samples.issues.enumtest.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="item" identity-type="application">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.inheritance.Annotation.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.inheritance.Annotation.jdo
index 095d8045c..9eb051455 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.inheritance.Annotation.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.inheritance.Annotation.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:32:18 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:36:01 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.issues.inheritance.impl">
 		<class name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.AnnotationImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="application">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.interfacetrue.Address.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.interfacetrue.Address.jdo
index 774748696..5bad94043 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.interfacetrue.Address.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.interfacetrue.Address.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:32:22 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:36:06 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.issues.interfacetrue.impl">
 		<class name="org.eclipse.emf.teneo.samples.issues.interfacetrue.impl.USAddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.simplenm.Me.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.simplenm.Me.jdo
index 529fbce27..9a7fe4f84 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.simplenm.Me.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.simplenm.Me.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Nov 29 07:32:25 CET 2006 -->
+<!--	Generated by Teneo on Wed Dec 27 21:36:09 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.issues.simplenm.impl">
 		<class name="org.eclipse.emf.teneo.samples.issues.simplenm.impl.MeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="me" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdFactory.java
index b5ad45d98..2250b0f64 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdFactory.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdFactory.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $
+ * $Id: IdFactory.java,v 1.2 2007/01/24 23:30:16 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.annotations.id;
 
@@ -53,6 +53,15 @@ public interface IdFactory extends EFactory {
 	TableID createTableID();
 
 	/**
+	 * Returns a new object of class '<em>Table Generator ID</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Table Generator ID</em>'.
+	 * @generated
+	 */
+	TableGeneratorID createTableGeneratorID();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdPackage.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdPackage.java
index dc37e8020..7b380157b 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdPackage.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdPackage.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdPackage.java,v 1.2 2006/11/07 10:22:27 mtaal Exp $
+ * $Id: IdPackage.java,v 1.3 2007/01/24 23:30:17 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.annotations.id;
 
@@ -146,6 +146,35 @@ public interface IdPackage extends EPackage {
 
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl <em>Table Generator ID</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.impl.IdPackageImpl#getTableGeneratorID()
+	 * @generated
+	 */
+	int TABLE_GENERATOR_ID = 3;
+
+	/**
+	 * The feature id for the '<em><b>Myid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_GENERATOR_ID__MYID = 0;
+
+	/**
+	 * The number of structural features of the '<em>Table Generator ID</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_GENERATOR_ID_FEATURE_COUNT = 1;
+
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.IdentityID <em>Identity ID</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -209,6 +238,27 @@ public interface IdPackage extends EPackage {
 	EAttribute getTableID_Myid();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID <em>Table Generator ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Table Generator ID</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID
+	 * @generated
+	 */
+	EClass getTableGeneratorID();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID#getMyid <em>Myid</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Myid</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID#getMyid()
+	 * @see #getTableGeneratorID()
+	 * @generated
+	 */
+	EAttribute getTableGeneratorID_Myid();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -284,6 +334,24 @@ public interface IdPackage extends EPackage {
 		 */
 		EAttribute TABLE_ID__MYID = eINSTANCE.getTableID_Myid();
 
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl <em>Table Generator ID</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.impl.IdPackageImpl#getTableGeneratorID()
+		 * @generated
+		 */
+		EClass TABLE_GENERATOR_ID = eINSTANCE.getTableGeneratorID();
+
+		/**
+		 * The meta object literal for the '<em><b>Myid</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_GENERATOR_ID__MYID = eINSTANCE.getTableGeneratorID_Myid();
+
 	}
 
 } //IdPackage
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/TableGeneratorID.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/TableGeneratorID.java
new file mode 100644
index 000000000..9651fb0cd
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/TableGeneratorID.java
@@ -0,0 +1,83 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TableGeneratorID.java,v 1.1 2007/01/24 23:30:16 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.id;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Table Generator ID</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID#getMyid <em>Myid</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.id.IdPackage#getTableGeneratorID()
+ * @model extendedMetaData="name='TableID' kind='elementOnly'"
+ * @generated
+ */
+public interface TableGeneratorID extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Myid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Myid</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Myid</em>' attribute.
+	 * @see #isSetMyid()
+	 * @see #unsetMyid()
+	 * @see #setMyid(long)
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.IdPackage#getTableGeneratorID_Myid()
+	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true"
+	 *        annotation="teneo.jpa appinfo='\n\t\t\t\t@Id\n\t\t\t\t@TableGenerator(name=\"TGENERATOR\", table=\"TGEN\", initialValue=\"2\", valueColumnName=\"VAL_COL\")\n\t\t\t\t@GeneratedValue(strategy=TABLE, generator=\"TGENERATOR\")\n\t\t\t'"
+	 *        extendedMetaData="kind='element' name='myid'"
+	 * @generated
+	 */
+	long getMyid();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID#getMyid <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Myid</em>' attribute.
+	 * @see #isSetMyid()
+	 * @see #unsetMyid()
+	 * @see #getMyid()
+	 * @generated
+	 */
+	void setMyid(long value);
+
+	/**
+	 * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID#getMyid <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetMyid()
+	 * @see #getMyid()
+	 * @see #setMyid(long)
+	 * @generated
+	 */
+	void unsetMyid();
+
+	/**
+	 * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID#getMyid <em>Myid</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Myid</em>' attribute is set.
+	 * @see #unsetMyid()
+	 * @see #getMyid()
+	 * @see #setMyid(long)
+	 * @generated
+	 */
+	boolean isSetMyid();
+
+} // TableGeneratorID
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdFactoryImpl.java
index 5e514e68c..f4e0d7837 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdFactoryImpl.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdFactoryImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdFactoryImpl.java,v 1.1 2006/07/11 16:57:06 mtaal Exp $
+ * $Id: IdFactoryImpl.java,v 1.2 2007/01/24 23:30:15 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.annotations.id.impl;
 
@@ -62,6 +62,7 @@ public class IdFactoryImpl extends EFactoryImpl implements IdFactory {
 			case IdPackage.IDENTITY_ID: return createIdentityID();
 			case IdPackage.SIMPLE_ID: return createSimpleID();
 			case IdPackage.TABLE_ID: return createTableID();
+			case IdPackage.TABLE_GENERATOR_ID: return createTableGeneratorID();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -102,6 +103,16 @@ public class IdFactoryImpl extends EFactoryImpl implements IdFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public TableGeneratorID createTableGeneratorID() {
+		TableGeneratorIDImpl tableGeneratorID = new TableGeneratorIDImpl();
+		return tableGeneratorID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public IdPackage getIdPackage() {
 		return (IdPackage)getEPackage();
 	}
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdPackageImpl.java
index 39ed6f48c..79423f33d 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdPackageImpl.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdPackageImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdPackageImpl.java,v 1.2 2006/11/07 10:22:27 mtaal Exp $
+ * $Id: IdPackageImpl.java,v 1.3 2007/01/24 23:30:14 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.annotations.id.impl;
 
@@ -15,6 +15,7 @@ import org.eclipse.emf.teneo.samples.emf.annotations.id.IdFactory;
 import org.eclipse.emf.teneo.samples.emf.annotations.id.IdPackage;
 import org.eclipse.emf.teneo.samples.emf.annotations.id.IdentityID;
 import org.eclipse.emf.teneo.samples.emf.annotations.id.SimpleID;
+import org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID;
 import org.eclipse.emf.teneo.samples.emf.annotations.id.TableID;
 
 /**
@@ -46,6 +47,13 @@ public class IdPackageImpl extends EPackageImpl implements IdPackage {
 	private EClass tableIDEClass = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tableGeneratorIDEClass = null;
+
+	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
 	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
@@ -175,6 +183,24 @@ public class IdPackageImpl extends EPackageImpl implements IdPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getTableGeneratorID() {
+		return tableGeneratorIDEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getTableGeneratorID_Myid() {
+		return (EAttribute)tableGeneratorIDEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public IdFactory getIdFactory() {
 		return (IdFactory)getEFactoryInstance();
 	}
@@ -206,6 +232,9 @@ public class IdPackageImpl extends EPackageImpl implements IdPackage {
 
 		tableIDEClass = createEClass(TABLE_ID);
 		createEAttribute(tableIDEClass, TABLE_ID__MYID);
+
+		tableGeneratorIDEClass = createEClass(TABLE_GENERATOR_ID);
+		createEAttribute(tableGeneratorIDEClass, TABLE_GENERATOR_ID__MYID);
 	}
 
 	/**
@@ -246,6 +275,9 @@ public class IdPackageImpl extends EPackageImpl implements IdPackage {
 		initEClass(tableIDEClass, TableID.class, "TableID", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getTableID_Myid(), theXMLTypePackage.getLong(), "myid", null, 1, 1, TableID.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(tableGeneratorIDEClass, TableGeneratorID.class, "TableGeneratorID", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTableGeneratorID_Myid(), theXMLTypePackage.getLong(), "myid", null, 1, 1, TableGeneratorID.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		// Create resource
 		createResource(eNS_URI);
 
@@ -287,6 +319,12 @@ public class IdPackageImpl extends EPackageImpl implements IdPackage {
 		   source, 
 		   new String[] {
 			 "appinfo", "\n\t\t\t\t@Id\n\t\t\t\t@GeneratedValue(strategy=\"TABLE\")\n\t\t\t"
+		   });				
+		addAnnotation
+		  (getTableGeneratorID_Myid(), 
+		   source, 
+		   new String[] {
+			 "appinfo", "\n\t\t\t\t@Id\n\t\t\t\t@TableGenerator(name=\"TGENERATOR\", table=\"TGEN\", initialValue=\"2\", valueColumnName=\"VAL_COL\")\n\t\t\t\t@GeneratedValue(strategy=TABLE, generator=\"TGENERATOR\")\n\t\t\t"
 		   });	
 	}
 
@@ -339,6 +377,20 @@ public class IdPackageImpl extends EPackageImpl implements IdPackage {
 		   new String[] {
 			 "kind", "element",
 			 "name", "myid"
+		   });		
+		addAnnotation
+		  (tableGeneratorIDEClass, 
+		   source, 
+		   new String[] {
+			 "name", "TableID",
+			 "kind", "elementOnly"
+		   });			
+		addAnnotation
+		  (getTableGeneratorID_Myid(), 
+		   source, 
+		   new String[] {
+			 "kind", "element",
+			 "name", "myid"
 		   });
 	}
 
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/TableGeneratorIDImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/TableGeneratorIDImpl.java
new file mode 100644
index 000000000..12f06db5a
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/TableGeneratorIDImpl.java
@@ -0,0 +1,195 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TableGeneratorIDImpl.java,v 1.1 2007/01/24 23:30:15 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.id.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.id.IdPackage;
+import org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Table Generator ID</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl#getMyid <em>Myid</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TableGeneratorIDImpl extends EObjectImpl implements TableGeneratorID {
+	/**
+	 * The default value of the '{@link #getMyid() <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMyid()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final long MYID_EDEFAULT = 0L;
+
+	/**
+	 * The cached value of the '{@link #getMyid() <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMyid()
+	 * @generated
+	 * @ordered
+	 */
+	protected long myid = MYID_EDEFAULT;
+
+	/**
+	 * This is true if the Myid attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean myidESet = false;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableGeneratorIDImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return IdPackage.Literals.TABLE_GENERATOR_ID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public long getMyid() {
+		return myid;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMyid(long newMyid) {
+		long oldMyid = myid;
+		myid = newMyid;
+		boolean oldMyidESet = myidESet;
+		myidESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, IdPackage.TABLE_GENERATOR_ID__MYID, oldMyid, myid, !oldMyidESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetMyid() {
+		long oldMyid = myid;
+		boolean oldMyidESet = myidESet;
+		myid = MYID_EDEFAULT;
+		myidESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, IdPackage.TABLE_GENERATOR_ID__MYID, oldMyid, MYID_EDEFAULT, oldMyidESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetMyid() {
+		return myidESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case IdPackage.TABLE_GENERATOR_ID__MYID:
+				return new Long(getMyid());
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case IdPackage.TABLE_GENERATOR_ID__MYID:
+				setMyid(((Long)newValue).longValue());
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case IdPackage.TABLE_GENERATOR_ID__MYID:
+				unsetMyid();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case IdPackage.TABLE_GENERATOR_ID__MYID:
+				return isSetMyid();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (myid: ");
+		if (myidESet) result.append(myid); else result.append("<unset>");
+		result.append(')');
+		return result.toString();
+	}
+
+} //TableGeneratorIDImpl
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.ecore
index 49f0c3c40..1a00a027b 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.ecore
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.ecore
@@ -55,4 +55,20 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="TableGeneratorID">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="TableID"/>
+      <details key="kind" value="elementOnly"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="myid" unique="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Long" unsettable="true">
+      <eAnnotations source="teneo.jpa">
+        <details key="appinfo" value="&#xA;&#x9;&#x9;&#x9;&#x9;@Id&#xA;&#x9;&#x9;&#x9;&#x9;@TableGenerator(name=&quot;TGENERATOR&quot;, table=&quot;TGEN&quot;, initialValue=&quot;2&quot;, valueColumnName=&quot;VAL_COL&quot;)&#xA;&#x9;&#x9;&#x9;&#x9;@GeneratedValue(strategy=TABLE, generator=&quot;TGENERATOR&quot;)&#xA;&#x9;&#x9;&#x9;"/>
+      </eAnnotations>
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="myid"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.genmodel
index 7b3897526..167d92dfd 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.genmodel
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.genmodel
@@ -2,8 +2,8 @@
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src"
-    modelPluginID="org.eclipse.emf.teneo.samples" modelName="Id" importerID="org.eclipse.xsd.ecore.importer">
-  <foreignModel>id.xsd</foreignModel>
+    modelPluginID="org.eclipse.emf.teneo.samples" modelName="Id" importerID="org.eclipse.emf.importer.ecore">
+  <foreignModel>id.ecore</foreignModel>
   <genPackages prefix="Id" basePackage="org.eclipse.emf.teneo.samples.emf.annotations"
       resource="XML" disposableProviderFactory="true" ecorePackage="id.ecore#/">
     <genClasses ecoreClass="id.ecore#//IdentityID">
@@ -15,5 +15,8 @@
     <genClasses ecoreClass="id.ecore#//TableID">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute id.ecore#//TableID/myid"/>
     </genClasses>
+    <genClasses ecoreClass="id.ecore#//TableGeneratorID">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute id.ecore#//TableGeneratorID/myid"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.xsd
deleted file mode 100644
index 90e263cf7..000000000
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.xsd
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.eclipse.org/emf/teneo/samples/emf/annotations/id"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:lib="http://www.eclipse.org/emf/teneo/samples/emf/annotations/id"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-    <xsd:annotation>
-		<xsd:appinfo source="teneo.jpa">
-			@SequenceGenerator(name="GENERATOR" sequenceName="mySequenceName")
-		</xsd:appinfo>
-	</xsd:annotation>
-
-  <xsd:complexType name="SimpleID">
-    <xsd:sequence>
-      <xsd:element name="autoID" type="xsd:long">
-	 	<xsd:annotation>
-			<xsd:appinfo source="teneo.jpa">
-				@Id
-				@GeneratedValue
-				@Column(name="AUTOD" nullable="false")
-			</xsd:appinfo>
-	    </xsd:annotation>
-	  </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="TableID">
-    <xsd:sequence>
-      <xsd:element name="myid" type="xsd:long">
-	 	<xsd:annotation>
-			<xsd:appinfo source="teneo.jpa">
-				@Id
-				@GeneratedValue(strategy="TABLE")
-			</xsd:appinfo>
-	    </xsd:annotation>
-	  </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="IdentityID">
-    <xsd:sequence>
-      <xsd:element name="myid" type="xsd:long">
-	 	<xsd:annotation>
-			<xsd:appinfo source="teneo.jpa">
-				@Id
-				@GeneratedValue(strategy="IDENTITY")
-			</xsd:appinfo>
-	    </xsd:annotation>
-	  </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
- </xsd:schema>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdAdapterFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdAdapterFactory.java
index 310d792a2..3d77411ae 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdAdapterFactory.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdAdapterFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdAdapterFactory.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: IdAdapterFactory.java,v 1.2 2007/01/24 23:30:13 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.annotations.id.util;
 
@@ -79,6 +79,9 @@ public class IdAdapterFactory extends AdapterFactoryImpl {
 			public Object caseTableID(TableID object) {
 				return createTableIDAdapter();
 			}
+			public Object caseTableGeneratorID(TableGeneratorID object) {
+				return createTableGeneratorIDAdapter();
+			}
 			public Object defaultCase(EObject object) {
 				return createEObjectAdapter();
 			}
@@ -140,6 +143,20 @@ public class IdAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID <em>Table Generator ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID
+	 * @generated
+	 */
+	public Adapter createTableGeneratorIDAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdSwitch.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdSwitch.java
index b2f5a476a..c120e22dc 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdSwitch.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdSwitch.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdSwitch.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: IdSwitch.java,v 1.2 2007/01/24 23:30:12 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.annotations.id.util;
 
@@ -105,6 +105,12 @@ public class IdSwitch {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case IdPackage.TABLE_GENERATOR_ID: {
+				TableGeneratorID tableGeneratorID = (TableGeneratorID)theEObject;
+				Object result = caseTableGeneratorID(tableGeneratorID);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -155,6 +161,21 @@ public class IdSwitch {
 	}
 
 	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Table Generator ID</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Table Generator ID</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseTableGeneratorID(TableGeneratorID object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/tests.txt b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/tests.txt
deleted file mode 100644
index 4f9eb022b..000000000
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/tests.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-
-9.1.1 Table  (S)
-org.eclipse.emf.teneo.samples.emf.annotations.column:
-
-9.1.2 Secondary Table (NS)
-
-9.1.3 SecondaryTables (NS)
-
-9.1.4 UniqueConstraint (S)
-org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints
-
-9.1.5 Column (S)
-org.eclipse.emf.teneo.samples.emf.annotations.column:
-	Tests column annotation for the following attributes: name, unique, insertable, updatable, length, nullable, precision, scale
-
-9.1.6 JoinColumn (NS)
-org.eclipse.emf.teneo.samples.emf.annotations.compositeid
-	As part of a JoinColumns annotation
-
-9.1.7 JoinColumns (NS)
-org.eclipse.emf.teneo.samples.emf.annotations.compositeid
-
-9.1.8 Id Annotation (S)
-org.eclipse.emf.teneo.samples.emf.annotations.id
-
-9.1.9 GeneratedValue (S)
-org.eclipse.emf.teneo.samples.emf.annotations.id
-
-9.1.10 AttributeOverride (S)
-org.eclipse.emf.teneo.samples.emf.annotations.embedded
-org.eclipse.emf.teneo.samples.emf.annotations.attributesoverrides
-
-9.1.11 AttributeOverrides (S)
-org.eclipse.emf.teneo.samples.emf.annotations.embedded
-org.eclipse.emf.teneo.samples.emf.annotations.attributesoverrides
-
-9.1.12 EmbeddedId (NS)
-
-9.1.13 IdClass (S)
-org.eclipse.emf.teneo.samples.emf.annotations.compositeid
-
-9.1.14 Transient (S)
-org.eclipse.emf.teneo.samples.emf.annotations.basic
-
-9.1.15 Version (S)
-org.eclipse.emf.teneo.samples.emf.annotations.basic
-
-9.1.16 Basic (S)
-org.eclipse.emf.teneo.samples.emf.annotations.basic
-
-9.1.17 Lob (NS)
-
-9.1.18 Temporal (S)
-// no testcase because jpox/hibernate do not have explicit temporal mappings
-
-9.1.19 Enumerated (S)
-
-9.1.20 ManyToOne (S)
-org.eclipse.emf.teneo.samples.annotations.toone
-
-9.1.21 OneToOne (S)
-org.eclipse.emf.teneo.samples.annotations.toone
-
-9.1.22 OneToMany (S)
-org.eclipse.emf.teneo.samples.annotations.lazy: test fetch (EAGER), mapped-by, cascade and targetEntity
-
-9.1.23 JoinTable (S), not JoinColumn(s) icm with onetomany and manytomany
-org.eclipse.emf.teneo.samples.annotations.manytomany
-
-9.1.24 ManyToMany (S)
-org.eclipse.emf.teneo.samples.annotations.manytomany
-org.eclipse.emf.teneo.samples.annotations.manytomanyhb
-note: inversejoincolumns are automatically generated
-
-9.1.25 MapKey (NS)
-
-9.1.26 OrderBy (S)
-org.eclipse.emf.teneo.samples.emf.annotations.compositeid
-
-9.1.27 Inheritance (S)
-SINGLE_TABLE and JOINED
-org.eclipse.emf.teneo.samples.annotations.inheritancemapping
-
-9.1.28 DiscriminatorColumn (S)
-org.eclipse.emf.teneo.samples.annotations.inheritancemapping
-
-9.1.29 DiscriminatorValue (S)
-org.eclipse.emf.teneo.samples.annotations.inheritancemapping
-
-9.1.30 PrimaryKeyJoinColumn (NS)
-
-9.1.31 PrimaryKeyJoinColumns (NS)
-
-9.1.32 Embeddable (S)
-org.eclipse.emf.teneo.samples.emf.annotations.embedded
-
-9.1.33 Embedded (S)
-org.eclipse.emf.teneo.samples.emf.annotations.embedded
-
-9.1.34 MappedSuperclass (S)
-org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass
-
-9.1.35 SequenceGenerator (S)
-org.eclipse.emf.teneo.samples.annotations.id
-
-9.1.36 TableGenerator (NS)
-
-Custom annotations (called facets for now), annotation source http://facet.elver.org/List
-unique: defines for a list if its content is unique (no duplicates) 
-	-> tested by org.eclipse.emf.teneo.samples.emf.annotations.duplicates
-indexed: if true then this is a list, if false then it shows set behavior. (not supported by jpox)
-	-> tested by org.eclipse.emf.teneo.samples.emf.annotations.set
-
-Catalog and Schema annotation on class level is transferred correctly but disabled because did not work with mysql
-
-Fetch (one to many): is tested with LazyLibraryAction
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/test/mark.ecore b/examples/org.eclipse.emf.teneo.samples/test/mark.ecore
new file mode 100644
index 000000000..8cb1483e0
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/test/mark.ecore
@@ -0,0 +1,646 @@
+<?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="srd"
+   nsURI="http://srd" nsPrefix="srd">
+ <eClassifiers xsi:type="ecore:EClass" name="Service">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="links" upperBound="-1"
+       eType="#//Link" containment="true" eOpposite="#//Link/service"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="contacts" upperBound="-1"
+       eType="#//Contact" eOpposite="#//Contact/services"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="notes" upperBound="-1"
+       eType="#//Note" containment="true" eOpposite="#//Note/service"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="locations" upperBound="-1"
+       eType="#//Location" containment="true" eOpposite="#//Location/service"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="serviceGroup" lowerBound="1"
+       eType="#//ServiceGroup" eOpposite="#//ServiceGroup/services"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="organizations" upperBound="-1"
+       eType="#//Organization" eOpposite="#//Organization/services"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="longName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="EPGName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="adult" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalLaunch" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="local" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmitProfile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="epgSource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="requestedVideoQuality"
+       eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="nocViewable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioDelay" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="blackedOut" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="namedEquipment" upperBound="-1"
+       eType="#//NamedEquipment" eOpposite="#//NamedEquipment/services"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="routerPorts" upperBound="-1"
+       eType="#//RouterPort" containment="true" eOpposite="#//RouterPort/service"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="allServices" lowerBound="1"
+       eType="#//AllServices" eOpposite="#//AllServices/services"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="CheyenneUplink" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="GilbertUplink" eType="#//EnumType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Link">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="service" lowerBound="1"
+       eType="#//Service" eOpposite="#//Service/links"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Contact">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="physicalAddresses" upperBound="-1"
+       eType="#//PhysicalAddress" containment="true" eOpposite="#//PhysicalAddress/contact"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="phoneNumbers" upperBound="-1"
+       eType="#//PhoneNumber" containment="true" eOpposite="#//PhoneNumber/contact"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="emailAddresses" upperBound="-1"
+       eType="#//EmailAddress" containment="true" eOpposite="#//EmailAddress/contact"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="authInfo" upperBound="-1"
+       eType="#//AuthInfo" containment="true" eOpposite="#//AuthInfo/contact"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="urlAddresses" upperBound="-1"
+       eType="#//UrlAddress" containment="true" eOpposite="#//UrlAddress/contact"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="ipAddresses" upperBound="-1"
+       eType="#//IpAddress" containment="true" eOpposite="#//IpAddress/contact"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="services" upperBound="-1"
+       eType="#//Service" eOpposite="#//Service/contacts"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="namedEquipment" upperBound="-1"
+       eType="#//NamedEquipment" eOpposite="#//NamedEquipment/contacts"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="organizations" lowerBound="1"
+       eType="#//Organization" eOpposite="#//Organization/contacts"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="Description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="FirstName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="LastName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="MiddleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="NickName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="CallOrder" eType="#//EnumType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Note">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="service" lowerBound="1"
+       eType="#//Service" eOpposite="#//Service/notes"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="namedEquipment" lowerBound="1"
+       eType="#//NamedEquipment" eOpposite="#//NamedEquipment/notes"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="routerPort" lowerBound="1"
+       eType="#//RouterPort" eOpposite="#//RouterPort/notes"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="text" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="critical" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AuthInfo">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="contact" lowerBound="1"
+       eType="#//Contact" eOpposite="#//Contact/authInfo"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="Description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="authKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="EmailAddress">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="contact" lowerBound="1"
+       eType="#//Contact" eOpposite="#//Contact/emailAddresses"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="Address" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="IpAddress">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="contact" lowerBound="1"
+       eType="#//Contact" eOpposite="#//Contact/ipAddresses"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="IP" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PhoneNumber">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="contact" lowerBound="1"
+       eType="#//Contact" eOpposite="#//Contact/phoneNumbers"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="AreaCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="CountryCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="Description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="ShortNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="UrlAddress">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="contact" lowerBound="1"
+       eType="#//Contact" eOpposite="#//Contact/urlAddresses"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="Address" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PhysicalAddress">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="contact" lowerBound="1"
+       eType="#//Contact" eOpposite="#//Contact/physicalAddresses"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="City" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="Country" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="FirstLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="SecondLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="ThirdLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="FourthLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="State" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="PostalCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Organization">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="contacts" upperBound="-1"
+       eType="#//Contact" containment="true" eOpposite="#//Contact/organizations"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="services" upperBound="-1"
+       eType="#//Service" eOpposite="#//Service/organizations"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="namedEquipment" upperBound="-1"
+       eType="#//NamedEquipment" eOpposite="#//NamedEquipment/organizations"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="contactList" lowerBound="1"
+       eType="#//ContactList" eOpposite="#//ContactList/organizations"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Sar" eSuperTypes="#//NamedEquipment"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Hpa" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="designation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="encMod" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="frequencyBand" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="misc" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="polarity" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="hpaType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="hpaUse" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="UpConverter" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="attenuation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="frequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="ucOption" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="ptcNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="ucType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DtoAConverter" eSuperTypes="#//NamedEquipment"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AtoDConverter" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioDelay" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="horizontalPhase" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="verticalPhase" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Satellite" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="orbitalSlot" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="bandID" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="polarity" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="frequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SourceSatellite" eSuperTypes="#//Satellite"/>
+ <eClassifiers xsi:type="ecore:EClass" name="EchostarSatellite" eSuperTypes="#//Satellite"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Cherrypicker" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="in1PrimarySource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="in2PrimarySource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="in3PrimarySource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="in4PrimarySource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="in5PrimarySource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="in6PrimarySource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="in7PrimarySource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="in8PrimarySource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="out1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="out2" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="out3" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="out4" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DishReceiver" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="channel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="downlinkFrequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="forwardRateCorrection"
+       eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="lbandFrequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="smartCard" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbolRate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="dishReceiverType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="unitAuthorizationNumber"
+       eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CommercialInserter" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="cueSource" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="cueType" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="dtmfStartNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="dtmfStopNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="frequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="preRoll" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="serverID" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="tcid" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="vbiDecoder" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="wegenerCardID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="zone" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="TandB" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AudioDeEmbedder" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="group1Pr1GainDB" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="group1Pr1Swap" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="group1Pr2GainDB" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="group1Pr2Swap" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="group1Swap" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2Pr1GainDB" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2Pr1Swap" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2Pr2GainDB" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2Pr2Swap" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2Swap" eType="#//EnumType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Antenna" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="acu" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="azimuth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="deIce" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="designation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="drive" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="elevation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="gain" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="misc" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="sizeM" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="track" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="antennaType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="antennaUse" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Feed" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="lnb1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="lnb2" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="lnb3" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="lnb4" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="orientation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="feedType" eType="#//EnumType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Hydra" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="engineNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="head" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="module" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="MonitorWall" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="ptc" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="rfDesignation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="rfDisType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="EchostarXpndrFreq" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="frequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="polarity" eType="#//EnumType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SourceXpndrFreq" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="frequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="polarity" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DividerPort" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="lbandFrequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="portNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="BackhaulGroundStation" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="City" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="Country" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="FirstLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="SecondLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="ThirdLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="FourthLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="PostalCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="State" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="latitude" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="longitude" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DistributionAmp" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="frameNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="daType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="RouterPort">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="router" lowerBound="1"
+       eType="#//Router" eOpposite="#//Router/routerPorts"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="notes" upperBound="-1"
+       eType="#//Note" containment="true" eOpposite="#//Note/routerPort"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="number" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentAlias" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="portType" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkedToAlias" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkedToId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="Id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="service" lowerBound="1"
+       eType="#//Service" eOpposite="#//Service/routerPorts"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="portLocations" upperBound="-1"
+       eType="#//Location" eOpposite="#//Location/routerPort"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="RfPatch" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="band" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="designation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="expansion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="polarity" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="port" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Encoder" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioConfigStat" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="Pr1Language" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="satellite" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="Pr2Language" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="Pr3Language" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="Pr4Language" eType="#//EnumType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AudioEmbedder" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="pr1Gain" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="pr2Gain" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Fiber" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="customer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="fiber" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="VideoServer" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="role" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Ifl" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="endLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="startLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="otherIfls" upperBound="-1"
+       eType="#//Ifl"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Ici" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="ptcNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="IpSwitch" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="ipAddress" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="IpRouter" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="ipAddress" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Patch" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="patchRow" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="StandardsConverter" eSuperTypes="#//NamedEquipment"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Divider" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="barCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="FiberPop" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="circuitID" 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"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="Country" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="FirstLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="SecondLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="ThirdLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="FourthLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="PostalCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="State" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DolbyEEncoder" eSuperTypes="#//NamedEquipment"/>
+ <eClassifiers xsi:type="ecore:EClass" name="DolbyEDecoder" eSuperTypes="#//NamedEquipment"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Ac3Decoder" eSuperTypes="#//NamedEquipment"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Ac3Encoder" eSuperTypes="#//NamedEquipment"/>
+ <eClassifiers xsi:type="ecore:EClass" name="IpHub" eSuperTypes="#//NamedEquipment"/>
+ <eClassifiers xsi:type="ecore:EClass" name="FrameSync" eSuperTypes="#//NamedEquipment"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AtmSwitch" eSuperTypes="#//NamedEquipment"/>
+ <eClassifiers xsi:type="ecore:EClass" name="LocalRack" eSuperTypes="#//NamedEquipment"/>
+ <eClassifiers xsi:type="ecore:EClass" name="CellAce" eSuperTypes="#//NamedEquipment"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Monitor" eSuperTypes="#//NamedEquipment"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ReceiverDecoder" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr1" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr2" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr3" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr4" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="smartCard" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ReceiverMpeg2" eSuperTypes="#//ReceiverDecoder">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr1Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr2Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr3Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="band" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="bouquet" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataRate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="downlinkFrequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="fec" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="lbandFrequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="netID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="polarity" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="streamChannel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbolRate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="unitAuthorizationNumber"
+       eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="videoPid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr4Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="transponder" eType="#//EnumType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ReceiverAnalog" eSuperTypes="#//ReceiverDecoder">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="band" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="channel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="downlinkFrequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="lbandFrequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="polarity" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="unitAuthorizationNumber"
+       eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="transponder" eType="#//EnumType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ReceiverDigicipher" eSuperTypes="#//ReceiverDecoder">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr1Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr2Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr3Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="band" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataRate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="digicipherChannel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="digicipherVct" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="downlinkFrequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="fec" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="lbandFrequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="polarity" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="rfInputPort" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbolRate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="unitAuthorizationNumber"
+       eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="videoPid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="transponder" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr4Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ReceiverFiber" eSuperTypes="#//ReceiverDecoder">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr1Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr2Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr3Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataRate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="fec" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="streamChannel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbolRate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="videoPid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="inputFormat" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr4Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ReceiverTelco" eSuperTypes="#//ReceiverDecoder">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr1Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr2Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr3Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataRate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="fec" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="netID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="streamChannel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbolRate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="videoPid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ReceiverAsi" eSuperTypes="#//ReceiverDecoder">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr1Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr2Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr3Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataRate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="fec" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="netID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="streamChannel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbolRate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="videoPid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="audioPr4Pid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="NamedEquipmentList">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="namedEquipment" upperBound="-1"
+       eType="#//NamedEquipment" containment="true" eOpposite="#//NamedEquipment/namedEquipmentList"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="facility" lowerBound="1"
+       eType="#//Facility" eOpposite="#//Facility/namedEquipmentList"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="notes" upperBound="-1"
+       eType="#//Note" containment="true" eOpposite="#//Note/namedEquipment"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="contacts" upperBound="-1"
+       eType="#//Contact" eOpposite="#//Contact/namedEquipment"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="namedEquipmentList" lowerBound="1"
+       eType="#//NamedEquipmentList" eOpposite="#//NamedEquipmentList/namedEquipment"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="organizations" upperBound="-1"
+       eType="#//Organization" eOpposite="#//Organization/namedEquipment"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="building" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="manufacturer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="model" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="rack" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="room" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="serialNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="slot" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="spare" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="status" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="subslot" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="Id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="owner" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="services" upperBound="-1"
+       eType="#//Service" eOpposite="#//Service/namedEquipment"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="assetTag" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="equipmentLocations" upperBound="-1"
+       eType="#//Location" eOpposite="#//Location/namedEquipment"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Router" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="routerPorts" upperBound="-1"
+       eType="#//RouterPort" eOpposite="#//RouterPort/router"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstPort" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastInPort" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastOutPort" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="numInPorts" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="numOutPorts" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="routerType" eType="#//EnumType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Location">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="service" lowerBound="1"
+       eType="#//Service" eOpposite="#//Service/locations"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="incomingLinks" upperBound="-1"
+       eType="#//Link"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingLinks" upperBound="-1"
+       eType="#//Link"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="routerPort" lowerBound="1"
+       eType="#//RouterPort" eOpposite="#//RouterPort/portLocations"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="namedEquipment" lowerBound="1"
+       eType="#//NamedEquipment" eOpposite="#//NamedEquipment/equipmentLocations"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ContactList">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="echostar" lowerBound="1"
+       eType="#//Echostar" eOpposite="#//Echostar/contactList"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="organizations" upperBound="-1"
+       eType="#//Organization" containment="true" eOpposite="#//Organization/contactList"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Echostar">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="contactList" lowerBound="1"
+       eType="#//ContactList" containment="true" eOpposite="#//ContactList/echostar"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="enumAttrList" lowerBound="1"
+       eType="#//EnumAttrList" containment="true" eOpposite="#//EnumAttrList/echostar"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="facilities" upperBound="-1"
+       eType="#//Facility" containment="true" eOpposite="#//Facility/echostar"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ServiceGroup" eSuperTypes="#//AbstractServiceGroup">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="services" upperBound="-1"
+       eType="#//Service" eOpposite="#//Service/serviceGroup"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="serviceGroup" eType="#//ServiceGroup"
+       eOpposite="#//ServiceGroup/serviceGroups"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="serviceGroups" upperBound="-1"
+       eType="#//ServiceGroup" containment="true" eOpposite="#//ServiceGroup/serviceGroup"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="EnumAttrList">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="echostar" lowerBound="1"
+       eType="#//Echostar" eOpposite="#//Echostar/enumAttrList"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="enumAttrs" upperBound="-1"
+       eType="#//EnumAttr" containment="true" eOpposite="#//EnumAttr/enumAttrList"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="EnumAttr">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="enumAttrList" lowerBound="1"
+       eType="#//EnumAttrList" eOpposite="#//EnumAttrList/enumAttrs"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="enumValues" upperBound="-1"
+       eType="#//EnumValue" containment="true" resolveProxies="false" eOpposite="#//EnumValue/enumAttr"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrOwner" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EDataType" name="EnumType" instanceClassName="java.lang.String"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrCueType" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrCueSource" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrPolarity" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrAudioPr1" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrAudioPr2" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrAudioPr3" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrBand" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrAudioPr4" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrFec" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrRouterType" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrPortType" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrLanguage" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrFeedType" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrGroup1Swap" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrGroup2Swap" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrGroup1Pr1Swap" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrGroup1Pr2Swap" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrGroup2Pr1Swap" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrGroup2Pr2Swap" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrTcid" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrServerID" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrZone" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrType" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrBandID" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrManufacturer" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="DelayServer" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="delayServerType" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="inputPort" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="outputPort" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="transportStream" eType="#//EnumType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrDelayServerType" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrInputPort" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrOutputPort" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrTransportStream" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrTransponder" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Facility">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="echostar" lowerBound="1"
+       eType="#//Echostar" eOpposite="#//Echostar/facilities"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="namedEquipmentList" lowerBound="1"
+       eType="#//NamedEquipmentList" containment="true" eOpposite="#//NamedEquipmentList/facility"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="groups" upperBound="-1"
+       eType="#//AbstractServiceGroup" containment="true" eOpposite="#//AbstractServiceGroup/facility"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrInputFormat" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="PlayOutFacility" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="siteName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="bandID" eType="#//EnumType"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="frequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="polarity" eType="#//EnumType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AbstractServiceGroup">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="facility" lowerBound="1"
+       eType="#//Facility" eOpposite="#//Facility/groups"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AllServices" eSuperTypes="#//AbstractServiceGroup">
+   <eStructuralFeatures xsi:type="ecore:EReference" name="services" upperBound="-1"
+       eType="#//Service" containment="true" eOpposite="#//Service/allServices"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrPr1Language" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrPr2Language" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrPr3Language" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrPr4Language" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrTrack" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="EnumValue">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="attrValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EReference" name="enumAttr" lowerBound="1"
+       eType="#//EnumAttr" eOpposite="#//EnumAttr/enumValues"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Generic" eSuperTypes="#//NamedEquipment"/>
+ <eClassifiers xsi:type="ecore:EClass" name="DownConverter" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="attenuation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="frequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="dcOption" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="dcType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SpacecraftReceiver" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="frequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="polarity" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="recUse" eType="#//EnumType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SpacecraftTransmitter" eSuperTypes="#//NamedEquipment">
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="frequency" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="polarity" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+   <eStructuralFeatures xsi:type="ecore:EAttribute" name="txUse" eType="ecore:EDataType srd.ecore#//EnumType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrCallOrder" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrCheyenneUplink" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrGilbertUplink" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrRecUse" eSuperTypes="#//EnumAttr"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AttrTxUse" eSuperTypes="#//EnumAttr"/>
+</ecore:EPackage>
+