diff options
| author | mtaal | 2006-09-29 12:29:28 +0000 |
|---|---|---|
| committer | mtaal | 2006-09-29 12:29:28 +0000 |
| commit | 20543ebfd460cb89c2ff6c2faf9024a10b78407e (patch) | |
| tree | 8266d44e811814eb83feb90a4bffdeea59d8061f | |
| parent | cb13d82b28158596026c64344ad0bc782623be73 (diff) | |
| download | org.eclipse.emf.teneo-20543ebfd460cb89c2ff6c2faf9024a10b78407e.tar.gz org.eclipse.emf.teneo-20543ebfd460cb89c2ff6c2faf9024a10b78407e.tar.xz org.eclipse.emf.teneo-20543ebfd460cb89c2ff6c2faf9024a10b78407e.zip | |
Changed testcases to use new annotation formatbuild_200609290842
Solved several issues in annotation parser
[157746]
466 files changed, 5300 insertions, 4532 deletions
diff --git a/doc/org.eclipse.emf.teneo.doc/doc/teneo_jpox.xml b/doc/org.eclipse.emf.teneo.doc/doc/teneo_jpox.xml new file mode 100644 index 000000000..e92327b26 --- /dev/null +++ b/doc/org.eclipse.emf.teneo.doc/doc/teneo_jpox.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<document> + <properties> + <title>Eclipse EMF persistence</title> + <jpoxpagetype>Preparation</jpoxpagetype> + <jpoxversion>1_1</jpoxversion> + </properties> + + <body> + + <section name="Teneo : from UML/XML Schema to Relational Persistence, Persisting Eclipse EMF using JPOX"> + <p>Teneo is a database persistency solution for EMF using JPOX/JDO 2.0. + Teneo combines the power of the <a href="http://www.eclipse.org/emf">EMF modeling and code generation framework</a> and the power of storage, caching and querying of sophisticated object-relational mapping software such as JPOX. + </p><p> + Teneo allows you to start with your model (UML or XML Schema) and automatically generate the java source code and relational mappings. Teneo takes over much (or even all) of the manual work of creating relational mapping schemes. + </p><p> + The EMF - JPOX Persistency solution consists of two main tools: + <ol> + <li>EMF - JPOX OR Mapper: generates object-relational mapping files from the EMF model.</li> + <li>EMF - JPOX Runtime: takes care of handling EMF specific things such as EMF collections, containment and bi-directional relations.</li> + </ol> + </p> + + <subsection name="Generate OR Mapping file"> + <p>First an EMF model has to be prepared and java source code generated using EMF. The next step is to generate the package.jdo file. The package.jdo file describes for a object relational mapping tool how to persist java objects to relational tables. + The package.jdo file can be generated within Eclipse by right-clicking a EMF model (ecore) file and selecting the relevant menu item.</p> + </subsection> + + <subsection name="Runtime Layer"> + <p>EMF objects require specific handling in relation to JPOX. This is mainly related to the way EMF handles references and collections. Also the EMF resource approach requires specific JPOX implementations. To handle the EMF specifics, the EMF - JPOX runtime layer was developed. This layer is small (about 150kb) but is essential to get a working EMF - JPOX integration. + </p><p> + The main visible component of the runtime layer is the JpoxDataStore. The JpoxDataStore controls a PersistenceManagerFactory and a set of EPackages which are persisted using the PersistenceManagers of this PersistenceManagerFactory. When using a PersistenceManager, behind the scenes Teneo takes care of instantiating EMF objects and setting/getting EFeatures from the database. Teneo also handles lazy loading of ELists. + </p> + </subsection> + + <subsection name="JPA/EJB3 Annotations"> + <p>Teneo will automatically map the EMF model to an object relational representation. + However there are situations in which it makes sense to influence or control the mapping. + For this purpose Teneo supports JPA annotations in the model. + The annotations can be used to control the way the inheritance structure is mapped to the relational store or how efeatures are mapped to database columns. + Annotations can be specified directly in your model definition or defined separately in a xml file. + </p><p> + The JPA support has been developed in such a way that it is only required to specify annotations for those parts of the model for which the automatic mapping logic does not result in the required behavior. For example it is possible to specify a column annotation for one efeature in a model while all other efeatures and eclasses are automatically handled by Teneo. + </p> + </subsection> + + <subsection name="Support and information"> + <p>Teneo is a project hosted within EMFT at <a href="http://www.eclipse.org/emft/projects/teneo/#teneo">eclipse.org</a>. + </p><p> + Teneo can be downloaded <a href="http://www.eclipse.org/emft/downloads/?proj=teneo">here</a>. + </p><p> + Tutorials and documentation can be found <a href="http://www.elver.org/jpox/index.html">here</a>. + </p><p> + Support is given through the EMFT newsgroup: news://news.eclipse.org/eclipse.technology.emft. + </p> + </subsection> + + <p><B>Disclaimer : JPOX does not provide support for nor endorse the use of Teneo. We simply provide visibility of its + existence and potential benefits for your organisation.</B> + </p> + + </section> + </body> +</document>
\ No newline at end of file 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 bd3d0f471..76d28d5e6 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 Thu Sep 28 21:30:55 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:43 CEST 2006 --> <jdo> <package name="extlibrary.impl"> <class name="extlibrary.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore"> @@ -16,7 +16,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="extlibrary.impl.WriterImpl"/> </field> @@ -35,7 +35,7 @@ <collection element-type="extlibrary.impl.ItemImpl" dependent-element="true"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="stock_id" allows-null="true"/> + <column name="library_stock_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="none"/> @@ -44,7 +44,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BRANCHES_IDX"/> - <column name="parentbranch_id" allows-null="true"/> + <column name="library_parentbranch_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="people" persistence-modifier="persistent"> @@ -87,7 +87,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -134,7 +134,7 @@ <version strategy="version-number" column="e_version"/> <field name="reader" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="reader_id" allows-null="true"/> + <column name="person_reader_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="extlibrary.impl.PersonImpl"/> </field> @@ -156,7 +156,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="VIDEOCASSETTE_CAST_IDX"/> - <column name="cast_id" allows-null="true"/> + <column name="videocassette_cast_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -194,7 +194,7 @@ <version strategy="version-number" column="e_version"/> <field name="manager" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="manager_id" allows-null="true"/> + <column name="employee_manager_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="extlibrary.impl.EmployeeImpl"/> </field> 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 807dc2305..4ecf2f6b2 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 Thu Sep 28 21:33:18 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:43 CEST 2006 --> <jdo> <package name="main.impl"> <class name="main.impl.ChildObject2Impl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore"> @@ -45,7 +45,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BASEGROUP_COMPONENTS_IDX"/> - <column name="group_id" allows-null="true"/> + <column name="basecomponent_group_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> 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 7c0ebde09..c9405bd23 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 Thu Sep 28 21:28:46 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:41 CEST 2006 --> <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 b0d0a3c66..0e76c1595 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 Thu Sep 28 21:28:32 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:35 CEST 2006 --> <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"> @@ -19,7 +19,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.WriterImpl"/> </field> @@ -38,7 +38,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -64,7 +64,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> 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 ef713aea7..35d35b462 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 Thu Sep 28 21:28:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:42 CEST 2006 --> <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 b945b04f5..688718e2a 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 Thu Sep 28 21:28:34 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:36 CEST 2006 --> <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"> @@ -15,8 +15,8 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PARENT_CHILDREN_IDX"/> - <column name="children_firstname" allows-null="true"/> - <column name="children_lastname" allows-null="true"/> + <column name="parent_children_firstname" allows-null="true"/> + <column name="parent_children_lastname" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> 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 6e79d7975..f9499a981 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 Thu Sep 28 21:28:54 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:44 CEST 2006 --> <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"> @@ -23,12 +23,13 @@ </inheritance> <version strategy="version-number" column="e_version"/> <field name="name" persistence-modifier="persistent" null-value="exception"/> - <field name="childItem" persistence-modifier="persistent" table="item_childitem" delete-action="restrict"> + <field name="childItem" persistence-modifier="persistent" delete-action="restrict"> <collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ChildItemImpl" dependent-element="true"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <join/> <order column="ITEM_CHILDITEM_IDX"/> + <column name="item_childitem_id" allows-null="true"/> + <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> </package> 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 ab15a844b..10e84f2cb 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 Thu Sep 28 21:28:27 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:33 CEST 2006 --> <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 6cbd88aa1..c66830b5b 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 Thu Sep 28 21:28:52 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:44 CEST 2006 --> <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"> 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 8cdc2f1be..d994ce076 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 Thu Sep 28 21:28:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:43 CEST 2006 --> <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"> @@ -28,7 +28,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTENTLIST_ADDRESS_IDX"/> - <column name="address_name" allows-null="true"/> + <column name="contentlist_address_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="price" persistence-modifier="persistent" delete-action="restrict"> @@ -36,7 +36,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTENTLIST_PRICE_IDX"/> - <column name="price_name" allows-null="true"/> + <column name="contentlist_price_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> 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 e75d651a3..6295997c9 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 Thu Sep 28 21:28:38 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:38 CEST 2006 --> <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"> @@ -19,7 +19,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.WriterImpl"/> </field> @@ -38,7 +38,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="false"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="false"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -64,7 +64,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> 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 911aad2af..dddc669ac 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 Thu Sep 28 21:28:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:35 CEST 2006 --> <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 ffc132494..edcfd0199 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 Thu Sep 28 21:28:40 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:39 CEST 2006 --> <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.Document.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.Document.jdo index 9d5552727..b36541116 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.Document.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.Document.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:40 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.DocumentImpl" 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.nmset.MyItem.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem.jdo index 803960f36..16712bb6d 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 Thu Sep 28 21:28:56 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:45 CEST 2006 --> <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 b723bb4ef..224aa9287 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 Thu Sep 28 21:28:29 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:34 CEST 2006 --> <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 a4f0d5b75..bdec1cf01 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 Thu Sep 28 21:28:58 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:46 CEST 2006 --> <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"> @@ -25,7 +25,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="itemList" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="itemlist_id" allows-null="true"/> + <column name="item_itemlist_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl"/> </field> @@ -43,14 +43,14 @@ <collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" dependent-element="true"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="containeditem_id" allows-null="true"/> + <column name="itemlist_containeditem_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="item" persistence-modifier="persistent" delete-action="restrict"> <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> - <column name="itemlist_id" allows-null="true"/> + <column name="item_itemlist_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="joinedItem" persistence-modifier="persistent" table="itemlist_item" delete-action="restrict"> 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 5a32e884c..d845d8135 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 Thu Sep 28 21:28:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:37 CEST 2006 --> <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"> @@ -38,7 +38,7 @@ <version strategy="version-number" column="e_version"/> <field name="address" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="address_id" allows-null="true"/> + <column name="address_address_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl"/> </field> 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 f54a6b9c3..80c9c46af 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 Thu Sep 28 21:28:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:40 CEST 2006 --> <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 aa10928a1..a98af12d3 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 Thu Sep 28 21:29:12 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:50 CEST 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"> @@ -17,7 +17,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTACTS_PERSONS_IDX"/> - <column name="persons_id" allows-null="true"/> + <column name="contacts_persons_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="containedPersons" persistence-modifier="persistent" delete-action="restrict"> @@ -25,7 +25,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTACTS_CONTAINEDPERSONS_IDX"/> - <column name="containedpersons_id" allows-null="true"/> + <column name="contacts_containedpersons_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -43,7 +43,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PERSON_CHILDREN_IDX"/> - <column name="children_id" allows-null="true"/> + <column name="person_children_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> 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 9f49b3869..3a19b22b6 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 Thu Sep 28 21:29:14 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:14 CEST 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"> @@ -17,7 +17,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTACTS_PERSONS_IDX"/> - <column name="persons_id" allows-null="true"/> + <column name="contacts_persons_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> 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 9c44fc27b..f8f3b99e9 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 Thu Sep 28 21:29:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:49 CEST 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"> @@ -15,7 +15,7 @@ <field name="code" persistence-modifier="persistent" null-value="exception"/> <field name="testB" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="testb_id" allows-null="false"/> + <column name="testb_testb_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestBImpl"/> </field> @@ -45,7 +45,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="TESTC_TESTB_IDX"/> - <column name="testb_id" allows-null="true"/> + <column name="testc_testb_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> 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 b51a42b39..63e8917a0 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 Thu Sep 28 21:29:19 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:15 CEST 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 9460e7200..aed935254 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 Thu Sep 28 21:29:29 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:24 CEST 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"> @@ -36,25 +36,25 @@ <field name="nameESet" persistence-modifier="persistent"/> <field name="containedonewayrequired" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="containedonewayrequired_id" allows-null="false"/> + <column name="containedchildr_containedonewayrequired_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildRImpl"/> </field> <field name="containedoneWaynotrequired" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="containedonewaynotrequired_id" allows-null="true"/> + <column name="containedchildnr_containedonewaynotrequired_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildNRImpl"/> </field> <field name="notcontainedonewayrequired" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="notcontainedonewayrequired_id" allows-null="false"/> + <column name="notcontainedchildr_notcontainedonewayrequired_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildRImpl"/> </field> <field name="notcontainedonewaynotrequired" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="notcontainedonewaynotrequired_id" allows-null="true"/> + <column name="notcontainedchildnr_notcontainedonewaynotrequired_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRImpl"/> </field> 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 21a19d1d3..12f1e89d5 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 Thu Sep 28 21:29:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:25 CEST 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"> @@ -19,7 +19,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONECR_IDX"/> - <column name="onecr_id" allows-null="true"/> + <column name="main_onecr_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="onecn" persistence-modifier="persistent" delete-action="restrict"> @@ -27,7 +27,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONECN_IDX"/> - <column name="onecn_id" allows-null="true"/> + <column name="main_onecn_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="onenr" persistence-modifier="persistent" delete-action="restrict"> @@ -35,7 +35,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONENR_IDX"/> - <column name="onenr_id" allows-null="true"/> + <column name="main_onenr_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="onenn" persistence-modifier="persistent" delete-action="restrict"> @@ -43,7 +43,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONENN_IDX"/> - <column name="onenn_id" allows-null="true"/> + <column name="main_onenn_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="twocr" persistence-modifier="persistent" delete-action="restrict"> @@ -51,7 +51,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWOCR_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twocr_main_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="twocn" persistence-modifier="persistent" delete-action="restrict"> @@ -59,7 +59,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWOCN_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twocn_main_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="twonr" persistence-modifier="persistent" delete-action="restrict"> @@ -67,7 +67,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWONR_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twonr_main_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="twonn" persistence-modifier="persistent" delete-action="restrict"> @@ -75,7 +75,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWONN_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twonn_main_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -150,7 +150,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="main" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="main_id" allows-null="true"/> + <column name="twonn_main_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.MainImpl"/> </field> @@ -166,7 +166,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="main" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="main_id" allows-null="true"/> + <column name="twonr_main_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.MainImpl"/> </field> 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 295d1f75b..46d1f800b 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 Thu Sep 28 21:29:33 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:29 CEST 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 32a272f91..4741ec453 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 Thu Sep 28 21:31:09 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:54 CEST 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"> @@ -28,7 +28,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTGROUP_ACCOUNT_IDX"/> - <column name="account_id" allows-null="true"/> + <column name="accountgroup_account_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -47,7 +47,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTING_ACCOUNTGROUP_IDX"/> - <column name="accountgroup_id" allows-null="true"/> + <column name="accounting_accountgroup_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="vat" persistence-modifier="persistent" delete-action="restrict"> @@ -55,18 +55,18 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTING_VAT_IDX"/> - <column name="vat_id" allows-null="true"/> + <column name="accounting_vat_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="vatAccount" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="vataccount_id" allows-null="true"/> + <column name="balanceaccount_vataccount_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.BalanceAccountImpl"/> </field> <field name="report" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="report_id" allows-null="true"/> + <column name="report_report_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportImpl"/> </field> @@ -75,7 +75,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTING_JOURNALGROUP_IDX"/> - <column name="journalgroup_id" allows-null="true"/> + <column name="accounting_journalgroup_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -106,7 +106,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="JOURNALGROUP_JOURNALGROUPS_IDX"/> - <column name="journalgroups_id" allows-null="true"/> + <column name="journalgroup_journalgroups_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="journalStatements" persistence-modifier="persistent" delete-action="restrict"> @@ -114,7 +114,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="JOURNALGROUP_JOURNALSTATEMENTS_IDX"/> - <column name="journalstatements_id" allows-null="true"/> + <column name="journalgroup_journalstatements_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -132,19 +132,19 @@ <field name="amountESet" persistence-modifier="persistent"/> <field name="debitAccount" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="debitaccount_id" allows-null="false"/> + <column name="account_debitaccount_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl"/> </field> <field name="creditAccount" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="creditaccount_id" allows-null="false"/> + <column name="account_creditaccount_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl"/> </field> <field name="vat" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="vat_id" allows-null="true"/> + <column name="vat_vat_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.VatImpl"/> </field> @@ -167,13 +167,13 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="debitReportGroup" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="debitreportgroup_id" allows-null="false"/> + <column name="reportgroup_debitreportgroup_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportGroupImpl"/> </field> <field name="creditReportGroup" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="creditreportgroup_id" allows-null="false"/> + <column name="reportgroup_creditreportgroup_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportGroupImpl"/> </field> @@ -192,7 +192,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="REPORTGROUP_REPORTGROUP_IDX"/> - <column name="reportgroup_id" allows-null="true"/> + <column name="reportgroup_reportgroup_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="account" persistence-modifier="persistent" delete-action="restrict"> 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 47e64ca27..ad0f5b528 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 Thu Sep 28 21:31:25 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:10 CEST 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"> @@ -19,7 +19,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CATALOGTYPE_SUBCATALOG_IDX"/> - <column name="subcatalog_name" allows-null="true"/> + <column name="catalogtype_subcatalog_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="product" persistence-modifier="persistent" delete-action="restrict"> @@ -27,7 +27,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CATALOGTYPE_PRODUCT_IDX"/> - <column name="product_name" allows-null="true"/> + <column name="catalogtype_product_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -45,7 +45,7 @@ <field name="quantityToESet" persistence-modifier="persistent"/> <field name="supplier" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="supplier_id" allows-null="false"/> + <column name="suppliertype_supplier_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.SupplierTypeImpl"/> </field> @@ -66,12 +66,12 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PRODUCTTYPE_REMARK_IDX"/> - <column name="remark_code" allows-null="true"/> + <column name="producttype_remark_code" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="price" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="price_id" allows-null="false"/> + <column name="pricetype_price_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.PriceTypeImpl"/> </field> 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 0806903c8..716859133 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 Thu Sep 28 21:31:05 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:52 CEST 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"> @@ -43,18 +43,18 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PURCHASEORDER_ITEMS_IDX"/> - <column name="order_id" allows-null="true"/> + <column name="item_order_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="billTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="billto_id" allows-null="false"/> + <column name="address_billto_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.AddressImpl"/> </field> <field name="shipTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="shipto_id" allows-null="true"/> + <column name="address_shipto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.AddressImpl"/> </field> @@ -63,13 +63,13 @@ <field name="status" persistence-modifier="persistent" null-value="none" embedded="true"/> <field name="customer" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="customer_id" allows-null="true"/> + <column name="purchaseorder_customer_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.CustomerImpl"/> </field> <field name="previousOrder" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="previousorder_id" allows-null="true"/> + <column name="purchaseorder_previousorder_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.PurchaseOrderImpl"/> </field> @@ -99,7 +99,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="SUPPLIER_CUSTOMERS_IDX"/> - <column name="customers_id" allows-null="true"/> + <column name="supplier_customers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="orders" persistence-modifier="persistent" delete-action="restrict"> @@ -107,7 +107,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="SUPPLIER_ORDERS_IDX"/> - <column name="orders_id" allows-null="true"/> + <column name="supplier_orders_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -125,7 +125,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CUSTOMER_ORDERS_IDX"/> - <column name="customer_id" allows-null="true"/> + <column name="purchaseorder_customer_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> 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 c64dcecd1..021f9d1d7 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 Thu Sep 28 21:31:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:07 CEST 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"> @@ -18,7 +18,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="FORUM_MEMBERS_IDX"/> - <column name="members_id" allows-null="true"/> + <column name="forum_members_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="topics" persistence-modifier="persistent" delete-action="restrict"> @@ -26,7 +26,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="FORUM_TOPICS_IDX"/> - <column name="topics_id" allows-null="true"/> + <column name="forum_topics_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -44,7 +44,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MEMBER_POSTS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="post_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="created" persistence-modifier="persistent" delete-action="restrict"> @@ -52,7 +52,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MEMBER_CREATED_IDX"/> - <column name="creator_id" allows-null="true"/> + <column name="topic_creator_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -67,13 +67,13 @@ <field name="comment" persistence-modifier="persistent" null-value="exception"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="post_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.MemberImpl"/> </field> <field name="topic" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="topic_id" allows-null="true"/> + <column name="post_topic_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.TopicImpl"/> </field> @@ -91,7 +91,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="creator" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="creator_id" allows-null="true"/> + <column name="topic_creator_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.MemberImpl"/> </field> @@ -100,7 +100,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="TOPIC_POSTS_IDX"/> - <column name="topic_id" allows-null="true"/> + <column name="post_topic_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> 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 6153bae52..d1a131b22 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 Thu Sep 28 21:30:58 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:46 CEST 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"> @@ -16,7 +16,7 @@ <field name="name" persistence-modifier="persistent" null-value="none"/> <field name="base" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="base_id" allows-null="true"/> + <column name="ptype_base_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl"/> </field> @@ -24,7 +24,7 @@ <collection element-type="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl" dependent-element="false"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="base_id" allows-null="true"/> + <column name="ptype_base_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="subNOTypes" persistence-modifier="persistent" table="ptype_ptype" delete-action="restrict"> 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 f724714f3..65146299b 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 Thu Sep 28 21:30:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:36 CEST 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"> @@ -21,7 +21,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -42,7 +42,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -50,7 +50,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -70,7 +70,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> 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 dd2e79f5b..bcf98a8f7 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 Thu Sep 28 21:31:14 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:00 CEST 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"> @@ -17,7 +17,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACTTYPE_SCENE_IDX"/> - <column name="scene_id" allows-null="true"/> + <column name="acttype_scene_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="pindex" persistence-modifier="persistent" null-value="none"/> @@ -103,13 +103,13 @@ <field name="title" persistence-modifier="persistent" null-value="exception"/> <field name="fm" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="fm_id" allows-null="false"/> + <column name="fmtype_fm_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.play.impl.FmTypeImpl"/> </field> <field name="personae" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="personae_id" allows-null="false"/> + <column name="personaetype_personae_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PersonaeTypeImpl"/> </field> @@ -120,7 +120,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PLAYTYPE_ACT_IDX"/> - <column name="act_id" allows-null="true"/> + <column name="playtype_act_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> 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 d74229eb5..73c5e47fd 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 Thu Sep 28 21:31:17 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:03 CEST 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"> @@ -17,7 +17,7 @@ <field name="id" persistence-modifier="persistent" primary-key="true"/> <field name="supplier" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="supplier_id" allows-null="false"/> + <column name="suppliertype_supplier_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.product.impl.SupplierTypeImpl"/> </field> 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 b72f7dabd..b97980b18 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 Thu Sep 28 21:31:20 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:05 CEST 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"> @@ -29,13 +29,13 @@ <version strategy="version-number" column="e_version"/> <field name="shipTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="shipto_id" allows-null="true"/> + <column name="usaddress_shipto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.USAddressImpl"/> </field> <field name="billTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="billto_id" allows-null="false"/> + <column name="usaddress_billto_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.USAddressImpl"/> </field> @@ -45,7 +45,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PURCHASEORDER_ITEMS_IDX"/> - <column name="items_id" allows-null="true"/> + <column name="purchaseorder_items_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="orderDate" persistence-modifier="persistent" null-value="none" serialized="true"/> 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 8818726a7..9d2713d4c 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 Thu Sep 28 21:31:03 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:50 CEST 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"> @@ -17,7 +17,7 @@ <field name="category" persistence-modifier="persistent" null-value="none" embedded="true"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.WriterImpl"/> </field> @@ -36,7 +36,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -44,7 +44,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -62,7 +62,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> 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 1bb65e5c1..5bead5d21 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 Thu Sep 28 21:30:53 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:41 CEST 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"> @@ -33,7 +33,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOKSTYPE_BOOK_IDX"/> - <column name="book_id" allows-null="true"/> + <column name="bookstype_book_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -51,14 +51,14 @@ <field name="price" persistence-modifier="persistent" null-value="exception"/> <field name="authors" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="authors_id" allows-null="false"/> + <column name="authorstype_authors_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.AuthorsTypeImpl"/> </field> <field name="description" persistence-modifier="persistent" null-value="none"/> <field name="promotion" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="promotion_id" allows-null="false"/> + <column name="promotiontype_promotion_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.PromotionTypeImpl"/> </field> @@ -77,7 +77,7 @@ <version strategy="version-number" column="e_version"/> <field name="books" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="books_id" allows-null="false"/> + <column name="bookstype_books_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.BooksTypeImpl"/> </field> 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 bdceeeadd..d24e4f8fc 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 Thu Sep 28 21:30:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:38 CEST 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"> @@ -15,7 +15,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOW_NODES_IDX"/> - <column name="workflow_id" allows-null="true"/> + <column name="workflownode_workflow_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="edges" persistence-modifier="persistent" delete-action="restrict"> @@ -23,7 +23,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOW_EDGES_IDX"/> - <column name="workflow_id" allows-null="true"/> + <column name="edge_workflow_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="comments" persistence-modifier="persistent" delete-action="restrict"> @@ -31,7 +31,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOW_COMMENTS_IDX"/> - <column name="workflow_id" allows-null="true"/> + <column name="comment_workflow_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOWNODE_OUTPUTS_IDX"/> - <column name="node_id" allows-null="true"/> + <column name="outputport_node_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="inputs" persistence-modifier="persistent" delete-action="restrict"> @@ -54,7 +54,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOWNODE_INPUTS_IDX"/> - <column name="node_id" allows-null="true"/> + <column name="inputport_node_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="isStart" persistence-modifier="persistent" null-value="none"/> @@ -68,13 +68,13 @@ <version strategy="version-number" column="e_version"/> <field name="target" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="target_id" allows-null="true"/> + <column name="edge_target_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.InputPortImpl"/> </field> <field name="source" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="source_id" allows-null="true"/> + <column name="edge_source_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.OutputPortImpl"/> </field> @@ -90,7 +90,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="INPUTPORT_EDGES_IDX"/> - <column name="target_id" allows-null="true"/> + <column name="edge_target_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -105,7 +105,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="OUTPUTPORT_EDGES_IDX"/> - <column name="source_id" allows-null="true"/> + <column name="edge_source_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -124,7 +124,7 @@ <version strategy="version-number" column="e_version"/> <field name="subworkflow" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="subworkflow_id" allows-null="true"/> + <column name="workflow_subworkflow_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowImpl"/> </field> 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 a918cf94e..59ab8cdae 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 Thu Sep 28 21:32:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:22 CEST 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"> @@ -19,7 +19,7 @@ <field name="lonESet" persistence-modifier="persistent"/> <field name="myB" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="myb_id" allows-null="false"/> + <column name="b_myb_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.BImpl"/> </field> @@ -52,7 +52,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <join> - <column name="multianytype_id" allows-null="true"/> + <column name="testany_multianytype_id" allows-null="true"/> </join> <element> <embedded> 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 2c75ad5c1..62dccc1b2 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 Thu Sep 28 21:32:37 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:10 CEST 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"> @@ -23,7 +23,7 @@ <field name="d" persistence-modifier="persistent" null-value="exception"/> <field name="myR" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="myr_id" allows-null="true"/> + <column name="r_myr_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.RImpl"/> </field> 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 ff1ed396d..973ddfb77 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 Thu Sep 28 21:32:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:56 CEST 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 aa8476097..f0e285426 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 Thu Sep 28 21:32:12 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:47 CEST 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"> @@ -18,7 +18,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOK_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="book_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="keyWords" persistence-modifier="persistent" delete-action="restrict"> @@ -26,7 +26,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOK_KEYWORDS_IDX"/> - <column name="keywords_id" allows-null="true"/> + <column name="book_keywords_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="cityByWriter" persistence-modifier="persistent" delete-action="restrict"> @@ -34,7 +34,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOK_CITYBYWRITER_IDX"/> - <column name="citybywriter_id" allows-null="true"/> + <column name="book_citybywriter_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -56,7 +56,7 @@ <field name="key" persistence-modifier="persistent" null-value="none"/> <field name="value" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="value_id" allows-null="true"/> + <column name="writer_value_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl"/> </field> @@ -79,7 +79,7 @@ <version strategy="version-number" column="e_version"/> <field name="key" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="key_id" allows-null="true"/> + <column name="writer_key_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl"/> </field> 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 6808f7fca..7d5f8de12 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 Thu Sep 28 21:32:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:05 CEST 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"> @@ -27,7 +27,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="firstAddress" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="firstaddress_id" allows-null="false"/> + <column name="firstaddressholder_firstaddress_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl"/> </field> @@ -36,7 +36,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ADDRESSLIST_SECONDADDRESS_IDX"/> - <column name="secondaddress_id" allows-null="true"/> + <column name="addresslist_secondaddress_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -62,7 +62,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="FIRSTADDRESSHOLDER_VALUE_IDX"/> - <column name="value_id" allows-null="true"/> + <column name="firstaddressholder_value_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> 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 8cf280269..bac58ecf4 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 Thu Sep 28 21:32:43 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:14 CEST 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"> @@ -50,13 +50,13 @@ <field name="groupName" persistence-modifier="persistent" null-value="exception"/> <field name="shipTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="shipto_id" allows-null="true"/> + <column name="address_shipto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl"/> </field> <field name="billTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="billto_id" allows-null="true"/> + <column name="address_billto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl"/> </field> 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 02d30877b..f57126ee7 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 Thu Sep 28 21:32:18 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:52 CEST 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 5562dec12..2b19c70d2 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 Thu Sep 28 21:32:20 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:54 CEST 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 6d3b1cc7a..3a51b9ac9 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 Thu Sep 28 21:32:28 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:02 CEST 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 23c1dec7f..17b80a7a9 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 Thu Sep 28 21:32:25 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:58 CEST 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 a1fbc2efe..04a47b8a5 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 Thu Sep 28 21:32:34 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:07 CEST 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 c5af68773..6c41ec4ac 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 Thu Sep 28 21:32:40 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:12 CEST 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 2b307b26a..c6fe861c9 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 Thu Sep 28 21:32:15 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:49 CEST 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 a73c03c2f..1b7a194f2 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 Thu Sep 28 21:32:45 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:17 CEST 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 908bc9c6a..8be917c1f 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 Thu Sep 28 21:32:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:19 CEST 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 3adfb039b..ad2b8178e 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 Thu Sep 28 21:33:33 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:59:01 CEST 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"> @@ -18,7 +18,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ADDRESS_COUNTRY_IDX"/> - <column name="country_id" allows-null="true"/> + <column name="address_country_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -36,7 +36,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CITY_ADDRESS_IDX"/> - <column name="address_id" allows-null="true"/> + <column name="city_address_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -54,7 +54,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PERSON_ADDRESS_IDX"/> - <column name="address_id" allows-null="true"/> + <column name="person_address_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> 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 dc975a795..b3df71e81 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 Thu Sep 28 21:33:24 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:52 CEST 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"> @@ -15,13 +15,13 @@ <field name="name" persistence-modifier="persistent" primary-key="true"/> <field name="father" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="father_name" allows-null="true"/> + <column name="person_father_name" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl.PersonImpl"/> </field> <field name="mother" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="mother_name" allows-null="true"/> + <column name="person_mother_name" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl.PersonImpl"/> </field> 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 d6ceab365..ae72331c4 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 Thu Sep 28 21:33:27 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:56 CEST 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 56bf30680..96182aa6d 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 Thu Sep 28 21:33:21 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:49 CEST 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"> @@ -56,7 +56,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="THING_THINGS_IDX"/> - <column name="things_name" allows-null="true"/> + <column name="thing_things_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> 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 6be140f8d..a738bf5aa 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 Thu Sep 28 21:33:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:58 CEST 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 5a796b8b7..8287386dd 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 Thu Sep 28 21:33:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:59:04 CEST 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/associationoverride/model/AssociationOverride.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/associationoverride/model/AssociationOverride.xsd index b62aba852..f9e712532 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/associationoverride/model/AssociationOverride.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/associationoverride/model/AssociationOverride.xsd @@ -11,7 +11,7 @@ <xsd:complexType name="Person">
<xsd:annotation>
- <xsd:appinfo source="http://annotation.elver.org/MappedSuperclass">true</xsd:appinfo>
+ <xsd:appinfo source="teneo.jpa">@MappedSuperclass</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="id" type="xsd:long">
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/Item.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/Item.java index 7fdef8c01..905b3282f 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/Item.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/Item.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Item.java,v 1.1 2006/07/11 16:57:04 mtaal Exp $ + * $Id: Item.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.duplicates; @@ -65,8 +65,8 @@ public interface Item extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Child Item</em>' containment reference list. * @see org.eclipse.emf.teneo.samples.emf.annotations.duplicates.DuplicatesPackage#getItem_ChildItem() - * @model type="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.ChildItem" containment="true" resolveProxies="false" required="true" - * annotation="http://facet.elver.org/List unique='false'" + * @model type="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.ChildItem" containment="true" required="true" + * annotation="teneo.jpa appinfo='@OneToMany(unique=true)'" * extendedMetaData="kind='element' name='childItem'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/impl/DuplicatesPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/impl/DuplicatesPackageImpl.java index 8c7f4745a..43e732647 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/impl/DuplicatesPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/impl/DuplicatesPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DuplicatesPackageImpl.java,v 1.1 2006/07/11 16:57:03 mtaal Exp $ + * $Id: DuplicatesPackageImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl; @@ -235,8 +235,8 @@ public class DuplicatesPackageImpl extends EPackageImpl implements DuplicatesPac // Create annotations // http:///org/eclipse/emf/ecore/util/ExtendedMetaData createExtendedMetaDataAnnotations(); - // http://facet.elver.org/List - createListAnnotations(); + // teneo.jpa + createTeneoAnnotations(); } /** @@ -285,18 +285,18 @@ public class DuplicatesPackageImpl extends EPackageImpl implements DuplicatesPac } /** - * Initializes the annotations for <b>http://facet.elver.org/List</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createListAnnotations() { - String source = "http://facet.elver.org/List"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (getItem_ChildItem(), source, new String[] { - "unique", "false" + "appinfo", "@OneToMany(unique=true)" }); } diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.ecore index dba6e1467..bbe437b11 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.ecore @@ -30,8 +30,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="childItem" lowerBound="1" upperBound="-1" eType="#//ChildItem" containment="true" resolveProxies="false"> - <eAnnotations source="http://facet.elver.org/List"> - <details key="unique" value="false"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@OneToMany(unique=true)"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.xsd index 152388dd0..bdadfb754 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.xsd @@ -17,7 +17,7 @@ <xsd:element name="name" type="xsd:string"/> <xsd:element name="childItem" type="this:ChildItem" maxOccurs="unbounded"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Unique">false</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@OneToMany(unique=true)</xsd:appinfo> </xsd:annotation> </xsd:element> </xsd:sequence> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/Embeddable.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/Embeddable.java index 625b60444..8c08ef591 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/Embeddable.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/Embeddable.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Embeddable.java,v 1.2 2006/09/07 10:06:30 mtaal Exp $ + * $Id: Embeddable.java,v 1.3 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.embedded; @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject; * </p> * * @see org.eclipse.emf.teneo.samples.emf.annotations.embedded.EmbeddedPackage#getEmbeddable() - * @model annotation="http://annotation.elver.org/Embeddable appinfo='true'" + * @model annotation="teneo.jpa appinfo='@Embeddable'" * extendedMetaData="name='Embeddable' kind='elementOnly'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/impl/EmbeddedPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/impl/EmbeddedPackageImpl.java index ff45d5151..72e72626f 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/impl/EmbeddedPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/impl/EmbeddedPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: EmbeddedPackageImpl.java,v 1.3 2006/09/05 12:16:35 mtaal Exp $ + * $Id: EmbeddedPackageImpl.java,v 1.4 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl; @@ -277,28 +277,10 @@ public class EmbeddedPackageImpl extends EPackageImpl implements EmbeddedPackage createResource(eNS_URI); // Create annotations - // http://annotation.elver.org/Embeddable - createEmbeddableAnnotations(); - // http:///org/eclipse/emf/ecore/util/ExtendedMetaData - createExtendedMetaDataAnnotations(); // teneo.jpa createTeneoAnnotations(); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/Embeddable</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createEmbeddableAnnotations() { - String source = "http://annotation.elver.org/Embeddable"; - addAnnotation - (embeddableEClass, - source, - new String[] { - "appinfo", "true" - }); + // http:///org/eclipse/emf/ecore/util/ExtendedMetaData + createExtendedMetaDataAnnotations(); } /** @@ -381,7 +363,13 @@ public class EmbeddedPackageImpl extends EPackageImpl implements EmbeddedPackage * @generated */ protected void createTeneoAnnotations() { - String source = "teneo.jpa"; + String source = "teneo.jpa"; + addAnnotation + (embeddableEClass, + source, + new String[] { + "appinfo", "@Embeddable" + }); addAnnotation (getEmbedder_FirstEmbedded(), source, diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.ecore index 4df2a2b2b..edc73eb08 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.ecore @@ -4,8 +4,8 @@ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="embedded" nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/embedded" nsPrefix="embedded"> <eClassifiers xsi:type="ecore:EClass" name="Embeddable"> - <eAnnotations source="http://annotation.elver.org/Embeddable"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Embeddable"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Embeddable"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.xsd index 9f8805a5d..639ca7bfa 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.xsd @@ -51,7 +51,7 @@ <xsd:complexType name="Embeddable"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Embeddable">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Embeddable</xsd:appinfo> </xsd:annotation> <xsd:sequence> <xsd:element name="myString" type="xsd:string"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidFactory.java index 61d869493..d81977991 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidFactory.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidFactory.java @@ -2,54 +2,54 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidFactory.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: EmbeddedidFactory.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid;
import org.eclipse.emf.ecore.EFactory;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage + * @generated */
public interface EmbeddedidFactory extends EFactory {
- /**
- * The singleton instance of the factory.
+ /** + * The singleton instance of the factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EmbeddedidFactory eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidFactoryImpl.init();
- /**
- * Returns a new object of class '<em>Name</em>'.
+ /** + * Returns a new object of class '<em>Name</em>'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return a new object of class '<em>Name</em>'.
- * @generated
+ * @return a new object of class '<em>Name</em>'. + * @generated */
- Name createName();
-
- /**
- * Returns a new object of class '<em>Person</em>'.
+ Name createName(); + + /** + * Returns a new object of class '<em>Person</em>'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return a new object of class '<em>Person</em>'.
- * @generated
+ * @return a new object of class '<em>Person</em>'. + * @generated */
- Person createPerson();
-
- /**
- * Returns the package supported by this factory.
+ Person createPerson(); + + /** + * Returns the package supported by this factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
+ * @return the package supported by this factory. + * @generated */
- EmbeddedidPackage getEmbeddedidPackage();
-
+ EmbeddedidPackage getEmbeddedidPackage(); + } //EmbeddedidFactory
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidPackage.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidPackage.java index 63f29473e..e3f41e938 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidPackage.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidPackage.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidPackage.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: EmbeddedidPackage.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid;
@@ -11,7 +11,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Package</b> for the model.
* It contains accessors for the meta objects to represent
@@ -22,192 +22,192 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidFactory
- * @model kind="package"
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidFactory + * @model kind="package" + * @generated */
public interface EmbeddedidPackage extends EPackage {
- /**
- * The package name.
+ /** + * The package name. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
String eNAME = "embeddedid";
- /**
- * The package namespace URI.
+ /** + * The package namespace URI. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
String eNS_URI = "http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid";
- /**
- * The package namespace name.
+ /** + * The package namespace name. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
String eNS_PREFIX = "embeddedid";
- /**
- * The singleton instance of the package.
+ /** + * The singleton instance of the package. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EmbeddedidPackage eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl.init();
- /**
- * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl <em>Name</em>}' class.
+ /** + * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl <em>Name</em>}' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getName_()
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getName_() + * @generated */
int NAME = 0;
- /**
- * The feature id for the '<em><b>First Name</b></em>' attribute.
+ /** + * The feature id for the '<em><b>First Name</b></em>' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int NAME__FIRST_NAME = 0;
- /**
- * The feature id for the '<em><b>Last Name</b></em>' attribute.
+ /** + * The feature id for the '<em><b>Last Name</b></em>' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int NAME__LAST_NAME = 1;
- /**
- * The number of structural features of the '<em>Name</em>' class.
+ /** + * The number of structural features of the '<em>Name</em>' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int NAME_FEATURE_COUNT = 2;
- /**
- * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl <em>Person</em>}' class.
+ /** + * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl <em>Person</em>}' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getPerson()
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getPerson() + * @generated */
int PERSON = 1;
- /**
- * The feature id for the '<em><b>Name</b></em>' containment reference.
+ /** + * The feature id for the '<em><b>Name</b></em>' containment reference. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON__NAME = 0;
- /**
- * The feature id for the '<em><b>Address</b></em>' attribute.
+ /** + * The feature id for the '<em><b>Address</b></em>' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON__ADDRESS = 1;
- /**
- * The number of structural features of the '<em>Person</em>' class.
+ /** + * The number of structural features of the '<em>Person</em>' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON_FEATURE_COUNT = 2;
- /**
- * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name <em>Name</em>}'.
+ /** + * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name <em>Name</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Name</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name
- * @generated
+ * @return the meta object for class '<em>Name</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name + * @generated */
- EClass getName_();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName <em>First Name</em>}'.
+ EClass getName_(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName <em>First Name</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>First Name</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName()
- * @see #getName_()
- * @generated
+ * @return the meta object for the attribute '<em>First Name</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName() + * @see #getName_() + * @generated */
- EAttribute getName_FirstName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName <em>Last Name</em>}'.
+ EAttribute getName_FirstName(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName <em>Last Name</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Last Name</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName()
- * @see #getName_()
- * @generated
+ * @return the meta object for the attribute '<em>Last Name</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName() + * @see #getName_() + * @generated */
- EAttribute getName_LastName();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person <em>Person</em>}'.
+ EAttribute getName_LastName(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person <em>Person</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Person</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person
- * @generated
+ * @return the meta object for class '<em>Person</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person + * @generated */
- EClass getPerson();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName <em>Name</em>}'.
+ EClass getPerson(); + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName <em>Name</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Name</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName()
- * @see #getPerson()
- * @generated
+ * @return the meta object for the containment reference '<em>Name</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName() + * @see #getPerson() + * @generated */
- EReference getPerson_Name();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress <em>Address</em>}'.
+ EReference getPerson_Name(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress <em>Address</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Address</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress()
- * @see #getPerson()
- * @generated
+ * @return the meta object for the attribute '<em>Address</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress() + * @see #getPerson() + * @generated */
- EAttribute getPerson_Address();
-
- /**
- * Returns the factory that creates the instances of the model.
+ EAttribute getPerson_Address(); + + /** + * Returns the factory that creates the instances of the model. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the factory that creates the instances of the model.
- * @generated
+ * @return the factory that creates the instances of the model. + * @generated */
- EmbeddedidFactory getEmbeddedidFactory();
-
- /**
+ EmbeddedidFactory getEmbeddedidFactory(); + + /** * <!-- begin-user-doc -->
* Defines literals for the meta objects that represent
* <ul>
@@ -217,58 +217,58 @@ public interface EmbeddedidPackage extends EPackage { * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl <em>Name</em>}' class.
+ interface Literals {
+ /** + * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl <em>Name</em>}' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getName_()
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getName_() + * @generated */
EClass NAME = eINSTANCE.getName_();
- /**
- * The meta object literal for the '<em><b>First Name</b></em>' attribute feature.
+ /** + * The meta object literal for the '<em><b>First Name</b></em>' attribute feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EAttribute NAME__FIRST_NAME = eINSTANCE.getName_FirstName();
- /**
- * The meta object literal for the '<em><b>Last Name</b></em>' attribute feature.
+ /** + * The meta object literal for the '<em><b>Last Name</b></em>' attribute feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EAttribute NAME__LAST_NAME = eINSTANCE.getName_LastName();
- /**
- * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl <em>Person</em>}' class.
+ /** + * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl <em>Person</em>}' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getPerson()
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getPerson() + * @generated */
EClass PERSON = eINSTANCE.getPerson();
- /**
- * The meta object literal for the '<em><b>Name</b></em>' containment reference feature.
+ /** + * The meta object literal for the '<em><b>Name</b></em>' containment reference feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EReference PERSON__NAME = eINSTANCE.getPerson_Name();
- /**
- * The meta object literal for the '<em><b>Address</b></em>' attribute feature.
+ /** + * The meta object literal for the '<em><b>Address</b></em>' attribute feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EAttribute PERSON__ADDRESS = eINSTANCE.getPerson_Address();
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Name.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Name.java index 5a638f15c..0a76be604 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Name.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Name.java @@ -2,84 +2,84 @@ * <copyright>
* </copyright>
*
- * $Id: Name.java,v 1.2 2006/07/22 13:01:17 mtaal Exp $
+ * $Id: Name.java,v 1.3 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid;
import java.io.Serializable;
-/**
+/** * <!-- begin-user-doc -->
* A representation of the model object '<em><b>Name</b></em>'.
* <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName <em>First Name</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName <em>Last Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getName_()
- * @model annotation="http://annotation.elver.org/Embeddable appinfo='true'"
- * extendedMetaData="name='Name' kind='elementOnly'"
- * @extends Serializable
- * @generated
+ * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName <em>First Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName <em>Last Name</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getName_() + * @model annotation="teneo.jpa appinfo='@Embeddable'" + * extendedMetaData="name='Name' kind='elementOnly'" + * @extends Serializable + * @generated */
public interface Name extends Serializable {
- /**
- * Returns the value of the '<em><b>First Name</b></em>' attribute.
+ /** + * Returns the value of the '<em><b>First Name</b></em>' attribute. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>First Name</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>First Name</em>' attribute.
- * @see #setFirstName(String)
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getName_FirstName()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
- * extendedMetaData="kind='element' name='firstName'"
- * @generated
+ * @return the value of the '<em>First Name</em>' attribute. + * @see #setFirstName(String) + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getName_FirstName() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * extendedMetaData="kind='element' name='firstName'" + * @generated */
- String getFirstName();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName <em>First Name</em>}' attribute.
+ String getFirstName(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName <em>First Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>First Name</em>' attribute.
- * @see #getFirstName()
- * @generated
+ * @param value the new value of the '<em>First Name</em>' attribute. + * @see #getFirstName() + * @generated */
- void setFirstName(String value);
-
- /**
- * Returns the value of the '<em><b>Last Name</b></em>' attribute.
+ void setFirstName(String value); + + /** + * Returns the value of the '<em><b>Last Name</b></em>' attribute. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Last Name</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Last Name</em>' attribute.
- * @see #setLastName(String)
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getName_LastName()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
- * extendedMetaData="kind='element' name='lastName'"
- * @generated
+ * @return the value of the '<em>Last Name</em>' attribute. + * @see #setLastName(String) + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getName_LastName() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * extendedMetaData="kind='element' name='lastName'" + * @generated */
- String getLastName();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName <em>Last Name</em>}' attribute.
+ String getLastName(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName <em>Last Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Last Name</em>' attribute.
- * @see #getLastName()
- * @generated
+ * @param value the new value of the '<em>Last Name</em>' attribute. + * @see #getLastName() + * @generated */
- void setLastName(String value);
-
+ void setLastName(String value); + } // Name
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Person.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Person.java index 875246686..18d052311 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Person.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Person.java @@ -2,85 +2,85 @@ * <copyright>
* </copyright>
*
- * $Id: Person.java,v 1.2 2006/07/22 13:01:17 mtaal Exp $
+ * $Id: Person.java,v 1.3 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid;
import java.io.Serializable;
-/**
+/** * <!-- begin-user-doc -->
* A representation of the model object '<em><b>Person</b></em>'.
* <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress <em>Address</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getPerson()
- * @model extendedMetaData="name='Person' kind='elementOnly'"
- * @extends Serializable
- * @generated
+ * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress <em>Address</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getPerson() + * @model extendedMetaData="name='Person' kind='elementOnly'" + * @extends Serializable + * @generated */
public interface Person extends Serializable {
- /**
- * Returns the value of the '<em><b>Name</b></em>' containment reference.
+ /** + * Returns the value of the '<em><b>Name</b></em>' containment reference. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Name</em>' containment reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Name</em>' containment reference.
- * @see #setName(Name)
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getPerson_Name()
- * @model containment="true" resolveProxies="false" required="true"
- * annotation="http://annotation.elver.org/EmbeddedId appinfo='true'"
- * extendedMetaData="kind='element' name='name'"
- * @generated
+ * @return the value of the '<em>Name</em>' containment reference. + * @see #setName(Name) + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getPerson_Name() + * @model containment="true" required="true" + * annotation="teneo.jpa appinfo='@EmbeddedId'" + * extendedMetaData="kind='element' name='name'" + * @generated */
- Name getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName <em>Name</em>}' containment reference.
+ Name getName(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName <em>Name</em>}' containment reference. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' containment reference.
- * @see #getName()
- * @generated
+ * @param value the new value of the '<em>Name</em>' containment reference. + * @see #getName() + * @generated */
- void setName(Name value);
-
- /**
- * Returns the value of the '<em><b>Address</b></em>' attribute.
+ void setName(Name value); + + /** + * Returns the value of the '<em><b>Address</b></em>' attribute. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Address</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Address</em>' attribute.
- * @see #setAddress(String)
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getPerson_Address()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
- * annotation="http://annotation.elver.org/Lob appinfo='true'"
- * extendedMetaData="kind='element' name='address'"
- * @generated
+ * @return the value of the '<em>Address</em>' attribute. + * @see #setAddress(String) + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getPerson_Address() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" + * annotation="teneo.jpa appinfo='@Lob'" + * extendedMetaData="kind='element' name='address'" + * @generated */
- String getAddress();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress <em>Address</em>}' attribute.
+ String getAddress(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress <em>Address</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Address</em>' attribute.
- * @see #getAddress()
- * @generated
+ * @param value the new value of the '<em>Address</em>' attribute. + * @see #getAddress() + * @generated */
- void setAddress(String value);
-
+ void setAddress(String value); + } // Person
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidFactoryImpl.java index 0bdc7feaf..52a2557f2 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidFactoryImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidFactoryImpl.java,v 1.1 2006/07/11 16:57:18 mtaal Exp $
+ * $Id: EmbeddedidFactoryImpl.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl;
@@ -16,93 +16,93 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.*;
-/**
+/** * <!-- begin-user-doc -->
* An implementation of the model <b>Factory</b>.
* <!-- end-user-doc -->
- * @generated
+ * @generated */
public class EmbeddedidFactoryImpl extends EFactoryImpl implements EmbeddedidFactory {
- /**
- * Creates the default factory implementation.
+ /** + * Creates the default factory implementation. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public static EmbeddedidFactory init() {
- try {
- EmbeddedidFactory theEmbeddedidFactory = (EmbeddedidFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid");
- if (theEmbeddedidFactory != null) {
- return theEmbeddedidFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new EmbeddedidFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
+ public static EmbeddedidFactory init() { + try { + EmbeddedidFactory theEmbeddedidFactory = (EmbeddedidFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid"); + if (theEmbeddedidFactory != null) { + return theEmbeddedidFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new EmbeddedidFactoryImpl(); + } + + /** + * Creates an instance of the factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EmbeddedidFactoryImpl() {
- super();
- }
-
- /**
+ public EmbeddedidFactoryImpl() { + super(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case EmbeddedidPackage.NAME: return (EObject)createName();
- case EmbeddedidPackage.PERSON: return (EObject)createPerson();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
- }
- }
-
- /**
+ public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case EmbeddedidPackage.NAME: return (EObject)createName(); + case EmbeddedidPackage.PERSON: return (EObject)createPerson(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Name createName() {
- NameImpl name = new NameImpl();
- return name;
- }
-
- /**
+ public Name createName() { + NameImpl name = new NameImpl(); + return name; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Person createPerson() {
- PersonImpl person = new PersonImpl();
- return person;
- }
-
- /**
+ public Person createPerson() { + PersonImpl person = new PersonImpl(); + return person; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EmbeddedidPackage getEmbeddedidPackage() {
- return (EmbeddedidPackage)getEPackage();
- }
-
- /**
+ public EmbeddedidPackage getEmbeddedidPackage() { + return (EmbeddedidPackage)getEPackage(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @deprecated
- * @generated
+ * @deprecated + * @generated */
- public static EmbeddedidPackage getPackage() {
- return EmbeddedidPackage.eINSTANCE;
- }
-
+ public static EmbeddedidPackage getPackage() { + return EmbeddedidPackage.eINSTANCE; + } + } //EmbeddedidFactoryImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidPackageImpl.java index 06c334bfe..fc230bfd0 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidPackageImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidPackageImpl.java,v 1.1 2006/07/11 16:57:18 mtaal Exp $
+ * $Id: EmbeddedidPackageImpl.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl;
@@ -20,338 +20,314 @@ import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackag import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name;
import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person;
-/**
+/** * <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
* <!-- end-user-doc -->
- * @generated
+ * @generated */
public class EmbeddedidPackageImpl extends EPackageImpl implements EmbeddedidPackage {
- /**
+ /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private EClass nameEClass = null;
- /**
+ /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private EClass personEClass = 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.
- * <p>Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
+ /** + * 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. + * <p>Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#eNS_URI
- * @see #init()
- * @generated
+ * @see org.eclipse.emf.ecore.EPackage.Registry + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#eNS_URI + * @see #init() + * @generated */
- private EmbeddedidPackageImpl() {
- super(eNS_URI, EmbeddedidFactory.eINSTANCE);
- }
-
- /**
+ private EmbeddedidPackageImpl() { + super(eNS_URI, EmbeddedidFactory.eINSTANCE); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private static boolean isInited = false;
- /**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
+ /** + * Creates, registers, and initializes the <b>Package</b> for this + * model, and for any others upon which it depends. Simple + * dependencies are satisfied by calling this method on all + * dependent packages before doing anything else. This method drives + * initialization for interdependent packages directly, in parallel + * with this package, itself. + * <p>Of this package and its interdependencies, all packages which + * have not yet been registered by their URI values are first created + * and registered. The packages are then initialized in two steps: + * meta-model objects for all of the packages are created before any + * are initialized, since one package's meta-model objects may refer to + * those of another. + * <p>Invocation of this method will not affect any packages that have + * already been initialized. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
+ * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated */
- public static EmbeddedidPackage init() {
- if (isInited) return (EmbeddedidPackage)EPackage.Registry.INSTANCE.getEPackage(EmbeddedidPackage.eNS_URI);
-
- // Obtain or create and register package
- EmbeddedidPackageImpl theEmbeddedidPackage = (EmbeddedidPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EmbeddedidPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EmbeddedidPackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- XMLTypePackage.eINSTANCE.eClass();
-
- // Create package meta-data objects
- theEmbeddedidPackage.createPackageContents();
-
- // Initialize created meta-data
- theEmbeddedidPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theEmbeddedidPackage.freeze();
-
- return theEmbeddedidPackage;
- }
-
- /**
+ public static EmbeddedidPackage init() { + if (isInited) return (EmbeddedidPackage)EPackage.Registry.INSTANCE.getEPackage(EmbeddedidPackage.eNS_URI); + + // Obtain or create and register package + EmbeddedidPackageImpl theEmbeddedidPackage = (EmbeddedidPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EmbeddedidPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EmbeddedidPackageImpl()); + + isInited = true; + + // Initialize simple dependencies + XMLTypePackage.eINSTANCE.eClass(); + + // Create package meta-data objects + theEmbeddedidPackage.createPackageContents(); + + // Initialize created meta-data + theEmbeddedidPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theEmbeddedidPackage.freeze(); + + return theEmbeddedidPackage; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EClass getName_() {
- return nameEClass;
- }
-
- /**
+ public EClass getName_() { + return nameEClass; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EAttribute getName_FirstName() {
- return (EAttribute)nameEClass.getEStructuralFeatures().get(0);
- }
-
- /**
+ public EAttribute getName_FirstName() { + return (EAttribute)nameEClass.getEStructuralFeatures().get(0); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EAttribute getName_LastName() {
- return (EAttribute)nameEClass.getEStructuralFeatures().get(1);
- }
-
- /**
+ public EAttribute getName_LastName() { + return (EAttribute)nameEClass.getEStructuralFeatures().get(1); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EClass getPerson() {
- return personEClass;
- }
-
- /**
+ public EClass getPerson() { + return personEClass; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EReference getPerson_Name() {
- return (EReference)personEClass.getEStructuralFeatures().get(0);
- }
-
- /**
+ public EReference getPerson_Name() { + return (EReference)personEClass.getEStructuralFeatures().get(0); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EAttribute getPerson_Address() {
- return (EAttribute)personEClass.getEStructuralFeatures().get(1);
- }
-
- /**
+ public EAttribute getPerson_Address() { + return (EAttribute)personEClass.getEStructuralFeatures().get(1); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EmbeddedidFactory getEmbeddedidFactory() {
- return (EmbeddedidFactory)getEFactoryInstance();
- }
-
- /**
+ public EmbeddedidFactory getEmbeddedidFactory() { + return (EmbeddedidFactory)getEFactoryInstance(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private boolean isCreated = false;
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
+ /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void createPackageContents() {
- if (isCreated) return;
- isCreated = true;
-
- // Create classes and their features
- nameEClass = createEClass(NAME);
- createEAttribute(nameEClass, NAME__FIRST_NAME);
- createEAttribute(nameEClass, NAME__LAST_NAME);
-
- personEClass = createEClass(PERSON);
- createEReference(personEClass, PERSON__NAME);
- createEAttribute(personEClass, PERSON__ADDRESS);
- }
-
- /**
+ public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + nameEClass = createEClass(NAME); + createEAttribute(nameEClass, NAME__FIRST_NAME); + createEAttribute(nameEClass, NAME__LAST_NAME); + + personEClass = createEClass(PERSON); + createEReference(personEClass, PERSON__NAME); + createEAttribute(personEClass, PERSON__ADDRESS); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private boolean isInitialized = false;
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
+ /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void initializePackageContents() {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Obtain other dependent packages
- XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(nameEClass, Name.class, "Name", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getName_FirstName(), theXMLTypePackage.getString(), "firstName", null, 1, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getName_LastName(), theXMLTypePackage.getString(), "lastName", null, 1, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(personEClass, Person.class, "Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPerson_Name(), this.getName_(), null, "name", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPerson_Address(), theXMLTypePackage.getString(), "address", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http://annotation.elver.org/Embeddable
- createEmbeddableAnnotations();
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
- // http://annotation.elver.org/EmbeddedId
- createEmbeddedIdAnnotations();
- // http://annotation.elver.org/Lob
- createLobAnnotations();
- }
-
- /**
- * Initializes the annotations for <b>http://annotation.elver.org/Embeddable</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createEmbeddableAnnotations() {
- String source = "http://annotation.elver.org/Embeddable";
- addAnnotation
- (nameEClass,
- source,
- new String[] {
- "appinfo", "true"
- });
- }
-
- /**
- * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createExtendedMetaDataAnnotations() {
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
- addAnnotation
- (nameEClass,
- source,
- new String[] {
- "name", "Name",
- "kind", "elementOnly"
- });
- addAnnotation
- (getName_FirstName(),
- source,
- new String[] {
- "kind", "element",
- "name", "firstName"
- });
- addAnnotation
- (getName_LastName(),
- source,
- new String[] {
- "kind", "element",
- "name", "lastName"
- });
- addAnnotation
- (personEClass,
- source,
- new String[] {
- "name", "Person",
- "kind", "elementOnly"
- });
- addAnnotation
- (getPerson_Name(),
- source,
- new String[] {
- "kind", "element",
- "name", "name"
- });
- addAnnotation
- (getPerson_Address(),
- source,
- new String[] {
- "kind", "element",
- "name", "address"
- });
- }
-
- /**
- * Initializes the annotations for <b>http://annotation.elver.org/EmbeddedId</b>.
+ public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Obtain other dependent packages + XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI); + + // Add supertypes to classes + + // Initialize classes and features; add operations and parameters + initEClass(nameEClass, Name.class, "Name", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getName_FirstName(), theXMLTypePackage.getString(), "firstName", null, 1, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getName_LastName(), theXMLTypePackage.getString(), "lastName", null, 1, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(personEClass, Person.class, "Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getPerson_Name(), this.getName_(), null, "name", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPerson_Address(), theXMLTypePackage.getString(), "address", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + // Create resource + createResource(eNS_URI); + + // Create annotations + // teneo.jpa + createTeneoAnnotations(); + // http:///org/eclipse/emf/ecore/util/ExtendedMetaData + createExtendedMetaDataAnnotations(); + } + + /** + * Initializes the annotations for <b>teneo.jpa</b>. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; + addAnnotation + (nameEClass, + source, + new String[] { + "appinfo", "@Embeddable" + }); + addAnnotation + (getPerson_Name(), + source, + new String[] { + "appinfo", "@EmbeddedId" + }); + addAnnotation + (getPerson_Address(), + source, + new String[] { + "appinfo", "@Lob" + }); + } + + /** + * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected void createEmbeddedIdAnnotations() {
- String source = "http://annotation.elver.org/EmbeddedId";
- addAnnotation
- (getPerson_Name(),
- source,
- new String[] {
- "appinfo", "true"
- });
- }
-
- /**
- * Initializes the annotations for <b>http://annotation.elver.org/Lob</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createLobAnnotations() {
- String source = "http://annotation.elver.org/Lob";
- addAnnotation
- (getPerson_Address(),
- source,
- new String[] {
- "appinfo", "true"
- });
- }
-
+ protected void createExtendedMetaDataAnnotations() { + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + addAnnotation + (nameEClass, + source, + new String[] { + "name", "Name", + "kind", "elementOnly" + }); + addAnnotation + (getName_FirstName(), + source, + new String[] { + "kind", "element", + "name", "firstName" + }); + addAnnotation + (getName_LastName(), + source, + new String[] { + "kind", "element", + "name", "lastName" + }); + addAnnotation + (personEClass, + source, + new String[] { + "name", "Person", + "kind", "elementOnly" + }); + addAnnotation + (getPerson_Name(), + source, + new String[] { + "kind", "element", + "name", "name" + }); + addAnnotation + (getPerson_Address(), + source, + new String[] { + "kind", "element", + "name", "address" + }); + } + } //EmbeddedidPackageImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/NameImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/NameImpl.java index 738ac8576..06d5ed591 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/NameImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/NameImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: NameImpl.java,v 1.1 2006/07/11 16:57:18 mtaal Exp $
+ * $Id: NameImpl.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl;
@@ -16,200 +16,200 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage;
import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name;
-/**
+/** * <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Name</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl#getFirstName <em>First Name</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl#getLastName <em>Last Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
+ * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl#getFirstName <em>First Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl#getLastName <em>Last Name</em>}</li> + * </ul> + * </p> + * + * @generated */
public class NameImpl extends EObjectImpl implements Name {
- /**
- * The default value of the '{@link #getFirstName() <em>First Name</em>}' attribute.
+ /** + * The default value of the '{@link #getFirstName() <em>First Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getFirstName()
- * @generated
- * @ordered
+ * @see #getFirstName() + * @generated + * @ordered */
protected static final String FIRST_NAME_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getFirstName() <em>First Name</em>}' attribute.
+ /** + * The cached value of the '{@link #getFirstName() <em>First Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getFirstName()
- * @generated
- * @ordered
+ * @see #getFirstName() + * @generated + * @ordered */
protected String firstName = FIRST_NAME_EDEFAULT;
- /**
- * The default value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
+ /** + * The default value of the '{@link #getLastName() <em>Last Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getLastName()
- * @generated
- * @ordered
+ * @see #getLastName() + * @generated + * @ordered */
protected static final String LAST_NAME_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
+ /** + * The cached value of the '{@link #getLastName() <em>Last Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getLastName()
- * @generated
- * @ordered
+ * @see #getLastName() + * @generated + * @ordered */
protected String lastName = LAST_NAME_EDEFAULT;
- /**
+ /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected NameImpl() {
- super();
- }
-
- /**
+ protected NameImpl() { + super(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected EClass eStaticClass() {
- return EmbeddedidPackage.Literals.NAME;
- }
-
- /**
+ protected EClass eStaticClass() { + return EmbeddedidPackage.Literals.NAME; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public String getFirstName() {
- return firstName;
- }
-
- /**
+ public String getFirstName() { + return firstName; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void setFirstName(String newFirstName) {
- String oldFirstName = firstName;
- firstName = newFirstName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.NAME__FIRST_NAME, oldFirstName, firstName));
- }
-
- /**
+ public void setFirstName(String newFirstName) { + String oldFirstName = firstName; + firstName = newFirstName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.NAME__FIRST_NAME, oldFirstName, firstName)); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public String getLastName() {
- return lastName;
- }
-
- /**
+ public String getLastName() { + return lastName; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void setLastName(String newLastName) {
- String oldLastName = lastName;
- lastName = newLastName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.NAME__LAST_NAME, oldLastName, lastName));
- }
-
- /**
+ public void setLastName(String newLastName) { + String oldLastName = lastName; + lastName = newLastName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.NAME__LAST_NAME, oldLastName, lastName)); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case EmbeddedidPackage.NAME__FIRST_NAME:
- return getFirstName();
- case EmbeddedidPackage.NAME__LAST_NAME:
- return getLastName();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
+ public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case EmbeddedidPackage.NAME__FIRST_NAME: + return getFirstName(); + case EmbeddedidPackage.NAME__LAST_NAME: + return getLastName(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case EmbeddedidPackage.NAME__FIRST_NAME:
- setFirstName((String)newValue);
- return;
- case EmbeddedidPackage.NAME__LAST_NAME:
- setLastName((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
+ public void eSet(int featureID, Object newValue) { + switch (featureID) { + case EmbeddedidPackage.NAME__FIRST_NAME: + setFirstName((String)newValue); + return; + case EmbeddedidPackage.NAME__LAST_NAME: + setLastName((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void eUnset(int featureID) {
- switch (featureID) {
- case EmbeddedidPackage.NAME__FIRST_NAME:
- setFirstName(FIRST_NAME_EDEFAULT);
- return;
- case EmbeddedidPackage.NAME__LAST_NAME:
- setLastName(LAST_NAME_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
+ public void eUnset(int featureID) { + switch (featureID) { + case EmbeddedidPackage.NAME__FIRST_NAME: + setFirstName(FIRST_NAME_EDEFAULT); + return; + case EmbeddedidPackage.NAME__LAST_NAME: + setLastName(LAST_NAME_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case EmbeddedidPackage.NAME__FIRST_NAME:
- return FIRST_NAME_EDEFAULT == null ? firstName != null : !FIRST_NAME_EDEFAULT.equals(firstName);
- case EmbeddedidPackage.NAME__LAST_NAME:
- return LAST_NAME_EDEFAULT == null ? lastName != null : !LAST_NAME_EDEFAULT.equals(lastName);
- }
- return super.eIsSet(featureID);
- }
-
- /**
+ public boolean eIsSet(int featureID) { + switch (featureID) { + case EmbeddedidPackage.NAME__FIRST_NAME: + return FIRST_NAME_EDEFAULT == null ? firstName != null : !FIRST_NAME_EDEFAULT.equals(firstName); + case EmbeddedidPackage.NAME__LAST_NAME: + return LAST_NAME_EDEFAULT == null ? lastName != null : !LAST_NAME_EDEFAULT.equals(lastName); + } + return super.eIsSet(featureID); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (firstName: ");
- result.append(firstName);
- result.append(", lastName: ");
- result.append(lastName);
- result.append(')');
- return result.toString();
- }
-
+ public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (firstName: "); + result.append(firstName); + result.append(", lastName: "); + result.append(lastName); + result.append(')'); + return result.toString(); + } + } //NameImpl
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/PersonImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/PersonImpl.java index bd754d8d4..86257e21b 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/PersonImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/PersonImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: PersonImpl.java,v 1.1 2006/07/11 16:57:18 mtaal Exp $
+ * $Id: PersonImpl.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl;
@@ -19,223 +19,223 @@ import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackag import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name;
import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person;
-/**
+/** * <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Person</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl#getAddress <em>Address</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
+ * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl#getAddress <em>Address</em>}</li> + * </ul> + * </p> + * + * @generated */
public class PersonImpl extends EObjectImpl implements Person {
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' containment reference.
+ /** + * The cached value of the '{@link #getName() <em>Name</em>}' containment reference. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
+ * @see #getName() + * @generated + * @ordered */
protected Name name = null;
- /**
- * The default value of the '{@link #getAddress() <em>Address</em>}' attribute.
+ /** + * The default value of the '{@link #getAddress() <em>Address</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getAddress()
- * @generated
- * @ordered
+ * @see #getAddress() + * @generated + * @ordered */
protected static final String ADDRESS_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getAddress() <em>Address</em>}' attribute.
+ /** + * The cached value of the '{@link #getAddress() <em>Address</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getAddress()
- * @generated
- * @ordered
+ * @see #getAddress() + * @generated + * @ordered */
protected String address = ADDRESS_EDEFAULT;
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PersonImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return EmbeddedidPackage.Literals.PERSON;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Name getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetName(Name newName, NotificationChain msgs) {
- Name oldName = name;
- name = newName;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.PERSON__NAME, oldName, newName);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(Name newName) {
- if (newName != name) {
- NotificationChain msgs = null;
- if (name != null)
- msgs = ((InternalEObject)name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EmbeddedidPackage.PERSON__NAME, null, msgs);
- if (newName != null)
- msgs = ((InternalEObject)newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EmbeddedidPackage.PERSON__NAME, null, msgs);
- msgs = basicSetName(newName, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.PERSON__NAME, newName, newName));
- }
-
- /**
+ /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public String getAddress() {
- return address;
- }
-
- /**
+ protected PersonImpl() { + super(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void setAddress(String newAddress) {
- String oldAddress = address;
- address = newAddress;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.PERSON__ADDRESS, oldAddress, address));
- }
-
- /**
+ protected EClass eStaticClass() { + return EmbeddedidPackage.Literals.PERSON; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case EmbeddedidPackage.PERSON__NAME:
- return basicSetName(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
+ public Name getName() { + return name; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case EmbeddedidPackage.PERSON__NAME:
- return getName();
- case EmbeddedidPackage.PERSON__ADDRESS:
- return getAddress();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case EmbeddedidPackage.PERSON__NAME:
- setName((Name)newValue);
- return;
- case EmbeddedidPackage.PERSON__ADDRESS:
- setAddress((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case EmbeddedidPackage.PERSON__NAME:
- setName((Name)null);
- return;
- case EmbeddedidPackage.PERSON__ADDRESS:
- setAddress(ADDRESS_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case EmbeddedidPackage.PERSON__NAME:
- return name != null;
- case EmbeddedidPackage.PERSON__ADDRESS:
- return ADDRESS_EDEFAULT == null ? address != null : !ADDRESS_EDEFAULT.equals(address);
- }
- 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(" (address: ");
- result.append(address);
- result.append(')');
- return result.toString();
- }
-
+ public NotificationChain basicSetName(Name newName, NotificationChain msgs) { + Name oldName = name; + name = newName; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.PERSON__NAME, oldName, newName); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public void setName(Name newName) { + if (newName != name) { + NotificationChain msgs = null; + if (name != null) + msgs = ((InternalEObject)name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EmbeddedidPackage.PERSON__NAME, null, msgs); + if (newName != null) + msgs = ((InternalEObject)newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EmbeddedidPackage.PERSON__NAME, null, msgs); + msgs = basicSetName(newName, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.PERSON__NAME, newName, newName)); + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public String getAddress() { + return address; + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public void setAddress(String newAddress) { + String oldAddress = address; + address = newAddress; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.PERSON__ADDRESS, oldAddress, address)); + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case EmbeddedidPackage.PERSON__NAME: + return basicSetName(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case EmbeddedidPackage.PERSON__NAME: + return getName(); + case EmbeddedidPackage.PERSON__ADDRESS: + return getAddress(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public void eSet(int featureID, Object newValue) { + switch (featureID) { + case EmbeddedidPackage.PERSON__NAME: + setName((Name)newValue); + return; + case EmbeddedidPackage.PERSON__ADDRESS: + setAddress((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public void eUnset(int featureID) { + switch (featureID) { + case EmbeddedidPackage.PERSON__NAME: + setName((Name)null); + return; + case EmbeddedidPackage.PERSON__ADDRESS: + setAddress(ADDRESS_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public boolean eIsSet(int featureID) { + switch (featureID) { + case EmbeddedidPackage.PERSON__NAME: + return name != null; + case EmbeddedidPackage.PERSON__ADDRESS: + return ADDRESS_EDEFAULT == null ? address != null : !ADDRESS_EDEFAULT.equals(address); + } + 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(" (address: "); + result.append(address); + result.append(')'); + return result.toString(); + } + } //PersonImpl
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.genmodel index f282a7580..e42c38b78 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.genmodel +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.genmodel @@ -1,19 +1,19 @@ -<?xml version="1.0" encoding="UTF-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="EmbeddedId" rootExtendsInterface="java.io.Serializable"
- rootImplementsInterface="" importerID="org.eclipse.xsd.ecore.importer">
- <foreignModel>EmbeddedId.xsd</foreignModel>
- <genPackages prefix="Embeddedid" basePackage="org.eclipse.emf.teneo.samples.emf.annotations"
- resource="XML" disposableProviderFactory="true" ecorePackage="embeddedid.ecore#/">
- <genClasses ecoreClass="embeddedid.ecore#//Name">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute embeddedid.ecore#//Name/firstName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute embeddedid.ecore#//Name/lastName"/>
- </genClasses>
- <genClasses ecoreClass="embeddedid.ecore#//Person">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference embeddedid.ecore#//Person/name"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute embeddedid.ecore#//Person/address"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-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="EmbeddedId" rootExtendsInterface="java.io.Serializable" + rootImplementsInterface="" importerID="org.eclipse.xsd.ecore.importer"> + <foreignModel>EmbeddedId.xsd</foreignModel> + <genPackages prefix="Embeddedid" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" + resource="XML" disposableProviderFactory="true" ecorePackage="embeddedid.ecore#/"> + <genClasses ecoreClass="embeddedid.ecore#//Name"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute embeddedid.ecore#//Name/firstName"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute embeddedid.ecore#//Name/lastName"/> + </genClasses> + <genClasses ecoreClass="embeddedid.ecore#//Person"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference embeddedid.ecore#//Person/name"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute embeddedid.ecore#//Person/address"/> + </genClasses> + </genPackages> +</genmodel:GenModel> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.xsd index debad692d..09321ea87 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.xsd @@ -6,12 +6,12 @@ <xsd:sequence>
<xsd:element name="name" type="this:Name">
<xsd:annotation>
- <xsd:appinfo source="http://annotation.elver.org/EmbeddedId">true</xsd:appinfo>
+ <xsd:appinfo source="teneo.jpa">@EmbeddedId</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="address" type="xsd:string" minOccurs="0">
<xsd:annotation>
- <xsd:appinfo source="http://annotation.elver.org/Lob">true</xsd:appinfo>
+ <xsd:appinfo source="teneo.jpa">@Lob</xsd:appinfo>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
@@ -19,7 +19,7 @@ <xsd:complexType name="Name">
<xsd:annotation>
- <xsd:appinfo source="http://annotation.elver.org/Embeddable">true</xsd:appinfo>
+ <xsd:appinfo source="teneo.jpa">@Embeddable</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="firstName" type="xsd:string"/>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/embeddedid.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/embeddedid.ecore index 1946d9b17..436e75761 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/embeddedid.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/embeddedid.ecore @@ -1,55 +1,55 @@ -<?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="embeddedid"
- nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid" nsPrefix="embeddedid">
- <eClassifiers xsi:type="ecore:EClass" name="Name">
- <eAnnotations source="http://annotation.elver.org/Embeddable">
- <details key="appinfo" value="true"/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="Name"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstName" unique="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="firstName"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastName" unique="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="lastName"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Person">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="Person"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="name" lowerBound="1" eType="#//Name"
- containment="true" resolveProxies="false">
- <eAnnotations source="http://annotation.elver.org/EmbeddedId">
- <details key="appinfo" value="true"/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="name"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="address" unique="false"
- eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
- <eAnnotations source="http://annotation.elver.org/Lob">
- <details key="appinfo" value="true"/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="address"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?> +<ecore:EPackage xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="embeddedid" + nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid" nsPrefix="embeddedid"> + <eClassifiers xsi:type="ecore:EClass" name="Name"> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Embeddable"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="Name"/> + <details key="kind" value="elementOnly"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstName" unique="false" + lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="firstName"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastName" unique="false" + lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="lastName"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Person"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="Person"/> + <details key="kind" value="elementOnly"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EReference" name="name" lowerBound="1" eType="#//Name" + containment="true" resolveProxies="false"> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@EmbeddedId"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="name"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="address" unique="false" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Lob"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="address"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> +</ecore:EPackage> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidAdapterFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidAdapterFactory.java index 3ad6344d9..a458c9ad1 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidAdapterFactory.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidAdapterFactory.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidAdapterFactory.java,v 1.1 2006/07/11 16:57:01 mtaal Exp $
+ * $Id: EmbeddedidAdapterFactory.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util;
@@ -15,123 +15,123 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.*;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage + * @generated */
public class EmbeddedidAdapterFactory extends AdapterFactoryImpl {
- /**
- * The cached model package.
+ /** + * The cached model package. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
protected static EmbeddedidPackage modelPackage;
- /**
- * Creates an instance of the adapter factory.
+ /** + * Creates an instance of the adapter factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EmbeddedidAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = EmbeddedidPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
+ public EmbeddedidAdapterFactory() { + if (modelPackage == null) { + modelPackage = EmbeddedidPackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. * <!-- begin-user-doc -->
* This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
* <!-- end-user-doc -->
- * @return whether this factory is applicable for the type of the object.
- * @generated
+ * @return whether this factory is applicable for the type of the object. + * @generated */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the <code>createXXX</code> methods.
+ public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch the delegates to the <code>createXXX</code> methods. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected EmbeddedidSwitch modelSwitch =
- new EmbeddedidSwitch() {
- public Object caseName(Name object) {
- return createNameAdapter();
- }
- public Object casePerson(Person object) {
- return createPersonAdapter();
- }
- public Object defaultCase(EObject object) {
- return createEObjectAdapter();
- }
+ protected EmbeddedidSwitch modelSwitch = + new EmbeddedidSwitch() { + public Object caseName(Name object) { + return createNameAdapter(); + } + public Object casePerson(Person object) { + return createPersonAdapter(); + } + public Object defaultCase(EObject object) { + return createEObjectAdapter(); + } };
- /**
- * Creates an adapter for the <code>target</code>.
+ /** + * Creates an adapter for the <code>target</code>. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param target the object to adapt.
- * @return the adapter for the <code>target</code>.
- * @generated
+ * @param target the object to adapt. + * @return the adapter for the <code>target</code>. + * @generated */
- public Adapter createAdapter(Notifier target) {
- return (Adapter)modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name <em>Name</em>}'.
+ public Adapter createAdapter(Notifier target) { + return (Adapter)modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name <em>Name</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.embeddedid.Name
- * @generated
+ * @return the new adapter. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name + * @generated */
- public Adapter createNameAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person <em>Person</em>}'.
+ public Adapter createNameAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person <em>Person</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.embeddedid.Person
- * @generated
+ * @return the new adapter. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person + * @generated */
- public Adapter createPersonAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case.
+ public Adapter createPersonAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. * <!-- begin-user-doc -->
* This default implementation returns null.
* <!-- end-user-doc -->
- * @return the new adapter.
- * @generated
+ * @return the new adapter. + * @generated */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
+ public Adapter createEObjectAdapter() { + return null; + } + } //EmbeddedidAdapterFactory
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceFactoryImpl.java index 98f621836..4e0d73f93 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceFactoryImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidResourceFactoryImpl.java,v 1.1 2006/07/11 16:57:01 mtaal Exp $
+ * $Id: EmbeddedidResourceFactoryImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util;
@@ -14,42 +14,42 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; import org.eclipse.emf.ecore.xmi.XMLResource;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Resource Factory</b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util.EmbeddedidResourceImpl
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util.EmbeddedidResourceImpl + * @generated */
public class EmbeddedidResourceFactoryImpl extends ResourceFactoryImpl {
- /**
- * Creates an instance of the resource factory.
+ /** + * Creates an instance of the resource factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EmbeddedidResourceFactoryImpl() {
- super();
- }
-
- /**
- * Creates an instance of the resource.
+ public EmbeddedidResourceFactoryImpl() { + super(); + } + + /** + * Creates an instance of the resource. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Resource createResource(URI uri) {
- XMLResource result = new EmbeddedidResourceImpl(uri);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
- result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
- result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
- return result;
- }
-
+ public Resource createResource(URI uri) { + XMLResource result = new EmbeddedidResourceImpl(uri); + result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); + result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); + + result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE); + + result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE); + result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE); + + result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE); + return result; + } + } //EmbeddedidResourceFactoryImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceImpl.java index 3c67c9331..d21db3c3c 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidResourceImpl.java,v 1.1 2006/07/11 16:57:01 mtaal Exp $
+ * $Id: EmbeddedidResourceImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util;
@@ -10,23 +10,23 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Resource </b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util.EmbeddedidResourceFactoryImpl
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util.EmbeddedidResourceFactoryImpl + * @generated */
public class EmbeddedidResourceImpl extends XMLResourceImpl {
- /**
- * Creates an instance of the resource.
+ /** + * Creates an instance of the resource. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param uri the URI of the new resource.
- * @generated
+ * @param uri the URI of the new resource. + * @generated */
- public EmbeddedidResourceImpl(URI uri) {
- super(uri);
- }
-
+ public EmbeddedidResourceImpl(URI uri) { + super(uri); + } + } //EmbeddedidResourceImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidSwitch.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidSwitch.java index 11cb1e0fc..5264f569b 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidSwitch.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidSwitch.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidSwitch.java,v 1.1 2006/07/11 16:57:01 mtaal Exp $
+ * $Id: EmbeddedidSwitch.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util;
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.*;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
* It supports the call {@link #doSwitch(EObject) doSwitch(object)}
@@ -23,129 +23,129 @@ import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.*; * until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage + * @generated */
public class EmbeddedidSwitch {
- /**
- * The cached model package
+ /** + * The cached model package * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
protected static EmbeddedidPackage modelPackage;
- /**
- * Creates an instance of the switch.
+ /** + * Creates an instance of the switch. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EmbeddedidSwitch() {
- if (modelPackage == null) {
- modelPackage = EmbeddedidPackage.eINSTANCE;
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ public EmbeddedidSwitch() { + if (modelPackage == null) { + modelPackage = EmbeddedidPackage.eINSTANCE; + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
+ * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated */
- public Object doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ public Object doSwitch(EObject theEObject) { + return doSwitch(theEObject.eClass(), theEObject); + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
+ * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated */
- protected Object doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else {
- List eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch((EClass)eSuperTypes.get(0), theEObject);
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ protected Object doSwitch(EClass theEClass, EObject theEObject) { + if (theEClass.eContainer() == modelPackage) { + return doSwitch(theEClass.getClassifierID(), theEObject); + } + else { + List eSuperTypes = theEClass.getESuperTypes(); + return + eSuperTypes.isEmpty() ? + defaultCase(theEObject) : + doSwitch((EClass)eSuperTypes.get(0), theEObject); + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
+ * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated */
- protected Object doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case EmbeddedidPackage.NAME: {
- Name name = (Name)theEObject;
- Object result = caseName(name);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case EmbeddedidPackage.PERSON: {
- Person person = (Person)theEObject;
- Object result = casePerson(person);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Name</em>'.
+ protected Object doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case EmbeddedidPackage.NAME: { + Name name = (Name)theEObject; + Object result = caseName(name); + if (result == null) result = defaultCase(theEObject); + return result; + } + case EmbeddedidPackage.PERSON: { + Person person = (Person)theEObject; + Object result = casePerson(person); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpretting the object as an instance of '<em>Name</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>Name</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
+ * @param object the target of the switch. + * @return the result of interpretting the object as an instance of '<em>Name</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated */
- public Object caseName(Name object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Person</em>'.
+ public Object caseName(Name object) { + return null; + } + + /** + * Returns the result of interpretting the object as an instance of '<em>Person</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>Person</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
+ * @param object the target of the switch. + * @return the result of interpretting the object as an instance of '<em>Person</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated */
- public Object casePerson(Person object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+ public Object casePerson(Person object) { + return null; + } + + /** + * Returns the result of interpretting the object as an instance of '<em>EObject</em>'. * <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch, but this is the last case anyway.
* <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
+ * @param object the target of the switch. + * @return the result of interpretting the object as an instance of '<em>EObject</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated */
- public Object defaultCase(EObject object) {
- return null;
- }
-
+ public Object defaultCase(EObject object) { + return null; + } + } //EmbeddedidSwitch
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidXMLProcessor.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidXMLProcessor.java index 56e3e0ac8..25978ce77 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidXMLProcessor.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidXMLProcessor.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidXMLProcessor.java,v 1.1 2006/07/11 16:57:01 mtaal Exp $
+ * $Id: EmbeddedidXMLProcessor.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util;
@@ -14,37 +14,37 @@ import org.eclipse.emf.ecore.xmi.util.XMLProcessor; import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage;
-/**
- * This class contains helper methods to serialize and deserialize XML documents
+/** + * This class contains helper methods to serialize and deserialize XML documents * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
public class EmbeddedidXMLProcessor extends XMLProcessor {
- /**
- * Public constructor to instantiate the helper.
+ /** + * Public constructor to instantiate the helper. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EmbeddedidXMLProcessor() {
- super((EPackage.Registry.INSTANCE));
- EmbeddedidPackage.eINSTANCE.eClass();
- }
-
- /**
- * Register for "*" and "xml" file extensions the EmbeddedidResourceFactoryImpl factory.
+ public EmbeddedidXMLProcessor() { + super((EPackage.Registry.INSTANCE)); + EmbeddedidPackage.eINSTANCE.eClass(); + } + + /** + * Register for "*" and "xml" file extensions the EmbeddedidResourceFactoryImpl factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected Map getRegistrations() {
- if (registrations == null) {
- super.getRegistrations();
- registrations.put(XML_EXTENSION, new EmbeddedidResourceFactoryImpl());
- registrations.put(STAR_EXTENSION, new EmbeddedidResourceFactoryImpl());
- }
- return registrations;
- }
-
+ protected Map getRegistrations() { + if (registrations == null) { + super.getRegistrations(); + registrations.put(XML_EXTENSION, new EmbeddedidResourceFactoryImpl()); + registrations.put(STAR_EXTENSION, new EmbeddedidResourceFactoryImpl()); + } + return registrations; + } + } //EmbeddedidXMLProcessor
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Child.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Child.java index cecf4845d..40305aa36 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Child.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Child.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Child.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $ + * $Id: Child.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns; @@ -13,9 +13,9 @@ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns; * <!-- end-user-doc --> * * - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage#getChild() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage#getChild() * @model * @generated */ public interface Child extends Person { -} // Child +} // Child
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/CompositeidFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/JoincolumnsFactory.java index 25276d1f8..fd4f21075 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/CompositeidFactory.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/JoincolumnsFactory.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CompositeidFactory.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $ + * $Id: JoincolumnsFactory.java,v 1.1 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns; @@ -13,17 +13,17 @@ import org.eclipse.emf.ecore.EFactory; * The <b>Factory</b> for the model. * It provides a create method for each non-abstract class of the model. * <!-- end-user-doc --> - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage * @generated */ -public interface CompositeidFactory extends EFactory { +public interface JoincolumnsFactory extends EFactory { /** * The singleton instance of the factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - CompositeidFactory eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidFactoryImpl.init(); + JoincolumnsFactory eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsFactoryImpl.init(); /** * Returns a new object of class '<em>Parent</em>'. @@ -59,6 +59,6 @@ public interface CompositeidFactory extends EFactory { * @return the package supported by this factory. * @generated */ - CompositeidPackage getCompositeidPackage(); + JoincolumnsPackage getJoincolumnsPackage(); -} //CompositeidFactory +} //JoincolumnsFactory diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/CompositeidPackage.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/JoincolumnsPackage.java index 69b006c86..efa43f056 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/CompositeidPackage.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/JoincolumnsPackage.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CompositeidPackage.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $ + * $Id: JoincolumnsPackage.java,v 1.1 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns; @@ -22,18 +22,18 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidFactory + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsFactory * @model kind="package" * @generated */ -public interface CompositeidPackage extends EPackage { +public interface JoincolumnsPackage extends EPackage { /** * The package name. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - String eNAME = "compositeid"; + String eNAME = "joincolumns"; /** * The package namespace URI. @@ -41,7 +41,7 @@ public interface CompositeidPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String eNS_URI = "http:///org/elver/samples/emf/annotations/jc.ecore"; + String eNS_URI = "http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns"; /** * The package namespace name. @@ -49,7 +49,7 @@ public interface CompositeidPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String eNS_PREFIX = "org.eclipse.emf.teneo.samples.emf.annotations.joincolumns"; + String eNS_PREFIX = "joincolumns"; /** * The singleton instance of the package. @@ -57,14 +57,14 @@ public interface CompositeidPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - CompositeidPackage eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidPackageImpl.init(); + JoincolumnsPackage eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsPackageImpl.init(); /** * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl <em>Person</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl - * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidPackageImpl#getPerson() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsPackageImpl#getPerson() * @generated */ int PERSON = 2; @@ -101,7 +101,7 @@ public interface CompositeidPackage extends EPackage { * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.ParentImpl - * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidPackageImpl#getParent() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsPackageImpl#getParent() * @generated */ int PARENT = 0; @@ -147,7 +147,7 @@ public interface CompositeidPackage extends EPackage { * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.ChildImpl - * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidPackageImpl#getChild() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsPackageImpl#getChild() * @generated */ int CHILD = 1; @@ -181,63 +181,63 @@ public interface CompositeidPackage extends EPackage { /** - * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Parent <em>Parent</em>}'. + * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent <em>Parent</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Parent</em>'. - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.Parent + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent * @generated */ EClass getParent(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Parent#getChildren <em>Children</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent#getChildren <em>Children</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference list '<em>Children</em>'. - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.Parent#getChildren() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent#getChildren() * @see #getParent() * @generated */ EReference getParent_Children(); /** - * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Child <em>Child</em>}'. + * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child <em>Child</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Child</em>'. - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.Child + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child * @generated */ EClass getChild(); /** - * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person <em>Person</em>}'. + * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person <em>Person</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Person</em>'. - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.Person + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person * @generated */ EClass getPerson(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getFirstName <em>First Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getFirstName <em>First Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>First Name</em>'. - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getFirstName() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getFirstName() * @see #getPerson() * @generated */ EAttribute getPerson_FirstName(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getLastName <em>Last Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getLastName <em>Last Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Last Name</em>'. - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getLastName() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getLastName() * @see #getPerson() * @generated */ @@ -250,7 +250,7 @@ public interface CompositeidPackage extends EPackage { * @return the factory that creates the instances of the model. * @generated */ - CompositeidFactory getCompositeidFactory(); + JoincolumnsFactory getJoincolumnsFactory(); /** * <!-- begin-user-doc --> @@ -270,7 +270,7 @@ public interface CompositeidPackage extends EPackage { * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.ParentImpl - * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidPackageImpl#getParent() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsPackageImpl#getParent() * @generated */ EClass PARENT = eINSTANCE.getParent(); @@ -288,7 +288,7 @@ public interface CompositeidPackage extends EPackage { * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.ChildImpl - * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidPackageImpl#getChild() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsPackageImpl#getChild() * @generated */ EClass CHILD = eINSTANCE.getChild(); @@ -298,7 +298,7 @@ public interface CompositeidPackage extends EPackage { * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl - * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidPackageImpl#getPerson() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsPackageImpl#getPerson() * @generated */ EClass PERSON = eINSTANCE.getPerson(); @@ -321,4 +321,4 @@ public interface CompositeidPackage extends EPackage { } -} //CompositeidPackage +} //JoincolumnsPackage diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Parent.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Parent.java index 6f2cc2555..cccb045ac 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Parent.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Parent.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Parent.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $ + * $Id: Parent.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns; @@ -16,18 +16,18 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Parent#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent#getChildren <em>Children</em>}</li> * </ul> * </p> * - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage#getParent() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage#getParent() * @model * @generated */ public interface Parent extends Person { /** * Returns the value of the '<em><b>Children</b></em>' reference list. - * The list contents are of type {@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Child}. + * The list contents are of type {@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Children</em>' reference list isn't clear, @@ -35,14 +35,11 @@ public interface Parent extends Person { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Children</em>' reference list. - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage#getParent_Children() - * @model type="compositeid.Child" - * annotation="http://annotation.elver.org/JoinColumns value='jc1 jc2'" - * annotation="http://annotation.elver.org/JoinColumn/jc1 name='myParentFirstName' referencedColumnName='firstName'" - * annotation="http://annotation.elver.org/JoinColumn/jc2 name='myParentLastName' referencedColumnName='lastName'" - * annotation="http://annotation.elver.org/OrderBy value='firstName'" + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage#getParent_Children() + * @model type="joincolumns.Child" + * annotation="teneo.jpa appinfo='@JoinColumns({@JoinColumn(name=\"myParentFirstName\" referencedColumnName=\"firstName\"),\n\t@JoinColumn(name=\"myParentLastName\" referencedColumnName=\"lastName\")})\n\t@OrderBy(\"firstName\")'" * @generated */ EList getChildren(); -} // Parent +} // Parent
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Person.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Person.java index bd60ab17f..5dc1ba614 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Person.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Person.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Person.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $ + * $Id: Person.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns; @@ -16,13 +16,13 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getFirstName <em>First Name</em>}</li> - * <li>{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getLastName <em>Last Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getFirstName <em>First Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getLastName <em>Last Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage#getPerson() - * @model annotation="http://annotation.elver.org/IdClass value='org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID'" + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage#getPerson() + * @model annotation="teneo.jpa appinfo='@IdClass(org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID)'" * @generated */ public interface Person extends EObject { @@ -36,14 +36,14 @@ public interface Person extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>First Name</em>' attribute. * @see #setFirstName(String) - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage#getPerson_FirstName() - * @model + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage#getPerson_FirstName() + * @model annotation="teneo.jpa appinfo='@Id'" * @generated */ String getFirstName(); /** - * Sets the value of the '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getFirstName <em>First Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getFirstName <em>First Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>First Name</em>' attribute. @@ -62,14 +62,14 @@ public interface Person extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Last Name</em>' attribute. * @see #setLastName(String) - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage#getPerson_LastName() - * @model + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage#getPerson_LastName() + * @model annotation="teneo.jpa appinfo='@Id'" * @generated */ String getLastName(); /** - * Sets the value of the '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getLastName <em>Last Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getLastName <em>Last Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Last Name</em>' attribute. @@ -78,4 +78,4 @@ public interface Person extends EObject { */ void setLastName(String value); -} // Person +} // Person
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ChildImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ChildImpl.java index ab3ae1dc4..fe41eca77 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ChildImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ChildImpl.java @@ -2,14 +2,14 @@ * <copyright> * </copyright> * - * $Id: ChildImpl.java,v 1.1 2006/07/11 16:57:07 mtaal Exp $ + * $Id: ChildImpl.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; /** * <!-- begin-user-doc --> @@ -36,7 +36,7 @@ public class ChildImpl extends PersonImpl implements Child { * @generated */ protected EClass eStaticClass() { - return CompositeidPackage.Literals.CHILD; + return JoincolumnsPackage.Literals.CHILD; } -} //ChildImpl +} //ChildImpl
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/CompositeidFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/JoincolumnsFactoryImpl.java index 5a113bebf..de970c8c2 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/CompositeidFactoryImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/JoincolumnsFactoryImpl.java @@ -2,19 +2,18 @@ * <copyright> * </copyright> * - * $Id: CompositeidFactoryImpl.java,v 1.1 2006/07/11 16:57:07 mtaal Exp $ + * $Id: JoincolumnsFactoryImpl.java,v 1.1 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidFactory; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsFactory; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; @@ -24,24 +23,24 @@ import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; * <!-- end-user-doc --> * @generated */ -public class CompositeidFactoryImpl extends EFactoryImpl implements CompositeidFactory { +public class JoincolumnsFactoryImpl extends EFactoryImpl implements JoincolumnsFactory { /** * Creates the default factory implementation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - public static CompositeidFactory init() { + public static JoincolumnsFactory init() { try { - CompositeidFactory theCompositeidFactory = (CompositeidFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/elver/samples/emf/annotations/jc.ecore"); - if (theCompositeidFactory != null) { - return theCompositeidFactory; + JoincolumnsFactory theJoincolumnsFactory = (JoincolumnsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns"); + if (theJoincolumnsFactory != null) { + return theJoincolumnsFactory; } } catch (Exception exception) { EcorePlugin.INSTANCE.log(exception); } - return new CompositeidFactoryImpl(); + return new JoincolumnsFactoryImpl(); } /** @@ -50,7 +49,7 @@ public class CompositeidFactoryImpl extends EFactoryImpl implements CompositeidF * <!-- end-user-doc --> * @generated */ - public CompositeidFactoryImpl() { + public JoincolumnsFactoryImpl() { super(); } @@ -61,9 +60,9 @@ public class CompositeidFactoryImpl extends EFactoryImpl implements CompositeidF */ public EObject create(EClass eClass) { switch (eClass.getClassifierID()) { - case CompositeidPackage.PARENT: return createParent(); - case CompositeidPackage.CHILD: return createChild(); - case CompositeidPackage.PERSON: return createPerson(); + case JoincolumnsPackage.PARENT: return createParent(); + case JoincolumnsPackage.CHILD: return createChild(); + case JoincolumnsPackage.PERSON: return createPerson(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -104,8 +103,8 @@ public class CompositeidFactoryImpl extends EFactoryImpl implements CompositeidF * <!-- end-user-doc --> * @generated */ - public CompositeidPackage getCompositeidPackage() { - return (CompositeidPackage)getEPackage(); + public JoincolumnsPackage getJoincolumnsPackage() { + return (JoincolumnsPackage)getEPackage(); } /** @@ -114,8 +113,8 @@ public class CompositeidFactoryImpl extends EFactoryImpl implements CompositeidF * @deprecated * @generated */ - public static CompositeidPackage getPackage() { - return CompositeidPackage.eINSTANCE; + public static JoincolumnsPackage getPackage() { + return JoincolumnsPackage.eINSTANCE; } -} //CompositeidFactoryImpl +} //JoincolumnsFactoryImpl diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/CompositeidPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/JoincolumnsPackageImpl.java index 6474a96ac..cf66f447b 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/CompositeidPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/JoincolumnsPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CompositeidPackageImpl.java,v 1.2 2006/09/04 15:42:25 mtaal Exp $ + * $Id: JoincolumnsPackageImpl.java,v 1.1 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl; @@ -11,10 +11,11 @@ import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; + import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidFactory; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsFactory; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; @@ -24,7 +25,7 @@ import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; * <!-- end-user-doc --> * @generated */ -public class CompositeidPackageImpl extends EPackageImpl implements CompositeidPackage { +public class JoincolumnsPackageImpl extends EPackageImpl implements JoincolumnsPackage { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -57,12 +58,12 @@ public class CompositeidPackageImpl extends EPackageImpl implements CompositeidP * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage#eNS_URI + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage#eNS_URI * @see #init() * @generated */ - private CompositeidPackageImpl() { - super(eNS_URI, CompositeidFactory.eINSTANCE); + private JoincolumnsPackageImpl() { + super(eNS_URI, JoincolumnsFactory.eINSTANCE); } /** @@ -94,24 +95,24 @@ public class CompositeidPackageImpl extends EPackageImpl implements CompositeidP * @see #initializePackageContents() * @generated */ - public static CompositeidPackage init() { - if (isInited) return (CompositeidPackage)EPackage.Registry.INSTANCE.getEPackage(CompositeidPackage.eNS_URI); + public static JoincolumnsPackage init() { + if (isInited) return (JoincolumnsPackage)EPackage.Registry.INSTANCE.getEPackage(JoincolumnsPackage.eNS_URI); // Obtain or create and register package - CompositeidPackageImpl theCompositeidPackage = (CompositeidPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof CompositeidPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CompositeidPackageImpl()); + JoincolumnsPackageImpl theJoincolumnsPackage = (JoincolumnsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof JoincolumnsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new JoincolumnsPackageImpl()); isInited = true; // Create package meta-data objects - theCompositeidPackage.createPackageContents(); + theJoincolumnsPackage.createPackageContents(); // Initialize created meta-data - theCompositeidPackage.initializePackageContents(); + theJoincolumnsPackage.initializePackageContents(); // Mark meta-data to indicate it can't be changed - theCompositeidPackage.freeze(); + theJoincolumnsPackage.freeze(); - return theCompositeidPackage; + return theJoincolumnsPackage; } /** @@ -173,8 +174,8 @@ public class CompositeidPackageImpl extends EPackageImpl implements CompositeidP * <!-- end-user-doc --> * @generated */ - public CompositeidFactory getCompositeidFactory() { - return (CompositeidFactory)getEFactoryInstance(); + public JoincolumnsFactory getJoincolumnsFactory() { + return (JoincolumnsFactory)getEFactoryInstance(); } /** @@ -247,102 +248,42 @@ public class CompositeidPackageImpl extends EPackageImpl implements CompositeidP createResource(eNS_URI); // Create annotations - // http://annotation.elver.org/JoinColumn/jc1 - createJc1Annotations(); - // http://annotation.elver.org/JoinColumn/jc2 - createJc2Annotations(); - // http://annotation.elver.org/OrderBy - createOrderByAnnotations(); - // http://annotation.elver.org/IdClass - createIdClassAnnotations(); - // http://annotation.elver.org/Id - createIdAnnotations(); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/JoinColumn/jc1</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createJc1Annotations() { - String source = "http://annotation.elver.org/JoinColumn"; - addAnnotation - (getParent_Children(), - source, - new String[] { - "name", "myParentFirstName", - "referencedColumnName", "firstName" - }); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/JoinColumn/jc2</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createJc2Annotations() { - String source = "http://annotation.elver.org/JoinColumn"; - addAnnotation - (getParent_Children(), - source, - new String[] { - "name", "myParentLastName", - "referencedColumnName", "lastName" - }); + // teneo.jpa + createTeneoAnnotations(); } /** - * Initializes the annotations for <b>http://annotation.elver.org/OrderBy</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createOrderByAnnotations() { - String source = "http://annotation.elver.org/OrderBy"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (getParent_Children(), source, new String[] { - "value", "firstName" - }); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/IdClass</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createIdClassAnnotations() { - String source = "http://annotation.elver.org/IdClass"; + "appinfo", "@JoinColumns({@JoinColumn(name=\"myParentFirstName\" referencedColumnName=\"firstName\"),\n\t@JoinColumn(name=\"myParentLastName\" referencedColumnName=\"lastName\")})\n\t@OrderBy(\"firstName\")" + }); addAnnotation (personEClass, source, new String[] { - "value", "org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" + "appinfo", "@IdClass(org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID)" }); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/Id</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createIdAnnotations() { - String source = "http://annotation.elver.org/Id"; addAnnotation (getPerson_FirstName(), source, new String[] { + "appinfo", "@Id" }); addAnnotation (getPerson_LastName(), source, new String[] { + "appinfo", "@Id" }); } -} //CompositeidPackageImpl +} //JoincolumnsPackageImpl diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ParentImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ParentImpl.java index d41472531..d86263aac 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ParentImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ParentImpl.java @@ -2,18 +2,20 @@ * <copyright> * </copyright> * - * $Id: ParentImpl.java,v 1.1 2006/07/11 16:57:07 mtaal Exp $ + * $Id: ParentImpl.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl; - import java.util.Collection; + import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; + import org.eclipse.emf.ecore.util.EObjectResolvingEList; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent; /** @@ -55,7 +57,7 @@ public class ParentImpl extends PersonImpl implements Parent { * @generated */ protected EClass eStaticClass() { - return CompositeidPackage.Literals.PARENT; + return JoincolumnsPackage.Literals.PARENT; } /** @@ -65,7 +67,7 @@ public class ParentImpl extends PersonImpl implements Parent { */ public EList getChildren() { if (children == null) { - children = new EObjectResolvingEList(Child.class, this, CompositeidPackage.PARENT__CHILDREN); + children = new EObjectResolvingEList(Child.class, this, JoincolumnsPackage.PARENT__CHILDREN); } return children; } @@ -77,7 +79,7 @@ public class ParentImpl extends PersonImpl implements Parent { */ public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case CompositeidPackage.PARENT__CHILDREN: + case JoincolumnsPackage.PARENT__CHILDREN: return getChildren(); } return super.eGet(featureID, resolve, coreType); @@ -90,7 +92,7 @@ public class ParentImpl extends PersonImpl implements Parent { */ public void eSet(int featureID, Object newValue) { switch (featureID) { - case CompositeidPackage.PARENT__CHILDREN: + case JoincolumnsPackage.PARENT__CHILDREN: getChildren().clear(); getChildren().addAll((Collection)newValue); return; @@ -105,7 +107,7 @@ public class ParentImpl extends PersonImpl implements Parent { */ public void eUnset(int featureID) { switch (featureID) { - case CompositeidPackage.PARENT__CHILDREN: + case JoincolumnsPackage.PARENT__CHILDREN: getChildren().clear(); return; } @@ -119,10 +121,10 @@ public class ParentImpl extends PersonImpl implements Parent { */ public boolean eIsSet(int featureID) { switch (featureID) { - case CompositeidPackage.PARENT__CHILDREN: + case JoincolumnsPackage.PARENT__CHILDREN: return children != null && !children.isEmpty(); } return super.eIsSet(featureID); } -} //ParentImpl +} //ParentImpl
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/PersonImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/PersonImpl.java index 3b9634c05..cee4246e3 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/PersonImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/PersonImpl.java @@ -2,16 +2,18 @@ * <copyright> * </copyright> * - * $Id: PersonImpl.java,v 1.1 2006/07/11 16:57:07 mtaal Exp $ + * $Id: PersonImpl.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.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.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; /** @@ -84,7 +86,7 @@ public class PersonImpl extends EObjectImpl implements Person { * @generated */ protected EClass eStaticClass() { - return CompositeidPackage.Literals.PERSON; + return JoincolumnsPackage.Literals.PERSON; } /** @@ -105,7 +107,7 @@ public class PersonImpl extends EObjectImpl implements Person { String oldFirstName = firstName; firstName = newFirstName; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, CompositeidPackage.PERSON__FIRST_NAME, oldFirstName, firstName)); + eNotify(new ENotificationImpl(this, Notification.SET, JoincolumnsPackage.PERSON__FIRST_NAME, oldFirstName, firstName)); } /** @@ -126,7 +128,7 @@ public class PersonImpl extends EObjectImpl implements Person { String oldLastName = lastName; lastName = newLastName; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, CompositeidPackage.PERSON__LAST_NAME, oldLastName, lastName)); + eNotify(new ENotificationImpl(this, Notification.SET, JoincolumnsPackage.PERSON__LAST_NAME, oldLastName, lastName)); } /** @@ -136,9 +138,9 @@ public class PersonImpl extends EObjectImpl implements Person { */ public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case CompositeidPackage.PERSON__FIRST_NAME: + case JoincolumnsPackage.PERSON__FIRST_NAME: return getFirstName(); - case CompositeidPackage.PERSON__LAST_NAME: + case JoincolumnsPackage.PERSON__LAST_NAME: return getLastName(); } return super.eGet(featureID, resolve, coreType); @@ -151,10 +153,10 @@ public class PersonImpl extends EObjectImpl implements Person { */ public void eSet(int featureID, Object newValue) { switch (featureID) { - case CompositeidPackage.PERSON__FIRST_NAME: + case JoincolumnsPackage.PERSON__FIRST_NAME: setFirstName((String)newValue); return; - case CompositeidPackage.PERSON__LAST_NAME: + case JoincolumnsPackage.PERSON__LAST_NAME: setLastName((String)newValue); return; } @@ -168,10 +170,10 @@ public class PersonImpl extends EObjectImpl implements Person { */ public void eUnset(int featureID) { switch (featureID) { - case CompositeidPackage.PERSON__FIRST_NAME: + case JoincolumnsPackage.PERSON__FIRST_NAME: setFirstName(FIRST_NAME_EDEFAULT); return; - case CompositeidPackage.PERSON__LAST_NAME: + case JoincolumnsPackage.PERSON__LAST_NAME: setLastName(LAST_NAME_EDEFAULT); return; } @@ -185,9 +187,9 @@ public class PersonImpl extends EObjectImpl implements Person { */ public boolean eIsSet(int featureID) { switch (featureID) { - case CompositeidPackage.PERSON__FIRST_NAME: + case JoincolumnsPackage.PERSON__FIRST_NAME: return FIRST_NAME_EDEFAULT == null ? firstName != null : !FIRST_NAME_EDEFAULT.equals(firstName); - case CompositeidPackage.PERSON__LAST_NAME: + case JoincolumnsPackage.PERSON__LAST_NAME: return LAST_NAME_EDEFAULT == null ? lastName != null : !LAST_NAME_EDEFAULT.equals(lastName); } return super.eIsSet(featureID); @@ -210,4 +212,4 @@ public class PersonImpl extends EObjectImpl implements Person { return result.toString(); } -} //PersonImpl +} //PersonImpl
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.ecore index 672f50fd6..d44f3cfde 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.ecore @@ -1,34 +1,30 @@ <?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="compositeid" - nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns" nsPrefix="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns"> + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="joincolumns" + nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns" nsPrefix="joincolumns"> <eClassifiers xsi:type="ecore:EClass" name="Parent" eSuperTypes="#//Person"> <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1" eType="#//Child"> - <eAnnotations source="http://annotation.elver.org/JoinColumn"> - <details key="name" value="myParentFirstName"/> - <details key="referencedColumnName" value="firstName"/> - </eAnnotations> - <eAnnotations source="http://annotation.elver.org/JoinColumn"> - <details key="name" value="myParentLastName"/> - <details key="referencedColumnName" value="lastName"/> - </eAnnotations> - <eAnnotations source="http://annotation.elver.org/OrderBy"> - <details key="value" value="firstName"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@JoinColumns({@JoinColumn(name="myParentFirstName" referencedColumnName="firstName"),
	@JoinColumn(name="myParentLastName" referencedColumnName="lastName")})
	@OrderBy("firstName")"/> </eAnnotations> </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Child" eSuperTypes="#//Person"/> <eClassifiers xsi:type="ecore:EClass" name="Person"> - <eAnnotations source="http://annotation.elver.org/IdClass"> - <details key="value" value="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@IdClass(org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID)"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> - <eAnnotations source="http://annotation.elver.org/Id"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Id"/> + </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> - <eAnnotations source="http://annotation.elver.org/Id"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Id"/> + </eAnnotations> </eStructuralFeatures> </eClassifiers> </ecore:EPackage> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.genmodel index c5959e620..f52532d70 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.genmodel +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.genmodel @@ -4,10 +4,9 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src" modelPluginID="org.eclipse.emf.teneo.samples" modelName="Jc" importerID="org.eclipse.emf.importer.ecore"> <foreignModel>jc.ecore</foreignModel> - <genPackages prefix="JoinColumns" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" - disposableProviderFactory="true" ecorePackage="jc.ecore#/"> + <genPackages prefix="Joincolumns" disposableProviderFactory="true" ecorePackage="jc.ecore#/"> <genClasses ecoreClass="jc.ecore#//Parent"> - <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference jc.ecore#//Parent/children"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference jc.ecore#//Parent/children"/> </genClasses> <genClasses ecoreClass="jc.ecore#//Child"/> <genClasses ecoreClass="jc.ecore#//Person"> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/CompositeidAdapterFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/JoincolumnsAdapterFactory.java index f93bb94a3..c1b29d1ae 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/CompositeidAdapterFactory.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/JoincolumnsAdapterFactory.java @@ -2,17 +2,16 @@ * <copyright> * </copyright> * - * $Id: CompositeidAdapterFactory.java,v 1.1 2006/07/11 16:57:07 mtaal Exp $ + * $Id: JoincolumnsAdapterFactory.java,v 1.1 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.util; - import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; @@ -21,17 +20,17 @@ import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; * The <b>Adapter Factory</b> for the model. * It provides an adapter <code>createXXX</code> method for each class of the model. * <!-- end-user-doc --> - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage * @generated */ -public class CompositeidAdapterFactory extends AdapterFactoryImpl { +public class JoincolumnsAdapterFactory extends AdapterFactoryImpl { /** * The cached model package. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected static CompositeidPackage modelPackage; + protected static JoincolumnsPackage modelPackage; /** * Creates an instance of the adapter factory. @@ -39,9 +38,9 @@ public class CompositeidAdapterFactory extends AdapterFactoryImpl { * <!-- end-user-doc --> * @generated */ - public CompositeidAdapterFactory() { + public JoincolumnsAdapterFactory() { if (modelPackage == null) { - modelPackage = CompositeidPackage.eINSTANCE; + modelPackage = JoincolumnsPackage.eINSTANCE; } } @@ -69,8 +68,8 @@ public class CompositeidAdapterFactory extends AdapterFactoryImpl { * <!-- end-user-doc --> * @generated */ - protected CompositeidSwitch modelSwitch = - new CompositeidSwitch() { + protected JoincolumnsSwitch modelSwitch = + new JoincolumnsSwitch() { public Object caseParent(Parent object) { return createParentAdapter(); } @@ -99,13 +98,13 @@ public class CompositeidAdapterFactory extends AdapterFactoryImpl { /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Parent <em>Parent</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent <em>Parent</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.annotations.joincolumns.Parent + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent * @generated */ public Adapter createParentAdapter() { @@ -113,13 +112,13 @@ public class CompositeidAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Child <em>Child</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child <em>Child</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.annotations.joincolumns.Child + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child * @generated */ public Adapter createChildAdapter() { @@ -127,13 +126,13 @@ public class CompositeidAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person <em>Person</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person <em>Person</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.annotations.joincolumns.Person + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person * @generated */ public Adapter createPersonAdapter() { @@ -152,4 +151,4 @@ public class CompositeidAdapterFactory extends AdapterFactoryImpl { return null; } -} //CompositeidAdapterFactory +} //JoincolumnsAdapterFactory diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/CompositeidSwitch.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/JoincolumnsSwitch.java index 7d19a54f2..5785677f3 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/CompositeidSwitch.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/JoincolumnsSwitch.java @@ -2,17 +2,16 @@ * <copyright> * </copyright> * - * $Id: CompositeidSwitch.java,v 1.1 2006/07/11 16:57:07 mtaal Exp $ + * $Id: JoincolumnsSwitch.java,v 1.1 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.util; - import java.util.List; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; @@ -26,17 +25,17 @@ import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; * until a non-null result is returned, * which is the result of the switch. * <!-- end-user-doc --> - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage * @generated */ -public class CompositeidSwitch { +public class JoincolumnsSwitch { /** * The cached model package * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected static CompositeidPackage modelPackage; + protected static JoincolumnsPackage modelPackage; /** * Creates an instance of the switch. @@ -44,9 +43,9 @@ public class CompositeidSwitch { * <!-- end-user-doc --> * @generated */ - public CompositeidSwitch() { + public JoincolumnsSwitch() { if (modelPackage == null) { - modelPackage = CompositeidPackage.eINSTANCE; + modelPackage = JoincolumnsPackage.eINSTANCE; } } @@ -90,21 +89,21 @@ public class CompositeidSwitch { */ protected Object doSwitch(int classifierID, EObject theEObject) { switch (classifierID) { - case CompositeidPackage.PARENT: { + case JoincolumnsPackage.PARENT: { Parent parent = (Parent)theEObject; Object result = caseParent(parent); if (result == null) result = casePerson(parent); if (result == null) result = defaultCase(theEObject); return result; } - case CompositeidPackage.CHILD: { + case JoincolumnsPackage.CHILD: { Child child = (Child)theEObject; Object result = caseChild(child); if (result == null) result = casePerson(child); if (result == null) result = defaultCase(theEObject); return result; } - case CompositeidPackage.PERSON: { + case JoincolumnsPackage.PERSON: { Person person = (Person)theEObject; Object result = casePerson(person); if (result == null) result = defaultCase(theEObject); @@ -174,4 +173,4 @@ public class CompositeidSwitch { return null; } -} //CompositeidSwitch +} //JoincolumnsSwitch diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lazy/impl/LazyFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lazy/impl/LazyFactoryImpl.java index ce7df110c..147870260 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lazy/impl/LazyFactoryImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lazy/impl/LazyFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: LazyFactoryImpl.java,v 1.3 2006/09/21 00:56:53 mtaal Exp $ + * $Id: LazyFactoryImpl.java,v 1.4 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl; @@ -12,8 +12,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.emf.teneo.samples.emf.annotations.lazy.*; - import org.eclipse.emf.teneo.samples.emf.annotations.lazy.Book; import org.eclipse.emf.teneo.samples.emf.annotations.lazy.BookCategory; import org.eclipse.emf.teneo.samples.emf.annotations.lazy.LazyFactory; diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobFactory.java index ad739cad3..d712dd60e 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobFactory.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobFactory.java @@ -2,45 +2,45 @@ * <copyright>
* </copyright>
*
- * $Id: LobFactory.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: LobFactory.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob;
import org.eclipse.emf.ecore.EFactory;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage + * @generated */
public interface LobFactory extends EFactory {
- /**
- * The singleton instance of the factory.
+ /** + * The singleton instance of the factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
LobFactory eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.LobFactoryImpl.init();
- /**
- * Returns a new object of class '<em>Person</em>'.
+ /** + * Returns a new object of class '<em>Person</em>'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return a new object of class '<em>Person</em>'.
- * @generated
+ * @return a new object of class '<em>Person</em>'. + * @generated */
- Person createPerson();
-
- /**
- * Returns the package supported by this factory.
+ Person createPerson(); + + /** + * Returns the package supported by this factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
+ * @return the package supported by this factory. + * @generated */
- LobPackage getLobPackage();
-
+ LobPackage getLobPackage(); + } //LobFactory
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobPackage.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobPackage.java index 202e4518c..b8708ec58 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobPackage.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobPackage.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobPackage.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: LobPackage.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob;
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Package</b> for the model.
* It contains accessors for the meta objects to represent
@@ -21,163 +21,163 @@ import org.eclipse.emf.ecore.EPackage; * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobFactory
- * @model kind="package"
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobFactory + * @model kind="package" + * @generated */
public interface LobPackage extends EPackage {
- /**
- * The package name.
+ /** + * The package name. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
String eNAME = "lob";
- /**
- * The package namespace URI.
+ /** + * The package namespace URI. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
String eNS_URI = "http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob";
- /**
- * The package namespace name.
+ /** + * The package namespace name. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
String eNS_PREFIX = "lob";
- /**
- * The singleton instance of the package.
+ /** + * The singleton instance of the package. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
LobPackage eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.LobPackageImpl.init();
- /**
- * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl <em>Person</em>}' class.
+ /** + * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl <em>Person</em>}' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.LobPackageImpl#getPerson()
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.LobPackageImpl#getPerson() + * @generated */
int PERSON = 0;
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
+ /** + * The feature id for the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON__ID = 0;
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
+ /** + * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON__NAME = 1;
- /**
- * The feature id for the '<em><b>Address</b></em>' attribute.
+ /** + * The feature id for the '<em><b>Address</b></em>' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON__ADDRESS = 2;
- /**
- * The feature id for the '<em><b>Photo</b></em>' attribute.
+ /** + * The feature id for the '<em><b>Photo</b></em>' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON__PHOTO = 3;
- /**
- * The number of structural features of the '<em>Person</em>' class.
+ /** + * The number of structural features of the '<em>Person</em>' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON_FEATURE_COUNT = 4;
- /**
- * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person <em>Person</em>}'.
+ /** + * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person <em>Person</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Person</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person
- * @generated
+ * @return the meta object for class '<em>Person</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person + * @generated */
- EClass getPerson();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}'.
+ EClass getPerson(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId()
- * @see #getPerson()
- * @generated
+ * @return the meta object for the attribute '<em>Id</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId() + * @see #getPerson() + * @generated */
- EAttribute getPerson_Id();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName <em>Name</em>}'.
+ EAttribute getPerson_Id(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName <em>Name</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName()
- * @see #getPerson()
- * @generated
+ * @return the meta object for the attribute '<em>Name</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName() + * @see #getPerson() + * @generated */
- EAttribute getPerson_Name();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress <em>Address</em>}'.
+ EAttribute getPerson_Name(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress <em>Address</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Address</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress()
- * @see #getPerson()
- * @generated
+ * @return the meta object for the attribute '<em>Address</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress() + * @see #getPerson() + * @generated */
- EAttribute getPerson_Address();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto <em>Photo</em>}'.
+ EAttribute getPerson_Address(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto <em>Photo</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Photo</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto()
- * @see #getPerson()
- * @generated
+ * @return the meta object for the attribute '<em>Photo</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto() + * @see #getPerson() + * @generated */
- EAttribute getPerson_Photo();
-
- /**
- * Returns the factory that creates the instances of the model.
+ EAttribute getPerson_Photo(); + + /** + * Returns the factory that creates the instances of the model. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the factory that creates the instances of the model.
- * @generated
+ * @return the factory that creates the instances of the model. + * @generated */
- LobFactory getLobFactory();
-
- /**
+ LobFactory getLobFactory(); + + /** * <!-- begin-user-doc -->
* Defines literals for the meta objects that represent
* <ul>
@@ -187,48 +187,48 @@ public interface LobPackage extends EPackage { * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl <em>Person</em>}' class.
+ interface Literals {
+ /** + * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl <em>Person</em>}' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.LobPackageImpl#getPerson()
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.LobPackageImpl#getPerson() + * @generated */
EClass PERSON = eINSTANCE.getPerson();
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+ /** + * The meta object literal for the '<em><b>Id</b></em>' attribute feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EAttribute PERSON__ID = eINSTANCE.getPerson_Id();
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+ /** + * The meta object literal for the '<em><b>Name</b></em>' attribute feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EAttribute PERSON__NAME = eINSTANCE.getPerson_Name();
- /**
- * The meta object literal for the '<em><b>Address</b></em>' attribute feature.
+ /** + * The meta object literal for the '<em><b>Address</b></em>' attribute feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EAttribute PERSON__ADDRESS = eINSTANCE.getPerson_Address();
- /**
- * The meta object literal for the '<em><b>Photo</b></em>' attribute feature.
+ /** + * The meta object literal for the '<em><b>Photo</b></em>' attribute feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EAttribute PERSON__PHOTO = eINSTANCE.getPerson_Photo();
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/Person.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/Person.java index 70fad5637..c9c56716b 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/Person.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/Person.java @@ -2,169 +2,168 @@ * <copyright>
* </copyright>
*
- * $Id: Person.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: Person.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob;
import org.eclipse.emf.ecore.EObject;
-/**
+/** * <!-- begin-user-doc -->
* A representation of the model object '<em><b>Person</b></em>'.
* <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress <em>Address</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto <em>Photo</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson()
- * @model extendedMetaData="name='Person' kind='elementOnly'"
- * @generated
+ * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress <em>Address</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto <em>Photo</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson() + * @model extendedMetaData="name='Person' kind='elementOnly'" + * @generated */
public interface Person extends EObject {
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
+ /** + * Returns the value of the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Id</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #isSetId()
- * @see #unsetId()
- * @see #setId(long)
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Id()
- * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true"
- * annotation="http://annotation.elver.org/Id appinfo='true'"
- * extendedMetaData="kind='element' name='id'"
- * @generated
+ * @return the value of the '<em>Id</em>' attribute. + * @see #isSetId() + * @see #unsetId() + * @see #setId(long) + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Id() + * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true" + * annotation="teneo.jpa appinfo='@Id'" + * extendedMetaData="kind='element' name='id'" + * @generated */
- long getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}' attribute.
+ long getId(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #isSetId()
- * @see #unsetId()
- * @see #getId()
- * @generated
+ * @param value the new value of the '<em>Id</em>' attribute. + * @see #isSetId() + * @see #unsetId() + * @see #getId() + * @generated */
- void setId(long value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}' attribute.
+ void setId(long value); + + /** + * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #isSetId()
- * @see #getId()
- * @see #setId(long)
- * @generated
+ * @see #isSetId() + * @see #getId() + * @see #setId(long) + * @generated */
- void unsetId();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}' attribute is set.
+ void unsetId(); + + /** + * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}' attribute is set. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return whether the value of the '<em>Id</em>' attribute is set.
- * @see #unsetId()
- * @see #getId()
- * @see #setId(long)
- * @generated
+ * @return whether the value of the '<em>Id</em>' attribute is set. + * @see #unsetId() + * @see #getId() + * @see #setId(long) + * @generated */
- boolean isSetId();
-
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
+ boolean isSetId(); + + /** + * Returns the value of the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Name</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Name()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
- * extendedMetaData="kind='element' name='name'"
- * @generated
+ * @return the value of the '<em>Name</em>' attribute. + * @see #setName(String) + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Name() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * extendedMetaData="kind='element' name='name'" + * @generated */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName <em>Name</em>}' attribute.
+ String getName(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName <em>Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
+ * @param value the new value of the '<em>Name</em>' attribute. + * @see #getName() + * @generated */
- void setName(String value);
-
- /**
- * Returns the value of the '<em><b>Address</b></em>' attribute.
+ void setName(String value); + + /** + * Returns the value of the '<em><b>Address</b></em>' attribute. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Address</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Address</em>' attribute.
- * @see #setAddress(String)
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Address()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
- * annotation="http://annotation.elver.org/Lob appinfo='true'"
- * extendedMetaData="kind='element' name='address'"
- * @generated
+ * @return the value of the '<em>Address</em>' attribute. + * @see #setAddress(String) + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Address() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" + * annotation="teneo.jpa appinfo='@Lob'" + * extendedMetaData="kind='element' name='address'" + * @generated */
- String getAddress();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress <em>Address</em>}' attribute.
+ String getAddress(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress <em>Address</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Address</em>' attribute.
- * @see #getAddress()
- * @generated
+ * @param value the new value of the '<em>Address</em>' attribute. + * @see #getAddress() + * @generated */
- void setAddress(String value);
-
- /**
- * Returns the value of the '<em><b>Photo</b></em>' attribute.
+ void setAddress(String value); + + /** + * Returns the value of the '<em><b>Photo</b></em>' attribute. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Photo</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Photo</em>' attribute.
- * @see #setPhoto(byte[])
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Photo()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Base64Binary"
- * annotation="http://annotation.elver.org/Lob appinfo='true'"
- * annotation="http://annotation.elver.org/Column length='1000000'"
- * extendedMetaData="kind='element' name='photo'"
- * @generated
+ * @return the value of the '<em>Photo</em>' attribute. + * @see #setPhoto(byte[]) + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Photo() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Base64Binary" + * annotation="teneo.jpa appinfo='\n\t\t\t\t\t\t@Lob\n\t\t\t\t\t\t@Column(length=1000000)\n\t\t\t\t'" + * extendedMetaData="kind='element' name='photo'" + * @generated */
- byte[] getPhoto();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto <em>Photo</em>}' attribute.
+ byte[] getPhoto(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto <em>Photo</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Photo</em>' attribute.
- * @see #getPhoto()
- * @generated
+ * @param value the new value of the '<em>Photo</em>' attribute. + * @see #getPhoto() + * @generated */
- void setPhoto(byte[] value);
-
+ void setPhoto(byte[] value); + } // Person
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobFactoryImpl.java index b9815e8d1..50d6e99c4 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobFactoryImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobFactoryImpl.java,v 1.1 2006/07/11 16:56:58 mtaal Exp $
+ * $Id: LobFactoryImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.impl;
@@ -16,82 +16,82 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; import org.eclipse.emf.teneo.samples.emf.annotations.lob.*;
-/**
+/** * <!-- begin-user-doc -->
* An implementation of the model <b>Factory</b>.
* <!-- end-user-doc -->
- * @generated
+ * @generated */
public class LobFactoryImpl extends EFactoryImpl implements LobFactory {
- /**
- * Creates the default factory implementation.
+ /** + * Creates the default factory implementation. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public static LobFactory init() {
- try {
- LobFactory theLobFactory = (LobFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob");
- if (theLobFactory != null) {
- return theLobFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new LobFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
+ public static LobFactory init() { + try { + LobFactory theLobFactory = (LobFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob"); + if (theLobFactory != null) { + return theLobFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new LobFactoryImpl(); + } + + /** + * Creates an instance of the factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public LobFactoryImpl() {
- super();
- }
-
- /**
+ public LobFactoryImpl() { + super(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case LobPackage.PERSON: return createPerson();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
- }
- }
-
- /**
+ public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case LobPackage.PERSON: return createPerson(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Person createPerson() {
- PersonImpl person = new PersonImpl();
- return person;
- }
-
- /**
+ public Person createPerson() { + PersonImpl person = new PersonImpl(); + return person; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public LobPackage getLobPackage() {
- return (LobPackage)getEPackage();
- }
-
- /**
+ public LobPackage getLobPackage() { + return (LobPackage)getEPackage(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @deprecated
- * @generated
+ * @deprecated + * @generated */
- public static LobPackage getPackage() {
- return LobPackage.eINSTANCE;
- }
-
+ public static LobPackage getPackage() { + return LobPackage.eINSTANCE; + } + } //LobFactoryImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobPackageImpl.java index 440e47367..97b6abcd7 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobPackageImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobPackageImpl.java,v 1.1 2006/07/11 16:56:58 mtaal Exp $
+ * $Id: LobPackageImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.impl;
@@ -18,317 +18,287 @@ import org.eclipse.emf.teneo.samples.emf.annotations.lob.LobFactory; import org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage;
import org.eclipse.emf.teneo.samples.emf.annotations.lob.Person;
-/**
+/** * <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
* <!-- end-user-doc -->
- * @generated
+ * @generated */
public class LobPackageImpl extends EPackageImpl implements LobPackage {
- /**
+ /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private EClass personEClass = 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.
- * <p>Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
+ /** + * 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. + * <p>Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#eNS_URI
- * @see #init()
- * @generated
+ * @see org.eclipse.emf.ecore.EPackage.Registry + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#eNS_URI + * @see #init() + * @generated */
- private LobPackageImpl() {
- super(eNS_URI, LobFactory.eINSTANCE);
- }
-
- /**
+ private LobPackageImpl() { + super(eNS_URI, LobFactory.eINSTANCE); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private static boolean isInited = false;
- /**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
+ /** + * Creates, registers, and initializes the <b>Package</b> for this + * model, and for any others upon which it depends. Simple + * dependencies are satisfied by calling this method on all + * dependent packages before doing anything else. This method drives + * initialization for interdependent packages directly, in parallel + * with this package, itself. + * <p>Of this package and its interdependencies, all packages which + * have not yet been registered by their URI values are first created + * and registered. The packages are then initialized in two steps: + * meta-model objects for all of the packages are created before any + * are initialized, since one package's meta-model objects may refer to + * those of another. + * <p>Invocation of this method will not affect any packages that have + * already been initialized. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
+ * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated */
- public static LobPackage init() {
- if (isInited) return (LobPackage)EPackage.Registry.INSTANCE.getEPackage(LobPackage.eNS_URI);
-
- // Obtain or create and register package
- LobPackageImpl theLobPackage = (LobPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof LobPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new LobPackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- XMLTypePackage.eINSTANCE.eClass();
-
- // Create package meta-data objects
- theLobPackage.createPackageContents();
-
- // Initialize created meta-data
- theLobPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theLobPackage.freeze();
-
- return theLobPackage;
- }
-
- /**
+ public static LobPackage init() { + if (isInited) return (LobPackage)EPackage.Registry.INSTANCE.getEPackage(LobPackage.eNS_URI); + + // Obtain or create and register package + LobPackageImpl theLobPackage = (LobPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof LobPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new LobPackageImpl()); + + isInited = true; + + // Initialize simple dependencies + XMLTypePackage.eINSTANCE.eClass(); + + // Create package meta-data objects + theLobPackage.createPackageContents(); + + // Initialize created meta-data + theLobPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theLobPackage.freeze(); + + return theLobPackage; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EClass getPerson() {
- return personEClass;
- }
-
- /**
+ public EClass getPerson() { + return personEClass; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EAttribute getPerson_Id() {
- return (EAttribute)personEClass.getEStructuralFeatures().get(0);
- }
-
- /**
+ public EAttribute getPerson_Id() { + return (EAttribute)personEClass.getEStructuralFeatures().get(0); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EAttribute getPerson_Name() {
- return (EAttribute)personEClass.getEStructuralFeatures().get(1);
- }
-
- /**
+ public EAttribute getPerson_Name() { + return (EAttribute)personEClass.getEStructuralFeatures().get(1); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EAttribute getPerson_Address() {
- return (EAttribute)personEClass.getEStructuralFeatures().get(2);
- }
-
- /**
+ public EAttribute getPerson_Address() { + return (EAttribute)personEClass.getEStructuralFeatures().get(2); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EAttribute getPerson_Photo() {
- return (EAttribute)personEClass.getEStructuralFeatures().get(3);
- }
-
- /**
+ public EAttribute getPerson_Photo() { + return (EAttribute)personEClass.getEStructuralFeatures().get(3); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public LobFactory getLobFactory() {
- return (LobFactory)getEFactoryInstance();
- }
-
- /**
+ public LobFactory getLobFactory() { + return (LobFactory)getEFactoryInstance(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private boolean isCreated = false;
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
+ /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void createPackageContents() {
- if (isCreated) return;
- isCreated = true;
-
- // Create classes and their features
- personEClass = createEClass(PERSON);
- createEAttribute(personEClass, PERSON__ID);
- createEAttribute(personEClass, PERSON__NAME);
- createEAttribute(personEClass, PERSON__ADDRESS);
- createEAttribute(personEClass, PERSON__PHOTO);
- }
-
- /**
+ public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + personEClass = createEClass(PERSON); + createEAttribute(personEClass, PERSON__ID); + createEAttribute(personEClass, PERSON__NAME); + createEAttribute(personEClass, PERSON__ADDRESS); + createEAttribute(personEClass, PERSON__PHOTO); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private boolean isInitialized = false;
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Obtain other dependent packages
- XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(personEClass, Person.class, "Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPerson_Id(), theXMLTypePackage.getLong(), "id", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPerson_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPerson_Address(), theXMLTypePackage.getString(), "address", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPerson_Photo(), theXMLTypePackage.getBase64Binary(), "photo", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
- // http://annotation.elver.org/Id
- createIdAnnotations();
- // http://annotation.elver.org/Lob
- createLobAnnotations();
- // http://annotation.elver.org/Column
- createColumnAnnotations();
- }
-
- /**
- * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
+ /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected void createExtendedMetaDataAnnotations() {
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
- addAnnotation
- (personEClass,
- source,
- new String[] {
- "name", "Person",
- "kind", "elementOnly"
- });
- addAnnotation
- (getPerson_Id(),
- source,
- new String[] {
- "kind", "element",
- "name", "id"
- });
- addAnnotation
- (getPerson_Name(),
- source,
- new String[] {
- "kind", "element",
- "name", "name"
- });
- addAnnotation
- (getPerson_Address(),
- source,
- new String[] {
- "kind", "element",
- "name", "address"
- });
- addAnnotation
- (getPerson_Photo(),
- source,
- new String[] {
- "kind", "element",
- "name", "photo"
- });
- }
-
- /**
- * Initializes the annotations for <b>http://annotation.elver.org/Id</b>.
+ public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Obtain other dependent packages + XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI); + + // Add supertypes to classes + + // Initialize classes and features; add operations and parameters + initEClass(personEClass, Person.class, "Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getPerson_Id(), theXMLTypePackage.getLong(), "id", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPerson_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPerson_Address(), theXMLTypePackage.getString(), "address", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPerson_Photo(), theXMLTypePackage.getBase64Binary(), "photo", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + // Create resource + createResource(eNS_URI); + + // Create annotations + // http:///org/eclipse/emf/ecore/util/ExtendedMetaData + createExtendedMetaDataAnnotations(); + // teneo.jpa + createTeneoAnnotations(); + } + + /** + * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected void createIdAnnotations() {
- String source = "http://annotation.elver.org/Id";
- addAnnotation
- (getPerson_Id(),
- source,
- new String[] {
- "appinfo", "true"
- });
- }
-
- /**
- * Initializes the annotations for <b>http://annotation.elver.org/Lob</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createLobAnnotations() {
- String source = "http://annotation.elver.org/Lob";
- addAnnotation
- (getPerson_Address(),
- source,
- new String[] {
- "appinfo", "true"
- });
- addAnnotation
- (getPerson_Photo(),
- source,
- new String[] {
- "appinfo", "true"
- });
- }
-
- /**
- * Initializes the annotations for <b>http://annotation.elver.org/Column</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createColumnAnnotations() {
- String source = "http://annotation.elver.org/Column";
- addAnnotation
- (getPerson_Photo(),
- source,
- new String[] {
- "length", "1000000"
- });
- }
-
+ protected void createExtendedMetaDataAnnotations() { + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + addAnnotation + (personEClass, + source, + new String[] { + "name", "Person", + "kind", "elementOnly" + }); + addAnnotation + (getPerson_Id(), + source, + new String[] { + "kind", "element", + "name", "id" + }); + addAnnotation + (getPerson_Name(), + source, + new String[] { + "kind", "element", + "name", "name" + }); + addAnnotation + (getPerson_Address(), + source, + new String[] { + "kind", "element", + "name", "address" + }); + addAnnotation + (getPerson_Photo(), + source, + new String[] { + "kind", "element", + "name", "photo" + }); + } + + /** + * Initializes the annotations for <b>teneo.jpa</b>. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; + addAnnotation + (getPerson_Id(), + source, + new String[] { + "appinfo", "@Id" + }); + addAnnotation + (getPerson_Address(), + source, + new String[] { + "appinfo", "@Lob" + }); + addAnnotation + (getPerson_Photo(), + source, + new String[] { + "appinfo", "\n\t\t\t\t\t\t@Lob\n\t\t\t\t\t\t@Column(length=1000000)\n\t\t\t\t" + }); + } + } //LobPackageImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/PersonImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/PersonImpl.java index 6a2a3d7ed..7f81db63a 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/PersonImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/PersonImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: PersonImpl.java,v 1.1 2006/07/11 16:56:58 mtaal Exp $
+ * $Id: PersonImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.impl;
@@ -16,342 +16,342 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage;
import org.eclipse.emf.teneo.samples.emf.annotations.lob.Person;
-/**
+/** * <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Person</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getAddress <em>Address</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getPhoto <em>Photo</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
+ * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getAddress <em>Address</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getPhoto <em>Photo</em>}</li> + * </ul> + * </p> + * + * @generated */
public class PersonImpl extends EObjectImpl implements Person {
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+ /** + * The default value of the '{@link #getId() <em>Id</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
+ * @see #getId() + * @generated + * @ordered */
protected static final long ID_EDEFAULT = 0L;
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+ /** + * The cached value of the '{@link #getId() <em>Id</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
+ * @see #getId() + * @generated + * @ordered */
protected long id = ID_EDEFAULT;
- /**
- * This is true if the Id attribute has been set.
+ /** + * This is true if the Id attribute has been set. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
protected boolean idESet = false;
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ /** + * The default value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
+ * @see #getName() + * @generated + * @ordered */
protected static final String NAME_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ /** + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
+ * @see #getName() + * @generated + * @ordered */
protected String name = NAME_EDEFAULT;
- /**
- * The default value of the '{@link #getAddress() <em>Address</em>}' attribute.
+ /** + * The default value of the '{@link #getAddress() <em>Address</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getAddress()
- * @generated
- * @ordered
+ * @see #getAddress() + * @generated + * @ordered */
protected static final String ADDRESS_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getAddress() <em>Address</em>}' attribute.
+ /** + * The cached value of the '{@link #getAddress() <em>Address</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getAddress()
- * @generated
- * @ordered
+ * @see #getAddress() + * @generated + * @ordered */
protected String address = ADDRESS_EDEFAULT;
- /**
- * The default value of the '{@link #getPhoto() <em>Photo</em>}' attribute.
+ /** + * The default value of the '{@link #getPhoto() <em>Photo</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getPhoto()
- * @generated
- * @ordered
+ * @see #getPhoto() + * @generated + * @ordered */
protected static final byte[] PHOTO_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getPhoto() <em>Photo</em>}' attribute.
+ /** + * The cached value of the '{@link #getPhoto() <em>Photo</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getPhoto()
- * @generated
- * @ordered
+ * @see #getPhoto() + * @generated + * @ordered */
protected byte[] photo = PHOTO_EDEFAULT;
- /**
+ /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected PersonImpl() {
- super();
- }
-
- /**
+ protected PersonImpl() { + super(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected EClass eStaticClass() {
- return LobPackage.Literals.PERSON;
- }
-
- /**
+ protected EClass eStaticClass() { + return LobPackage.Literals.PERSON; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public long getId() {
- return id;
- }
-
- /**
+ public long getId() { + return id; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void setId(long newId) {
- long oldId = id;
- id = newId;
- boolean oldIdESet = idESet;
- idESet = true;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__ID, oldId, id, !oldIdESet));
- }
-
- /**
+ public void setId(long newId) { + long oldId = id; + id = newId; + boolean oldIdESet = idESet; + idESet = true; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__ID, oldId, id, !oldIdESet)); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void unsetId() {
- long oldId = id;
- boolean oldIdESet = idESet;
- id = ID_EDEFAULT;
- idESet = false;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, LobPackage.PERSON__ID, oldId, ID_EDEFAULT, oldIdESet));
- }
-
- /**
+ public void unsetId() { + long oldId = id; + boolean oldIdESet = idESet; + id = ID_EDEFAULT; + idESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, LobPackage.PERSON__ID, oldId, ID_EDEFAULT, oldIdESet)); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public boolean isSetId() {
- return idESet;
- }
-
- /**
+ public boolean isSetId() { + return idESet; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public String getName() {
- return name;
- }
-
- /**
+ public String getName() { + return name; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__NAME, oldName, name));
- }
-
- /**
+ public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__NAME, oldName, name)); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public String getAddress() {
- return address;
- }
-
- /**
+ public String getAddress() { + return address; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void setAddress(String newAddress) {
- String oldAddress = address;
- address = newAddress;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__ADDRESS, oldAddress, address));
- }
-
- /**
+ public void setAddress(String newAddress) { + String oldAddress = address; + address = newAddress; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__ADDRESS, oldAddress, address)); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public byte[] getPhoto() {
- return photo;
- }
-
- /**
+ public byte[] getPhoto() { + return photo; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void setPhoto(byte[] newPhoto) {
- byte[] oldPhoto = photo;
- photo = newPhoto;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__PHOTO, oldPhoto, photo));
- }
-
- /**
+ public void setPhoto(byte[] newPhoto) { + byte[] oldPhoto = photo; + photo = newPhoto; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__PHOTO, oldPhoto, photo)); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case LobPackage.PERSON__ID:
- return new Long(getId());
- case LobPackage.PERSON__NAME:
- return getName();
- case LobPackage.PERSON__ADDRESS:
- return getAddress();
- case LobPackage.PERSON__PHOTO:
- return getPhoto();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
+ public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case LobPackage.PERSON__ID: + return new Long(getId()); + case LobPackage.PERSON__NAME: + return getName(); + case LobPackage.PERSON__ADDRESS: + return getAddress(); + case LobPackage.PERSON__PHOTO: + return getPhoto(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case LobPackage.PERSON__ID:
- setId(((Long)newValue).longValue());
- return;
- case LobPackage.PERSON__NAME:
- setName((String)newValue);
- return;
- case LobPackage.PERSON__ADDRESS:
- setAddress((String)newValue);
- return;
- case LobPackage.PERSON__PHOTO:
- setPhoto((byte[])newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
+ public void eSet(int featureID, Object newValue) { + switch (featureID) { + case LobPackage.PERSON__ID: + setId(((Long)newValue).longValue()); + return; + case LobPackage.PERSON__NAME: + setName((String)newValue); + return; + case LobPackage.PERSON__ADDRESS: + setAddress((String)newValue); + return; + case LobPackage.PERSON__PHOTO: + setPhoto((byte[])newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void eUnset(int featureID) {
- switch (featureID) {
- case LobPackage.PERSON__ID:
- unsetId();
- return;
- case LobPackage.PERSON__NAME:
- setName(NAME_EDEFAULT);
- return;
- case LobPackage.PERSON__ADDRESS:
- setAddress(ADDRESS_EDEFAULT);
- return;
- case LobPackage.PERSON__PHOTO:
- setPhoto(PHOTO_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
+ public void eUnset(int featureID) { + switch (featureID) { + case LobPackage.PERSON__ID: + unsetId(); + return; + case LobPackage.PERSON__NAME: + setName(NAME_EDEFAULT); + return; + case LobPackage.PERSON__ADDRESS: + setAddress(ADDRESS_EDEFAULT); + return; + case LobPackage.PERSON__PHOTO: + setPhoto(PHOTO_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case LobPackage.PERSON__ID:
- return isSetId();
- case LobPackage.PERSON__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case LobPackage.PERSON__ADDRESS:
- return ADDRESS_EDEFAULT == null ? address != null : !ADDRESS_EDEFAULT.equals(address);
- case LobPackage.PERSON__PHOTO:
- return PHOTO_EDEFAULT == null ? photo != null : !PHOTO_EDEFAULT.equals(photo);
- }
- return super.eIsSet(featureID);
- }
-
- /**
+ public boolean eIsSet(int featureID) { + switch (featureID) { + case LobPackage.PERSON__ID: + return isSetId(); + case LobPackage.PERSON__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case LobPackage.PERSON__ADDRESS: + return ADDRESS_EDEFAULT == null ? address != null : !ADDRESS_EDEFAULT.equals(address); + case LobPackage.PERSON__PHOTO: + return PHOTO_EDEFAULT == null ? photo != null : !PHOTO_EDEFAULT.equals(photo); + } + return super.eIsSet(featureID); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (id: ");
- if (idESet) result.append(id); else result.append("<unset>");
- result.append(", name: ");
- result.append(name);
- result.append(", address: ");
- result.append(address);
- result.append(", photo: ");
- result.append(photo);
- result.append(')');
- return result.toString();
- }
-
+ public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (id: "); + if (idESet) result.append(id); else result.append("<unset>"); + result.append(", name: "); + result.append(name); + result.append(", address: "); + result.append(address); + result.append(", photo: "); + result.append(photo); + result.append(')'); + return result.toString(); + } + } //PersonImpl
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.ecore index 7d3b7856d..f180b9ab8 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.ecore @@ -1,51 +1,48 @@ -<?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="lob"
- nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob" nsPrefix="lob">
- <eClassifiers xsi:type="ecore:EClass" name="Person">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="Person"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" unique="false" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Long" unsettable="true">
- <eAnnotations source="http://annotation.elver.org/Id">
- <details key="appinfo" value="true"/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="id"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="name"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="address" unique="false"
- eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
- <eAnnotations source="http://annotation.elver.org/Lob">
- <details key="appinfo" value="true"/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="address"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="photo" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Base64Binary">
- <eAnnotations source="http://annotation.elver.org/Lob">
- <details key="appinfo" value="true"/>
- </eAnnotations>
- <eAnnotations source="http://annotation.elver.org/Column">
- <details key="length" value="1000000"/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="photo"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?> +<ecore:EPackage xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="lob" + nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob" nsPrefix="lob"> + <eClassifiers xsi:type="ecore:EClass" name="Person"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="Person"/> + <details key="kind" value="elementOnly"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" 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="@Id"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="id"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="name"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="address" unique="false" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Lob"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="address"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="photo" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Base64Binary"> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="
						@Lob
						@Column(length=1000000)
				"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="photo"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> +</ecore:EPackage> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.genmodel index 13ef9ebfe..518017d6b 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.genmodel +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.genmodel @@ -1,16 +1,16 @@ -<?xml version="1.0" encoding="UTF-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="Lob" importerID="org.eclipse.xsd.ecore.importer">
- <foreignModel>lob.xsd</foreignModel>
- <genPackages prefix="Lob" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" resource="XML"
- disposableProviderFactory="true" ecorePackage="lob.ecore#/">
- <genClasses ecoreClass="lob.ecore#//Person">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/id"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/name"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/address"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/photo"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-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="Lob" importerID="org.eclipse.xsd.ecore.importer"> + <foreignModel>lob.xsd</foreignModel> + <genPackages prefix="Lob" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" + resource="XML" disposableProviderFactory="true" ecorePackage="lob.ecore#/"> + <genClasses ecoreClass="lob.ecore#//Person"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/id"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/name"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/address"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/photo"/> + </genClasses> + </genPackages> +</genmodel:GenModel> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.xsd index 87e5b4ef0..eb384c307 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.xsd @@ -5,21 +5,23 @@ <xsd:sequence>
<xsd:element name="id" type="xsd:long">
<xsd:annotation>
- <xsd:appinfo source="http://annotation.elver.org/Id">true</xsd:appinfo>
+ <xsd:appinfo source="teneo.jpa">@Id</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="name" type="xsd:string"/>
<xsd:element name="address" type="xsd:string" minOccurs="0">
<!-- Will be mapped to a 'text' field. -->
<xsd:annotation>
- <xsd:appinfo source="http://annotation.elver.org/Lob">true</xsd:appinfo>
+ <xsd:appinfo source="teneo.jpa">@Lob</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="photo" type="xsd:base64Binary" minOccurs="0">
<!-- Will be mapped to a 'binary' field. -->
<xsd:annotation>
- <xsd:appinfo source="http://annotation.elver.org/Lob">true</xsd:appinfo>
- <xsd:appinfo source="http://annotation.elver.org/Column" ecore:key="length">1000000</xsd:appinfo>
+ <xsd:appinfo source="teneo.jpa"> + @Lob
+ @Column(length=1000000) + </xsd:appinfo>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobAdapterFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobAdapterFactory.java index 824a0de02..4dc4fe663 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobAdapterFactory.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobAdapterFactory.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobAdapterFactory.java,v 1.1 2006/07/11 16:57:08 mtaal Exp $
+ * $Id: LobAdapterFactory.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.util;
@@ -15,106 +15,106 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.teneo.samples.emf.annotations.lob.*;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage + * @generated */
public class LobAdapterFactory extends AdapterFactoryImpl {
- /**
- * The cached model package.
+ /** + * The cached model package. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
protected static LobPackage modelPackage;
- /**
- * Creates an instance of the adapter factory.
+ /** + * Creates an instance of the adapter factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public LobAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = LobPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
+ public LobAdapterFactory() { + if (modelPackage == null) { + modelPackage = LobPackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. * <!-- begin-user-doc -->
* This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
* <!-- end-user-doc -->
- * @return whether this factory is applicable for the type of the object.
- * @generated
+ * @return whether this factory is applicable for the type of the object. + * @generated */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the <code>createXXX</code> methods.
+ public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch the delegates to the <code>createXXX</code> methods. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected LobSwitch modelSwitch =
- new LobSwitch() {
- public Object casePerson(Person object) {
- return createPersonAdapter();
- }
- public Object defaultCase(EObject object) {
- return createEObjectAdapter();
- }
+ protected LobSwitch modelSwitch = + new LobSwitch() { + public Object casePerson(Person object) { + return createPersonAdapter(); + } + public Object defaultCase(EObject object) { + return createEObjectAdapter(); + } };
- /**
- * Creates an adapter for the <code>target</code>.
+ /** + * Creates an adapter for the <code>target</code>. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param target the object to adapt.
- * @return the adapter for the <code>target</code>.
- * @generated
+ * @param target the object to adapt. + * @return the adapter for the <code>target</code>. + * @generated */
- public Adapter createAdapter(Notifier target) {
- return (Adapter)modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person <em>Person</em>}'.
+ public Adapter createAdapter(Notifier target) { + return (Adapter)modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person <em>Person</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.lob.Person
- * @generated
+ * @return the new adapter. + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person + * @generated */
- public Adapter createPersonAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case.
+ public Adapter createPersonAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. * <!-- begin-user-doc -->
* This default implementation returns null.
* <!-- end-user-doc -->
- * @return the new adapter.
- * @generated
+ * @return the new adapter. + * @generated */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
+ public Adapter createEObjectAdapter() { + return null; + } + } //LobAdapterFactory
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceFactoryImpl.java index 389232deb..03380ddb3 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceFactoryImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobResourceFactoryImpl.java,v 1.1 2006/07/11 16:57:08 mtaal Exp $
+ * $Id: LobResourceFactoryImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.util;
@@ -14,42 +14,42 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; import org.eclipse.emf.ecore.xmi.XMLResource;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Resource Factory</b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.util.LobResourceImpl
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.util.LobResourceImpl + * @generated */
public class LobResourceFactoryImpl extends ResourceFactoryImpl {
- /**
- * Creates an instance of the resource factory.
+ /** + * Creates an instance of the resource factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public LobResourceFactoryImpl() {
- super();
- }
-
- /**
- * Creates an instance of the resource.
+ public LobResourceFactoryImpl() { + super(); + } + + /** + * Creates an instance of the resource. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Resource createResource(URI uri) {
- XMLResource result = new LobResourceImpl(uri);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
- result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
- result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
- return result;
- }
-
+ public Resource createResource(URI uri) { + XMLResource result = new LobResourceImpl(uri); + result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); + result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); + + result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE); + + result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE); + result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE); + + result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE); + return result; + } + } //LobResourceFactoryImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceImpl.java index b2a55bb2b..42ec2a078 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobResourceImpl.java,v 1.1 2006/07/11 16:57:08 mtaal Exp $
+ * $Id: LobResourceImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.util;
@@ -10,23 +10,23 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Resource </b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.util.LobResourceFactoryImpl
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.util.LobResourceFactoryImpl + * @generated */
public class LobResourceImpl extends XMLResourceImpl {
- /**
- * Creates an instance of the resource.
+ /** + * Creates an instance of the resource. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param uri the URI of the new resource.
- * @generated
+ * @param uri the URI of the new resource. + * @generated */
- public LobResourceImpl(URI uri) {
- super(uri);
- }
-
+ public LobResourceImpl(URI uri) { + super(uri); + } + } //LobResourceImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobSwitch.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobSwitch.java index 14b0cdf44..2f0a215b4 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobSwitch.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobSwitch.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobSwitch.java,v 1.1 2006/07/11 16:57:08 mtaal Exp $
+ * $Id: LobSwitch.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.util;
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.teneo.samples.emf.annotations.lob.*;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
* It supports the call {@link #doSwitch(EObject) doSwitch(object)}
@@ -23,108 +23,108 @@ import org.eclipse.emf.teneo.samples.emf.annotations.lob.*; * until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage + * @generated */
public class LobSwitch {
- /**
- * The cached model package
+ /** + * The cached model package * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
protected static LobPackage modelPackage;
- /**
- * Creates an instance of the switch.
+ /** + * Creates an instance of the switch. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public LobSwitch() {
- if (modelPackage == null) {
- modelPackage = LobPackage.eINSTANCE;
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ public LobSwitch() { + if (modelPackage == null) { + modelPackage = LobPackage.eINSTANCE; + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
+ * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated */
- public Object doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ public Object doSwitch(EObject theEObject) { + return doSwitch(theEObject.eClass(), theEObject); + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
+ * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated */
- protected Object doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else {
- List eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch((EClass)eSuperTypes.get(0), theEObject);
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ protected Object doSwitch(EClass theEClass, EObject theEObject) { + if (theEClass.eContainer() == modelPackage) { + return doSwitch(theEClass.getClassifierID(), theEObject); + } + else { + List eSuperTypes = theEClass.getESuperTypes(); + return + eSuperTypes.isEmpty() ? + defaultCase(theEObject) : + doSwitch((EClass)eSuperTypes.get(0), theEObject); + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
+ * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated */
- protected Object doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case LobPackage.PERSON: {
- Person person = (Person)theEObject;
- Object result = casePerson(person);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Person</em>'.
+ protected Object doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case LobPackage.PERSON: { + Person person = (Person)theEObject; + Object result = casePerson(person); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpretting the object as an instance of '<em>Person</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>Person</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
+ * @param object the target of the switch. + * @return the result of interpretting the object as an instance of '<em>Person</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated */
- public Object casePerson(Person object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+ public Object casePerson(Person object) { + return null; + } + + /** + * Returns the result of interpretting the object as an instance of '<em>EObject</em>'. * <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch, but this is the last case anyway.
* <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
+ * @param object the target of the switch. + * @return the result of interpretting the object as an instance of '<em>EObject</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated */
- public Object defaultCase(EObject object) {
- return null;
- }
-
+ public Object defaultCase(EObject object) { + return null; + } + } //LobSwitch
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobXMLProcessor.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobXMLProcessor.java index b21e6f9c6..b4006ae75 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobXMLProcessor.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobXMLProcessor.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobXMLProcessor.java,v 1.1 2006/07/11 16:57:08 mtaal Exp $
+ * $Id: LobXMLProcessor.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.util;
@@ -14,37 +14,37 @@ import org.eclipse.emf.ecore.xmi.util.XMLProcessor; import org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage;
-/**
- * This class contains helper methods to serialize and deserialize XML documents
+/** + * This class contains helper methods to serialize and deserialize XML documents * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
public class LobXMLProcessor extends XMLProcessor {
- /**
- * Public constructor to instantiate the helper.
+ /** + * Public constructor to instantiate the helper. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public LobXMLProcessor() {
- super((EPackage.Registry.INSTANCE));
- LobPackage.eINSTANCE.eClass();
- }
-
- /**
- * Register for "*" and "xml" file extensions the LobResourceFactoryImpl factory.
+ public LobXMLProcessor() { + super((EPackage.Registry.INSTANCE)); + LobPackage.eINSTANCE.eClass(); + } + + /** + * Register for "*" and "xml" file extensions the LobResourceFactoryImpl factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected Map getRegistrations() {
- if (registrations == null) {
- super.getRegistrations();
- registrations.put(XML_EXTENSION, new LobResourceFactoryImpl());
- registrations.put(STAR_EXTENSION, new LobResourceFactoryImpl());
- }
- return registrations;
- }
-
+ protected Map getRegistrations() { + if (registrations == null) { + super.getRegistrations(); + registrations.put(XML_EXTENSION, new LobResourceFactoryImpl()); + registrations.put(STAR_EXTENSION, new LobResourceFactoryImpl()); + } + return registrations; + } + } //LobXMLProcessor
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/Document.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/Document.java index 6dca1430f..f3a531e47 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/Document.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/Document.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Document.java,v 1.1 2006/07/11 16:57:16 mtaal Exp $ + * $Id: Document.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass; @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject; * </p> * * @see org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.MappedsuperclassPackage#getDocument() - * @model annotation="http://annotation.elver.org/MappedSuperclass appinfo='true'" + * @model annotation="teneo.jpa appinfo='@MappedSuperclass'" * extendedMetaData="name='Document' kind='elementOnly'" * @generated */ @@ -41,7 +41,7 @@ public interface Document extends EObject { * @see #setMyId(long) * @see org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.MappedsuperclassPackage#getDocument_MyId() * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true" - * annotation="http://annotation.elver.org/Id appinfo='true'" + * annotation="teneo.jpa appinfo='@Id'" * extendedMetaData="kind='element' name='myId'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/ParentDocument.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/ParentDocument.java index f66e8f166..98a5f7cdf 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/ParentDocument.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/ParentDocument.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ParentDocument.java,v 1.1 2006/07/11 16:57:16 mtaal Exp $ + * $Id: ParentDocument.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass; @@ -20,7 +20,7 @@ package org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass; * </p> * * @see org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.MappedsuperclassPackage#getParentDocument() - * @model annotation="http://annotation.elver.org/MappedSuperclass appinfo='true'" + * @model annotation="teneo.jpa appinfo='@MappedSuperclass'" * extendedMetaData="name='ParentDocument' kind='elementOnly'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/impl/MappedsuperclassPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/impl/MappedsuperclassPackageImpl.java index 703aa338e..5d851f97c 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/impl/MappedsuperclassPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/impl/MappedsuperclassPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MappedsuperclassPackageImpl.java,v 1.1 2006/07/11 16:56:58 mtaal Exp $ + * $Id: MappedsuperclassPackageImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl; @@ -266,33 +266,37 @@ public class MappedsuperclassPackageImpl extends EPackageImpl implements Mappeds createResource(eNS_URI); // Create annotations - // http://annotation.elver.org/MappedSuperclass - createMappedSuperclassAnnotations(); + // teneo.jpa + createTeneoAnnotations(); // http:///org/eclipse/emf/ecore/util/ExtendedMetaData createExtendedMetaDataAnnotations(); - // http://annotation.elver.org/Id - createIdAnnotations(); } /** - * Initializes the annotations for <b>http://annotation.elver.org/MappedSuperclass</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createMappedSuperclassAnnotations() { - String source = "http://annotation.elver.org/MappedSuperclass"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (documentEClass, source, new String[] { - "appinfo", "true" - }); + "appinfo", "@MappedSuperclass" + }); + addAnnotation + (getDocument_MyId(), + source, + new String[] { + "appinfo", "@Id" + }); addAnnotation (parentDocumentEClass, source, new String[] { - "appinfo", "true" + "appinfo", "@MappedSuperclass" }); } @@ -355,20 +359,4 @@ public class MappedsuperclassPackageImpl extends EPackageImpl implements Mappeds }); } - /** - * Initializes the annotations for <b>http://annotation.elver.org/Id</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createIdAnnotations() { - String source = "http://annotation.elver.org/Id"; - addAnnotation - (getDocument_MyId(), - source, - new String[] { - "appinfo", "true" - }); - } - } //MappedsuperclassPackageImpl diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mappedsuperclass.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mappedsuperclass.ecore index e5a389927..3cf8d0c2a 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mappedsuperclass.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mappedsuperclass.ecore @@ -2,10 +2,11 @@ <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="mappedsuperclass" - nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass" nsPrefix="mappedsuperclass"> + nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass" + nsPrefix="mappedsuperclass"> <eClassifiers xsi:type="ecore:EClass" name="Document"> - <eAnnotations source="http://annotation.elver.org/MappedSuperclass"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@MappedSuperclass"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Document"/> @@ -13,8 +14,8 @@ </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="http://annotation.elver.org/Id"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Id"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> @@ -30,8 +31,8 @@ </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ParentDocument" eSuperTypes="#//Document"> - <eAnnotations source="http://annotation.elver.org/MappedSuperclass"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@MappedSuperclass"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="ParentDocument"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mps.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mps.xsd index f5dcdc1bb..c1feb98ea 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mps.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mps.xsd @@ -6,12 +6,12 @@ <xsd:complexType name="Document"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/MappedSuperclass">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@MappedSuperclass</xsd:appinfo> </xsd:annotation> <xsd:sequence> <xsd:element name="myId" type="xsd:long"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Id">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Id</xsd:appinfo> </xsd:annotation> </xsd:element> <xsd:element name="myGenericInfo" type="xsd:string"/> @@ -20,7 +20,7 @@ <xsd:complexType name="ParentDocument"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/MappedSuperclass">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@MappedSuperclass</xsd:appinfo> </xsd:annotation> <xsd:complexContent> <xsd:extension base="this:Document"> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/MyItem.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/MyItem.java index 3122477d3..d9633d4ce 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/MyItem.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/MyItem.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MyItem.java,v 1.1 2006/07/11 16:56:59 mtaal Exp $ + * $Id: MyItem.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.nmset; @@ -68,7 +68,7 @@ public interface MyItem extends EObject { * @see org.eclipse.emf.teneo.samples.emf.annotations.nmset.NmsetPackage#getMyItem_YourItem() * @see org.eclipse.emf.teneo.samples.emf.annotations.nmset.YourItem#getMyItem * @model type="org.eclipse.emf.teneo.samples.emf.annotations.nmset.YourItem" opposite="myItem" required="true" - * annotation="http://annotation.elver.org/Indexed value='false'" + * annotation="teneo.jpa appinfo='@ManyToMany(Indexed=false)'" * extendedMetaData="kind='element' name='yourItem'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/YourItem.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/YourItem.java index 094c72455..1d338d60f 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/YourItem.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/YourItem.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: YourItem.java,v 1.1 2006/07/11 16:56:59 mtaal Exp $ + * $Id: YourItem.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.nmset; @@ -68,7 +68,7 @@ public interface YourItem extends EObject { * @see org.eclipse.emf.teneo.samples.emf.annotations.nmset.NmsetPackage#getYourItem_MyItem() * @see org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem#getYourItem * @model type="org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem" opposite="yourItem" required="true" - * annotation="http://facet.elver.org/Indexed value='false'" + * annotation="teneo.jpa appinfo='@ManyToMany(Indexed=false)'" * extendedMetaData="kind='element' name='myItem'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetFactoryImpl.java index 09de2c6e6..3644ef67a 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetFactoryImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: NmsetFactoryImpl.java,v 1.2 2006/07/22 13:01:18 mtaal Exp $ + * $Id: NmsetFactoryImpl.java,v 1.3 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl; @@ -11,6 +11,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; +import org.eclipse.emf.teneo.samples.emf.annotations.nmset.*; + import org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem; import org.eclipse.emf.teneo.samples.emf.annotations.nmset.NmsetFactory; import org.eclipse.emf.teneo.samples.emf.annotations.nmset.NmsetPackage; diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetPackageImpl.java index 28f308d0b..21b77fe92 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: NmsetPackageImpl.java,v 1.2 2006/07/22 13:01:18 mtaal Exp $ + * $Id: NmsetPackageImpl.java,v 1.3 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl; @@ -243,8 +243,8 @@ public class NmsetPackageImpl extends EPackageImpl implements NmsetPackage { // Create annotations // http:///org/eclipse/emf/ecore/util/ExtendedMetaData createExtendedMetaDataAnnotations(); - // http://annotation.elver.org/Indexed - createIndexedAnnotations(); + // teneo.jpa + createTeneoAnnotations(); } /** @@ -300,19 +300,25 @@ public class NmsetPackageImpl extends EPackageImpl implements NmsetPackage { } /** - * Initializes the annotations for <b>http://annotation.elver.org/Indexed</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createIndexedAnnotations() { - String source = "http://annotation.elver.org/Indexed"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (getMyItem_YourItem(), source, new String[] { - "value", "false" + "appinfo", "@ManyToMany(Indexed=false)" }); + addAnnotation + (getYourItem_MyItem(), + source, + new String[] { + "appinfo", "@ManyToMany(Indexed=false)" + }); } } //NmsetPackageImpl diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.genmodel index e20cd072e..4409cb418 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.genmodel +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.genmodel @@ -4,8 +4,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src" modelPluginID="org.eclipse.emf.teneo.samples" modelName="NMSet" importerID="org.eclipse.xsd.ecore.importer"> <foreignModel>NMSet.xsd</foreignModel> - <genPackages prefix="Nmset" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" resource="XML" - disposableProviderFactory="true" ecorePackage="nmset.ecore#/"> + <genPackages prefix="Nmset" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" + resource="XML" disposableProviderFactory="true" ecorePackage="nmset.ecore#/"> <genClasses ecoreClass="nmset.ecore#//MyItem"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nmset.ecore#//MyItem/name"/> <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference nmset.ecore#//MyItem/yourItem"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.xsd index c4209227b..a754076ff 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.xsd @@ -12,7 +12,7 @@ <xsd:element name="yourItem" type="xsd:anyURI" ecore:reference="this:YourItem" ecore:opposite="myItem" maxOccurs="unbounded"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Indexed" ecore:key="value">false</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@ManyToMany(Indexed=false)</xsd:appinfo> </xsd:annotation> </xsd:element> </xsd:sequence> @@ -25,7 +25,7 @@ ecore:reference="this:MyItem" ecore:opposite="yourItem" maxOccurs="unbounded"> <xsd:annotation> <!-- facet.elver.org is maintained for backwards compatibility --> - <xsd:appinfo source="http://annotation.elver.org/Indexed" ecore:key="value">false</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@ManyToMany(Indexed=false)</xsd:appinfo> </xsd:annotation> </xsd:element> </xsd:sequence> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/nmset.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/nmset.ecore index fe8521ad2..3b198b4f7 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/nmset.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/nmset.ecore @@ -17,8 +17,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="yourItem" lowerBound="1" upperBound="-1" eType="#//YourItem" eOpposite="#//YourItem/myItem"> - <eAnnotations source="http://annotation.elver.org/Indexed"> - <details key="value" value="false"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@ManyToMany(Indexed=false)"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> @@ -40,8 +40,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="myItem" lowerBound="1" upperBound="-1" eType="#//MyItem" eOpposite="#//MyItem/yourItem"> - <eAnnotations source="http://annotation.elver.org/Indexed"> - <details key="value" value="false"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@ManyToMany(Indexed=false)"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/Person.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/Person.java index f14323a22..e48151774 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/Person.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/Person.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Person.java,v 1.1 2006/07/11 16:57:07 mtaal Exp $ + * $Id: Person.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.toone; @@ -38,7 +38,7 @@ public interface Person extends EObject { * @see #setAddress(Address) * @see org.eclipse.emf.teneo.samples.emf.annotations.toone.ToonePackage#getPerson_Address() * @model resolveProxies="false" - * annotation="http://annotation.elver.org/ManyToOne fetch='EAGER' cascade='MERGE PERSIST REFRESH' targetEntity='Address' optional='true'" + * annotation="teneo.jpa appinfo='@ManyToOne(fetch=EAGER cascade={MERGE,PERSIST,REFRESH} targetEntity=\"Address\" optional=true)'" * extendedMetaData="kind='element' name='address'" * @generated */ @@ -68,7 +68,7 @@ public interface Person extends EObject { * @see org.eclipse.emf.teneo.samples.emf.annotations.toone.ToonePackage#getPerson_Head() * @see org.eclipse.emf.teneo.samples.emf.annotations.toone.Head#getPerson * @model opposite="person" resolveProxies="false" - * annotation="http://annotation.elver.org/OneToOne fetch='EAGER' cascade='ALL' targetEntity='Head' optional='true'" + * annotation="teneo.jpa appinfo='@OneToOne(fetch=EAGER cascade=ALL targetEntity=\"Head\" optional=true)'" * extendedMetaData="kind='element' name='head'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/impl/ToonePackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/impl/ToonePackageImpl.java index d6a68494c..8dc35421a 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/impl/ToonePackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/impl/ToonePackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ToonePackageImpl.java,v 1.1 2006/07/11 16:56:59 mtaal Exp $ + * $Id: ToonePackageImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.toone.impl; @@ -280,8 +280,8 @@ public class ToonePackageImpl extends EPackageImpl implements ToonePackage { createExtendedMetaDataAnnotations(); // http://annotation.elver.org/OneToOne createOneToOneAnnotations(); - // http://annotation.elver.org/ManyToOne - createManyToOneAnnotations(); + // teneo.jpa + createTeneoAnnotations(); } /** @@ -368,34 +368,28 @@ public class ToonePackageImpl extends EPackageImpl implements ToonePackage { "optional", "false", "mappedBy", "head" }); - addAnnotation - (getPerson_Head(), - source, - new String[] { - "fetch", "EAGER", - "cascade", "ALL", - "targetEntity", "Head", - "optional", "true" - }); } /** - * Initializes the annotations for <b>http://annotation.elver.org/ManyToOne</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createManyToOneAnnotations() { - String source = "http://annotation.elver.org/ManyToOne"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (getPerson_Address(), source, new String[] { - "fetch", "EAGER", - "cascade", "MERGE PERSIST REFRESH", - "targetEntity", "Address", - "optional", "true" + "appinfo", "@ManyToOne(fetch=EAGER cascade={MERGE,PERSIST,REFRESH} targetEntity=\"Address\" optional=true)" }); + addAnnotation + (getPerson_Head(), + source, + new String[] { + "appinfo", "@OneToOne(fetch=EAGER cascade=ALL targetEntity=\"Head\" optional=true)" + }); } } //ToonePackageImpl diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.ecore index bce3e42aa..48069eefd 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.ecore @@ -50,11 +50,8 @@ </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="address" eType="#//Address" resolveProxies="false"> - <eAnnotations source="http://annotation.elver.org/ManyToOne"> - <details key="fetch" value="EAGER"/> - <details key="cascade" value="MERGE PERSIST REFRESH"/> - <details key="targetEntity" value="Address"/> - <details key="optional" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@ManyToOne(fetch=EAGER cascade={MERGE,PERSIST,REFRESH} targetEntity="Address" optional=true)"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> @@ -63,11 +60,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="head" eType="#//Head" resolveProxies="false" eOpposite="#//Head/person"> - <eAnnotations source="http://annotation.elver.org/OneToOne"> - <details key="fetch" value="EAGER"/> - <details key="cascade" value="ALL"/> - <details key="targetEntity" value="Head"/> - <details key="optional" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@OneToOne(fetch=EAGER cascade=ALL targetEntity="Head" optional=true)"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.genmodel index e09ff63ff..1d6f23222 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.genmodel +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.genmodel @@ -4,8 +4,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src" modelPluginID="org.eclipse.emf.teneo.samples" modelName="Toone" importerID="org.eclipse.xsd.ecore.importer"> <foreignModel>toone.xsd</foreignModel> - <genPackages prefix="Toone" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" resource="XML" - disposableProviderFactory="true" ecorePackage="toone.ecore#/"> + <genPackages prefix="Toone" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" + resource="XML" disposableProviderFactory="true" ecorePackage="toone.ecore#/"> <genClasses ecoreClass="toone.ecore#//Address"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute toone.ecore#//Address/city"/> </genClasses> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.xsd index 3350038d7..8ef254673 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.xsd @@ -8,18 +8,12 @@ <xsd:sequence> <xsd:element name="address" type="xsd:IDREF" ecore:reference="this:Address" minOccurs="0"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/ManyToOne" ecore:key="fetch">EAGER</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/ManyToOne" ecore:key="cascade">MERGE PERSIST REFRESH</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/ManyToOne" ecore:key="targetEntity">Address</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/ManyToOne" ecore:key="optional">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@ManyToOne(fetch=EAGER cascade={MERGE,PERSIST,REFRESH} targetEntity="Address" optional=true)</xsd:appinfo> </xsd:annotation> </xsd:element> <xsd:element name="head" type="xsd:IDREF" ecore:reference="this:Head" minOccurs="0" ecore:opposite="person"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/OneToOne" ecore:key="fetch">EAGER</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/OneToOne" ecore:key="cascade">ALL</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/OneToOne" ecore:key="targetEntity">Head</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/OneToOne" ecore:key="optional">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@OneToOne(fetch=EAGER cascade=ALL targetEntity="Head" optional=true)</xsd:appinfo> </xsd:annotation> </xsd:element> </xsd:sequence> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Body.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Body.java index 9535b3620..283a880ef 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Body.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Body.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Body.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $ + * $Id: Body.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.transent; @@ -40,7 +40,7 @@ public interface Body extends EObject { * @see #setTheID(long) * @see org.eclipse.emf.teneo.samples.emf.annotations.transent.TransentPackage#getBody_TheID() * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true" - * annotation="http://annotation.elver.org/Id appinfo='true'" + * annotation="teneo.jpa appinfo='@Id'" * extendedMetaData="kind='element' name='theID'" * @generated */ @@ -92,8 +92,8 @@ public interface Body extends EObject { * @return the value of the '<em>Head</em>' containment reference. * @see #setHead(Head) * @see org.eclipse.emf.teneo.samples.emf.annotations.transent.TransentPackage#getBody_Head() - * @model containment="true" resolveProxies="false" required="true" - * annotation="http://annotation.elver.org/Transient appinfo='true'" + * @model containment="true" required="true" + * annotation="teneo.jpa appinfo='@Transient'" * extendedMetaData="kind='element' name='head'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Head.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Head.java index 222ba7584..d47b11e01 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Head.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Head.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Head.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $ + * $Id: Head.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.transent; @@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EObject; * </p> * * @see org.eclipse.emf.teneo.samples.emf.annotations.transent.TransentPackage#getHead() - * @model annotation="http://annotation.elver.org/Transient appinfo='true'" + * @model annotation="teneo.jpa appinfo='@Transient'" * extendedMetaData="name='Head' kind='elementOnly'" * @generated */ @@ -40,7 +40,7 @@ public interface Head extends EObject { * @see #setMyID(long) * @see org.eclipse.emf.teneo.samples.emf.annotations.transent.TransentPackage#getHead_MyID() * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true" - * annotation="http://annotation.elver.org/Id appinfo='true'" + * annotation="teneo.jpa appinfo='@Id'" * extendedMetaData="kind='element' name='myID'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/impl/TransentPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/impl/TransentPackageImpl.java index 8f00968aa..b17b99990 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/impl/TransentPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/impl/TransentPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TransentPackageImpl.java,v 1.1 2006/07/11 16:57:09 mtaal Exp $ + * $Id: TransentPackageImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.transent.impl; @@ -235,10 +235,8 @@ public class TransentPackageImpl extends EPackageImpl implements TransentPackage // Create annotations // http:///org/eclipse/emf/ecore/util/ExtendedMetaData createExtendedMetaDataAnnotations(); - // http://annotation.elver.org/Id - createIdAnnotations(); - // http://annotation.elver.org/Transient - createTransientAnnotations(); + // teneo.jpa + createTeneoAnnotations(); } /** @@ -287,47 +285,37 @@ public class TransentPackageImpl extends EPackageImpl implements TransentPackage } /** - * Initializes the annotations for <b>http://annotation.elver.org/Id</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createIdAnnotations() { - String source = "http://annotation.elver.org/Id"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (getBody_TheID(), source, new String[] { - "appinfo", "true" - }); - addAnnotation - (getHead_MyID(), - source, - new String[] { - "appinfo", "true" - }); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/Transient</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createTransientAnnotations() { - String source = "http://annotation.elver.org/Transient"; + "appinfo", "@Id" + }); addAnnotation (getBody_Head(), source, new String[] { - "appinfo", "true" + "appinfo", "@Transient" }); addAnnotation (headEClass, source, new String[] { - "appinfo", "true" + "appinfo", "@Transient" }); + addAnnotation + (getHead_MyID(), + source, + new String[] { + "appinfo", "@Id" + }); } } //TransentPackageImpl diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.ecore index d021a8762..08f72f215 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.ecore @@ -10,8 +10,8 @@ </eAnnotations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="theID" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Long" unsettable="true"> - <eAnnotations source="http://annotation.elver.org/Id"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Id"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> @@ -20,8 +20,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="head" lowerBound="1" eType="#//Head" containment="true" resolveProxies="false"> - <eAnnotations source="http://annotation.elver.org/Transient"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Transient"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> @@ -30,8 +30,8 @@ </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Head"> - <eAnnotations source="http://annotation.elver.org/Transient"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Transient"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Head"/> @@ -39,8 +39,8 @@ </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="http://annotation.elver.org/Id"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Id"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.genmodel index 9d01a3d9f..f0163ab27 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.genmodel +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.genmodel @@ -4,8 +4,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src" modelPluginID="org.eclipse.emf.teneo.samples" modelName="Transent" importerID="org.eclipse.xsd.ecore.importer"> <foreignModel>transent.xsd</foreignModel> - <genPackages prefix="Transent" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" resource="XML" - disposableProviderFactory="true" ecorePackage="transent.ecore#/"> + <genPackages prefix="Transent" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" + resource="XML" disposableProviderFactory="true" ecorePackage="transent.ecore#/"> <genClasses ecoreClass="transent.ecore#//Body"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute transent.ecore#//Body/theID"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference transent.ecore#//Body/head"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.xsd index 22b2779ab..1cf40c82a 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.xsd @@ -8,12 +8,12 @@ <xsd:sequence> <xsd:element name="theID" type="xsd:long"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Id">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Id</xsd:appinfo> </xsd:annotation> </xsd:element> <xsd:element name="head" type="this:Head" > <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Transient">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Transient</xsd:appinfo> </xsd:annotation> </xsd:element> </xsd:sequence> @@ -21,12 +21,12 @@ <xsd:complexType name="Head"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Transient">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Transient</xsd:appinfo> </xsd:annotation> <xsd:sequence> <xsd:element name="myID" type="xsd:long"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Id">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Id</xsd:appinfo> </xsd:annotation> </xsd:element> </xsd:sequence> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/Item.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/Item.java index 70fd5a727..08a165ee0 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/Item.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/Item.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Item.java,v 1.1 2006/07/11 16:57:09 mtaal Exp $ + * $Id: Item.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints; @@ -22,8 +22,7 @@ import org.eclipse.emf.ecore.EObject; * </p> * * @see org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.UniqueconstraintsPackage#getItem() - * @model annotation="http://annotation.elver.org/Table name='MYITEMTABLE' uniqueConstraints='u1'" - * annotation="http://annotation.elver.org/UniqueConstraint/u1 columnNames='MYSTR MYINT'" + * @model annotation="teneo.jpa appinfo='\n\t\t\t@Table(name=\"MYITEMTABLE\" uniqueConstraints={@UniqueConstraint(columnNames={\"MYSTR\",\"MYINT\"})})'" * extendedMetaData="name='Item' kind='elementOnly'" * @generated */ @@ -40,7 +39,7 @@ public interface Item extends EObject { * @see #setName(String) * @see org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.UniqueconstraintsPackage#getItem_Name() * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true" - * annotation="http://annotation.elver.org/Column name='MYSTR'" + * annotation="teneo.jpa appinfo='@Column(name=\"MYSTR\")'" * extendedMetaData="kind='element' name='name'" * @generated */ @@ -70,7 +69,7 @@ public interface Item extends EObject { * @see #setAge(int) * @see org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.UniqueconstraintsPackage#getItem_Age() * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Int" required="true" - * annotation="http://annotation.elver.org/Column name='MYINT'" + * annotation="teneo.jpa appinfo='@Column(name=\"MYINT\")'" * extendedMetaData="kind='element' name='age'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/impl/UniqueconstraintsPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/impl/UniqueconstraintsPackageImpl.java index 5fe540184..a9aa060f2 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/impl/UniqueconstraintsPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/impl/UniqueconstraintsPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: UniqueconstraintsPackageImpl.java,v 1.1 2006/07/11 16:57:18 mtaal Exp $ + * $Id: UniqueconstraintsPackageImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl; @@ -200,47 +200,38 @@ public class UniqueconstraintsPackageImpl extends EPackageImpl implements Unique createResource(eNS_URI); // Create annotations - // http://annotation.elver.org/Table - createTableAnnotations(); - // http://annotation.elver.org/UniqueConstraint/u1 - createU1Annotations(); + // teneo.jpa + createTeneoAnnotations(); // http:///org/eclipse/emf/ecore/util/ExtendedMetaData createExtendedMetaDataAnnotations(); - // http://annotation.elver.org/Column - createColumnAnnotations(); } /** - * Initializes the annotations for <b>http://annotation.elver.org/Table</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createTableAnnotations() { - String source = "http://annotation.elver.org/Table"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (itemEClass, source, new String[] { - "name", "MYITEMTABLE", - "uniqueConstraints", "u1" - }); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/UniqueConstraint/u1</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createU1Annotations() { - String source = "http://annotation.elver.org/UniqueConstraint/u1"; + "appinfo", "\n\t\t\t@Table(name=\"MYITEMTABLE\" uniqueConstraints={@UniqueConstraint(columnNames={\"MYSTR\",\"MYINT\"})})" + }); addAnnotation - (itemEClass, + (getItem_Name(), + source, + new String[] { + "appinfo", "@Column(name=\"MYSTR\")" + }); + addAnnotation + (getItem_Age(), source, new String[] { - "columnNames", "MYSTR MYINT" - }); + "appinfo", "@Column(name=\"MYINT\")" + }); } /** @@ -250,7 +241,7 @@ public class UniqueconstraintsPackageImpl extends EPackageImpl implements Unique * @generated */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation (itemEClass, source, @@ -274,26 +265,4 @@ public class UniqueconstraintsPackageImpl extends EPackageImpl implements Unique }); } - /** - * Initializes the annotations for <b>http://annotation.elver.org/Column</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createColumnAnnotations() { - String source = "http://annotation.elver.org/Column"; - addAnnotation - (getItem_Name(), - source, - new String[] { - "name", "MYSTR" - }); - addAnnotation - (getItem_Age(), - source, - new String[] { - "name", "MYINT" - }); - } - } //UniqueconstraintsPackageImpl diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/unique.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/unique.xsd index af593c938..8fa8011b8 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/unique.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/unique.xsd @@ -9,19 +9,18 @@ <xsd:complexType name="Item"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Table" ecore:key="name">MYITEMTABLE</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/Table" ecore:key="uniqueConstraints">u1</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/UniqueConstraint/u1" ecore:key="columnNames">MYSTR MYINT</xsd:appinfo> + <xsd:appinfo source="teneo.jpa"> + @Table(name="MYITEMTABLE" uniqueConstraints={@UniqueConstraint(columnNames={"MYSTR","MYINT"})})</xsd:appinfo> </xsd:annotation> <xsd:sequence> <xsd:element name="name" type="xsd:string"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Column" ecore:key="name">MYSTR</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Column(name="MYSTR")</xsd:appinfo> </xsd:annotation> </xsd:element> <xsd:element name="age" type="xsd:int"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Column" ecore:key="name">MYINT</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Column(name="MYINT")</xsd:appinfo> </xsd:annotation> </xsd:element> </xsd:sequence> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/uniqueconstraints.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/uniqueconstraints.ecore index 45c20932f..e4fd341c2 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/uniqueconstraints.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/uniqueconstraints.ecore @@ -2,14 +2,11 @@ <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="uniqueconstraints" - nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints" nsPrefix="uniqueconstraints"> + nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints" + nsPrefix="uniqueconstraints"> <eClassifiers xsi:type="ecore:EClass" name="Item"> - <eAnnotations source="http://annotation.elver.org/Table"> - <details key="name" value="MYITEMTABLE"/> - <details key="uniqueConstraints" value="u1"/> - </eAnnotations> - <eAnnotations source="http://annotation.elver.org/UniqueConstraint/u1"> - <details key="columnNames" value="MYSTR MYINT"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="
			@Table(name="MYITEMTABLE" uniqueConstraints={@UniqueConstraint(columnNames={"MYSTR","MYINT"})})"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Item"/> @@ -17,8 +14,8 @@ </eAnnotations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> - <eAnnotations source="http://annotation.elver.org/Column"> - <details key="name" value="MYSTR"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Column(name="MYSTR")"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> @@ -27,8 +24,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="age" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Int" unsettable="true"> - <eAnnotations source="http://annotation.elver.org/Column"> - <details key="name" value="MYINT"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Column(name="MYINT")"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore index c9b9b5ca0..d80d14e78 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore @@ -124,8 +124,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="long" unique="false" lowerBound="1" upperBound="-1" eType="#//Long"> - <eAnnotations source="http://annotation.elver.org/JoinTable"> - <details key="name" value="longNum"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@JoinTable(name="longNum")"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> @@ -338,8 +338,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="enu" unique="false" lowerBound="1" eType="#//SimpleEnumObject" defaultValueLiteral="Enum1" unsettable="true"> - <eAnnotations source="http://annotation.elver.org/Enumerated"> - <details key="value" value="STRING"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Enumerated(STRING)"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd index 2fdc6900b..208d2e55a 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd @@ -33,7 +33,7 @@ <element name="shor" type="short" nillable="true"/> <element name="enu" type="this:SimpleEnum" nillable="true"> <annotation> - <appinfo source="http://annotation.elver.org/Enumerated" ecore:key="value">STRING</appinfo> + <appinfo source="teneo.jpa">@Enumerated(STRING)</appinfo> </annotation> </element> <element name="dat" type="this:Date" nillable="true"/> @@ -50,7 +50,7 @@ <element name="inte" type="this:Int" maxOccurs="unbounded"/> <element name="long" type="this:Long" maxOccurs="unbounded"> <annotation> - <appinfo source="http://annotation.elver.org/JoinTable" ecore:key="name">longNum</appinfo> + <appinfo source="teneo.jpa">@JoinTable(name="longNum")</appinfo> </annotation> </element> <element name="shor" type="short" maxOccurs="unbounded"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java index 9cba08c05..8face89eb 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: SimpleList.java,v 1.2 2006/09/22 13:58:33 mtaal Exp $ + * $Id: SimpleList.java,v 1.3 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes; @@ -192,7 +192,7 @@ public interface SimpleList extends EObject { * @return the value of the '<em>Long</em>' attribute list. * @see org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpletypesPackage#getSimpleList_Long() * @model type="java.lang.Long" unique="false" dataType="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.Long" required="true" - * annotation="http://annotation.elver.org/JoinTable name='longNum'" + * annotation="teneo.jpa appinfo='@JoinTable(name=\"longNum\")'" * extendedMetaData="kind='element' name='long'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleTypeObject.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleTypeObject.java index 072e1b33d..b3fdf2774 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleTypeObject.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleTypeObject.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: SimpleTypeObject.java,v 1.1 2006/07/11 16:57:08 mtaal Exp $ + * $Id: SimpleTypeObject.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes; @@ -484,7 +484,7 @@ public interface SimpleTypeObject extends EObject { * @see #setEnu(SimpleEnum) * @see org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpletypesPackage#getSimpleTypeObject_Enu() * @model default="Enum1" unique="false" unsettable="true" dataType="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnumObject" required="true" - * annotation="http://annotation.elver.org/Enumerated value='STRING'" + * annotation="teneo.jpa appinfo='@Enumerated(STRING)'" * extendedMetaData="kind='element' name='enu'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java index 15b09a059..965073736 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: SimpletypesPackageImpl.java,v 1.3 2006/09/22 13:58:33 mtaal Exp $ + * $Id: SimpletypesPackageImpl.java,v 1.4 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl; @@ -883,10 +883,8 @@ public class SimpletypesPackageImpl extends EPackageImpl implements SimpletypesP // Create annotations // http:///org/eclipse/emf/ecore/util/ExtendedMetaData createExtendedMetaDataAnnotations(); - // http://annotation.elver.org/JoinTable - createJoinTableAnnotations(); - // http://annotation.elver.org/Enumerated - createEnumeratedAnnotations(); + // teneo.jpa + createTeneoAnnotations(); } /** @@ -1253,34 +1251,24 @@ public class SimpletypesPackageImpl extends EPackageImpl implements SimpletypesP } /** - * Initializes the annotations for <b>http://annotation.elver.org/JoinTable</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createJoinTableAnnotations() { - String source = "http://annotation.elver.org/JoinTable"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (getSimpleList_Long(), source, new String[] { - "name", "longNum" - }); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/Enumerated</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createEnumeratedAnnotations() { - String source = "http://annotation.elver.org/Enumerated"; + "appinfo", "@JoinTable(name=\"longNum\")" + }); addAnnotation (getSimpleTypeObject_Enu(), source, new String[] { - "value", "STRING" + "appinfo", "@Enumerated(STRING)" }); } diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/DefaultAnnotator.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/DefaultAnnotator.java index 41d4a4229..cf7aa0d00 100644 --- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/DefaultAnnotator.java +++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/DefaultAnnotator.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: DefaultAnnotator.java,v 1.4 2006/09/28 20:03:57 mtaal Exp $ + * $Id: DefaultAnnotator.java,v 1.5 2006/09/29 12:30:08 mtaal Exp $ */ package org.eclipse.emf.teneo.annotations.mapper; @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.Date; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.commons.logging.Log; @@ -77,7 +76,7 @@ import org.eclipse.emf.teneo.util.StoreUtil; * information. It sets the default annotations according to the ejb3 spec. * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.4 $ + * @version $Revision: 1.5 $ */ public class DefaultAnnotator { @@ -356,10 +355,8 @@ public class DefaultAnnotator { final List aIdAttributes = aClass.getPaIdAttributes(); for (Iterator iter2 = aIdAttributes.iterator(); iter2.hasNext();) { PAnnotatedEAttribute aIdAttribute = (PAnnotatedEAttribute) iter2.next(); - final PrimaryKeyJoinColumn pkJoinColumn = PannotationFactory.eINSTANCE - .createPrimaryKeyJoinColumn(); - pkJoinColumn - .setName(trunc(aIdAttribute.getAnnotatedEAttribute().getName().toUpperCase(), true)); + final PrimaryKeyJoinColumn pkJoinColumn = PannotationFactory.eINSTANCE.createPrimaryKeyJoinColumn(); + pkJoinColumn.setName(trunc(aIdAttribute.getAnnotatedEAttribute().getName().toUpperCase(), true)); pkJoinColumns.add(pkJoinColumn); } } @@ -608,12 +605,13 @@ public class DefaultAnnotator { if (aAttribute.getJoinTable() == null) { // note not optional because lists of simple types are embedded addJoinColumns(aAttribute.getPaEClass(), aAttribute.getAnnotatedEAttribute(), aAttribute, FeatureMapUtil - .isFeatureMap(eAttribute)); // with featuremap optional is true + .isFeatureMap(eAttribute), true); // with featuremap optional is true } - + // set unique and indexed if (!otmWasSet) { - log.debug("Setting indexed and unique on otm from eAttribute.isOrdered/isUnique because otm was not set manually"); + log + .debug("Setting indexed and unique on otm from eAttribute.isOrdered/isUnique because otm was not set manually"); otm.setIndexed(eAttribute.isOrdered()); otm.setUnique(eAttribute.isUnique()); EAnnotation ean = aAttribute.getAnnotatedElement().getEAnnotation(FACET_SOURCE_LIST); @@ -627,7 +625,7 @@ public class DefaultAnnotator { otm.setUnique(((String) ean.getDetails().get(FACET_UNIQUE)).compareToIgnoreCase("true") == 0); } } - + ean = aAttribute.getAnnotatedElement().getEAnnotation("http://annotation.elver.org/Indexed"); if (ean != null && ean.getDetails() != null) { if (ean.getDetails().get("value") != null) { @@ -642,7 +640,7 @@ public class DefaultAnnotator { otm.setUnique(((String) ean.getDetails().get("value")).compareToIgnoreCase("true") == 0); } } - + } } @@ -652,7 +650,7 @@ public class DefaultAnnotator { final Class instanceClass = eAttribute.getEAttributeType().getInstanceClass(); if (instanceClass != null && !Object.class.equals(instanceClass) && !List.class.equals(instanceClass)) { if (instanceClass.isArray()) { - // get rid of the [] at the end + // get rid of the [] at the end return eAttribute.getEType().getInstanceClassName().substring(0, eAttribute.getEType().getInstanceClassName().length() - 2); } @@ -747,7 +745,7 @@ public class DefaultAnnotator { otm.setUnique(((String) ean.getDetails().get(FACET_UNIQUE)).compareToIgnoreCase("true") == 0); } } - + ean = aReference.getAnnotatedElement().getEAnnotation("http://annotation.elver.org/Indexed"); if (ean != null && ean.getDetails() != null) { if (ean.getDetails().get("value") != null) { @@ -764,8 +762,7 @@ public class DefaultAnnotator { } // only use a jointable if the relation is non unique - if ((optionJoinTableForNonContainedAssociations && !eReference.isContainment()) - || !otm.isUnique() /* --DCB-- || aReference.getIdBag() != null */) { + if ((optionJoinTableForNonContainedAssociations && !eReference.isContainment()) || !otm.isUnique()) { JoinTable joinTable = aReference.getJoinTable(); if (joinTable == null) { joinTable = aFactory.createJoinTable(); @@ -785,11 +782,14 @@ public class DefaultAnnotator { // joincolum(s) // the name of this eclass, the name of the property on the other side if (aReference.getAnnotatedEReference().getEOpposite() != null) { - addJoinColumns(aReference.getPaEClass(), aReference.getAnnotatedEReference().getEOpposite(), - aReference, aReference.getEmbedded() == null); + // get opposite + EReference opposite = aReference.getAnnotatedEReference().getEOpposite(); + + addJoinColumns(aReference.getPaModel().getPAnnotated(opposite.getEContainingClass()), opposite, + aReference, aReference.getEmbedded() == null, true); } else { // no prop on the other side just use this one addJoinColumns(aReference.getPaEClass(), aReference.getAnnotatedEReference(), aReference, aReference - .getEmbedded() == null); + .getEmbedded() == null, true); } } } @@ -809,7 +809,7 @@ public class DefaultAnnotator { assert (eOpposite != null && eOpposite.isMany()); ManyToMany mtm = aReference.getManyToMany(); - final boolean mtmWasSet = mtm != null; //mtm was set manually + final boolean mtmWasSet = mtm != null; // mtm was set manually if (mtm == null) { log.debug("Adding manytomany annotations to ereference: " + featureLogStr); mtm = aFactory.createManyToMany(); @@ -842,7 +842,8 @@ public class DefaultAnnotator { // set unique and indexed if (!mtmWasSet) { - log.debug("Setting indexed and unique from ereference.isOrdered/isUnique because mtm was not set manually!"); + log + .debug("Setting indexed and unique from ereference.isOrdered/isUnique because mtm was not set manually!"); mtm.setIndexed(eReference.isOrdered()); } @@ -853,7 +854,7 @@ public class DefaultAnnotator { mtm.setIndexed(((String) ean.getDetails().get(FACET_INDEX)).compareTo("true") == 0); } } - + ean = aReference.getAnnotatedElement().getEAnnotation("http://annotation.elver.org/Indexed"); if (ean != null && ean.getDetails() != null) { if (ean.getDetails().get("value") != null) { @@ -889,7 +890,7 @@ public class DefaultAnnotator { // so // add them // if (joinTable.getJoinColumns() == null) joinTable.getJoinColumns().addAll(aFactory.createJoinColumns()); - joinTable.getJoinColumns().addAll(getJoinColumns(aReference.getPaEClass(), eReference, false, false)); + joinTable.getJoinColumns().addAll(getJoinColumns(aReference.getPaEClass(), eReference, false, false, true)); } if (/* joinTable.getInverseJoinColumns() == null || */joinTable.getInverseJoinColumns().size() == 0) { // no // inversejoincolumns, @@ -900,7 +901,7 @@ public class DefaultAnnotator { // joinTable.setInverseJoinColumns(aFactory.createJoinColumns()); joinTable.getInverseJoinColumns().addAll( getJoinColumns(annotatedModel.getPAnnotated(eOpposite.getEContainingClass()), eOpposite, false, - false)); + false, true)); } } @@ -942,11 +943,10 @@ public class DefaultAnnotator { + oppName; joinTable.setName(trunc(jTableName.toUpperCase().toUpperCase(), false)); } - if (joinTable.getJoinColumns() == null) { - joinTable.getJoinColumns().addAll( - getJoinColumns(aReference.getPaEClass(), eReference, - forceOptional, false)); - } + if (joinTable.getJoinColumns() == null) { + joinTable.getJoinColumns().addAll( + getJoinColumns(aReference.getPaEClass(), eReference, forceOptional, false, true)); + } } /** Adds default annotations for a one to one reference */ @@ -1030,22 +1030,32 @@ public class DefaultAnnotator { // matching the joincolumns on the other side if (aReference.getJoinColumns() == null || aReference.getJoinColumns().isEmpty()) { // the name of the joincolumns is defined by the name of the other entity and its primary key fields - final PAnnotatedEClass aClass = aReference.getPaModel().getPAnnotated(eReference.getEReferenceType()); + final PAnnotatedEClass aClass; + if (eReference.getEOpposite() == null) { + aClass = aReference.getPaModel().getPAnnotated(eReference.getEReferenceType()); + } else { + aClass = aReference.getPaEClass(); + } if (aClass != null) { // aClass == null when the reference it to a high level type such as EObject - addJoinColumns(aClass, aReference.getAnnotatedEReference(), aReference, mto.isOptional()); + // note that the joincolumns are set to not insertable/updatable if + // this is a bidirectional relation without a join table, in that case the other side + // controls the columns + addJoinColumns(aClass, aReference.getAnnotatedEReference(), aReference, mto.isOptional(), eReference + .getEOpposite() == null + && aReference.getJoinTable() == null); } } } /** Creates a set of joincolumns for a reference to the annotated eclass */ private void addJoinColumns(PAnnotatedEClass aClass, EStructuralFeature esf, PAnnotatedEStructuralFeature aFeature, - boolean optional) { - aFeature.getJoinColumns().addAll(getJoinColumns(aClass, esf, optional, true)); + boolean optional, boolean isUpdateInsertable) { + aFeature.getJoinColumns().addAll(getJoinColumns(aClass, esf, optional, true, isUpdateInsertable)); } /** Return a list of join columns */ private List getJoinColumns(PAnnotatedEClass aClass, EStructuralFeature esf, boolean optional, - boolean useFeatureName) { + boolean useFeatureName, boolean isUpdateInsertable) { final List result = new ArrayList(); final List names = getIDFeaturesNames(aClass); for (Iterator it = names.iterator(); it.hasNext();) { @@ -1053,12 +1063,14 @@ public class DefaultAnnotator { JoinColumn jc = aFactory.createJoinColumn(); final String jcName; if (useFeatureName) { - jcName = esf.getName() + "_" + name; + jcName = aClass.getAnnotatedEClass().getName() + "_" + esf.getName() + "_" + name; } else { jcName = aClass.getAnnotatedEClass().getName() + "_" + name; } jc.setName(trunc(jcName.toUpperCase(), true)); jc.setNullable(optional); + jc.setUpdatable(isUpdateInsertable); + jc.setInsertable(isUpdateInsertable); result.add(jc); } return result; diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationParser.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationParser.java index 080611db6..166d09d09 100644 --- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationParser.java +++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationParser.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: AnnotationParser.java,v 1.8 2006/09/13 10:43:13 mtaal Exp $ + * $Id: AnnotationParser.java,v 1.9 2006/09/29 12:30:08 mtaal Exp $ */ package org.eclipse.emf.teneo.annotations.parser; @@ -136,18 +136,19 @@ public class AnnotationParser { annotationTokenizer.getErrorText()); } nextToken = annotationTokenizer.nextToken(); +// if (nextToken == AnnotationTokenizer.T_VALUE) { +// final String value = annotationTokenizer.getLexeme(); +// final PrimitiveValueNode vn = new PrimitiveValueNode(); +// vn.setName(identifier); +// vn.setValue(value); +// addToParent(pn, vn); +// } if (nextToken == AnnotationTokenizer.T_VALUE) { final String value = annotationTokenizer.getLexeme(); final PrimitiveValueNode vn = new PrimitiveValueNode(); vn.setName(identifier); vn.setValue(value); addToParent(pn, vn); - }if (nextToken == AnnotationTokenizer.T_VALUE) { - final String value = annotationTokenizer.getLexeme(); - final PrimitiveValueNode vn = new PrimitiveValueNode(); - vn.setName(identifier); - vn.setValue(value); - addToParent(pn, vn); } else if (nextToken == AnnotationTokenizer.T_IDENTIFIER) { final String value = annotationTokenizer.getLexeme(); final PrimitiveValueNode vn = new PrimitiveValueNode(); @@ -194,6 +195,14 @@ public class AnnotationParser { case AnnotationTokenizer.T_TYPENAME: parseTypeName(an); break; + case AnnotationTokenizer.T_VALUE: + String value = annotationTokenizer.getLexeme(); + if (value != null && value.length() > 1 && value.charAt(0) == '"' && + value.charAt(value.length() - 1) == '"') { + value = value.substring(1, value.length() - 1); + } + an.getChildren().add(value); + break; case AnnotationTokenizer.T_IDENTIFIER: an.getChildren().add(annotationTokenizer.getLexeme()); break; diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationTokenizer.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationTokenizer.java index a813f7ecc..7e2f4c7d2 100644 --- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationTokenizer.java +++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationTokenizer.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: AnnotationTokenizer.java,v 1.6 2006/09/27 20:37:23 mtaal Exp $ + * $Id: AnnotationTokenizer.java,v 1.7 2006/09/29 12:30:08 mtaal Exp $ */ package org.eclipse.emf.teneo.annotations.parser; @@ -245,7 +245,7 @@ class AnnotationTokenizer { do { lChar = data[++lCur]; - } while (lChar == '-' || lChar == '_' || lChar == '/' || lChar == '@' || ('0' <= lChar && lChar <= '9') + } while (lChar == '.' || lChar == '-' || lChar == '_' || lChar == '/' || lChar == '@' || ('0' <= lChar && lChar <= '9') || ('a' <= lChar && lChar <= 'z') || ('A' <= lChar && lChar <= 'Z')); tokEnd = lCur; // Save endpoint of current lexeme. diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapper/OneToManyMapper.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapper/OneToManyMapper.java index 47a6861c6..fdc7427ad 100644 --- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapper/OneToManyMapper.java +++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapper/OneToManyMapper.java @@ -12,27 +12,21 @@ * Davide Marchignoli * </copyright> * - * $Id: OneToManyMapper.java,v 1.8 2006/09/28 20:03:38 mtaal Exp $ + * $Id: OneToManyMapper.java,v 1.9 2006/09/29 12:29:47 mtaal Exp $ */ package org.eclipse.emf.teneo.hibernate.mapper; import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.List; -import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EClassifier; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass; import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference; import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature; -import org.eclipse.emf.teneo.annotations.pannotation.Column; import org.eclipse.emf.teneo.annotations.pannotation.JoinTable; import org.eclipse.emf.teneo.annotations.pannotation.OneToMany; import org.eclipse.emf.teneo.annotations.processing.OneToManyProcessor; @@ -79,8 +73,6 @@ class OneToManyMapper extends AbstractAssociationMapper implements OneToManyProc final HbAnnotatedEReference hbReference = (HbAnnotatedEReference) paReference; EClass refType = hbReference.getAnnotatedEReference().getEReferenceType(); - final Class instanceClass = refType.getInstanceClass(); - boolean isMap = false && (null != instanceClass && Map.Entry.class.isAssignableFrom(instanceClass)); // TODO add isUnique on interface // TODO request EMF team to deal correctly with unique attribute on EReferences @@ -105,7 +97,7 @@ class OneToManyMapper extends AbstractAssociationMapper implements OneToManyProc otm.setIndexed(false); } - if (!isMap && otm.isIndexed()) { + if (otm.isIndexed()) { addListIndex(collElement, paReference); } @@ -121,20 +113,16 @@ class OneToManyMapper extends AbstractAssociationMapper implements OneToManyProc String targetName = null; - if (!isMap) { - targetName = otm.getTargetEntity(); - if (targetName == null) { - targetName = getHbmContext().getEntityName(refType); - } + targetName = otm.getTargetEntity(); + if (targetName == null) { + targetName = getHbmContext().getEntityName(refType); } // MT a manytomany is only required in case of unique=false, note that the ejb3 spec states that for uni otm // always a jointable should be // used (as a default). This is however to heavy for cases were a jointable is not required at all. Also // hibernate supports uni otm without join table. - if (isMap) { - addMap(collElement, hbReference); - } else if (hbReference.getEmbedded() != null) { + if (hbReference.getEmbedded() != null) { addCompositeElement(collElement, targetName, hbReference); } else if (jt != null) { // A m2m forces a join table, note that isunique does not completely follow the semantics of emf, unique on @@ -150,79 +138,6 @@ class OneToManyMapper extends AbstractAssociationMapper implements OneToManyProc addIsSetAttribute(hbReference); } - /** Add the map key and value */ - private void addMap(final Element collElement, final HbAnnotatedEReference hbReference) { - final EClass refType = hbReference.getAnnotatedEReference().getEReferenceType(); - final EStructuralFeature keyFeature = refType.getEStructuralFeature("key"); - final EStructuralFeature valueFeature = refType.getEStructuralFeature("value"); - - if (null == keyFeature) { - throw new MappingException("Map missing 'key' feature", hbReference); - } else if (null == valueFeature) { - throw new MappingException("Map missing 'value' feature", hbReference); - } - - final EClassifier keyType = keyFeature.getEType(); - Element mapKey; - String mapKeyColumn = null; - if (keyType instanceof EDataType) { - mapKey = collElement.addElement("map-key"); - } else { - mapKey = collElement.addElement("map-key-many-to-many"); - } - - if (hbReference.getHbMapKey() != null) { - final List columns = hbReference.getHbMapKey().getColumns(); - if (null == columns) { - log.warn("No columns found in MapKey annotation"); - //throw new MappingException("No columns found in MapKey annotation", hbReference); - } else { - if (columns.size() == 1) { - // TODO: support associationoverride for emap - mapKeyColumn = ((Column) columns.get(0)).getName(); - mapKey.addAttribute("column", mapKeyColumn); - } else if (columns.size() > 1){ - // create column elements - log.warn("Warning: multiple columns and emap have not been tested."); - for (Iterator it = columns.iterator(); it.hasNext();) { - final Column col = (Column)it.next(); - addColumnElement(mapKey, "", col, false); - } - } - } - } - - if (keyType instanceof EDataType) { - mapKey.addAttribute("type", AbstractMapper.hbType((EDataType) keyType)); - } else if (keyType instanceof EClass){ - mapKey.addAttribute("class", ((EClass)keyType).getName()); - } else { - throw new UnsupportedOperationException("Type " + keyType.getClass() + " not supported for EMap"); - } - - final EClassifier valueType = valueFeature.getEType(); - if (valueType instanceof EDataType) { - Element mapElt = collElement.addElement("element"); - List columns = hbReference.getHbColumns(); - if (columns != null) { - if (columns.size() == 1) { - Column eltCol = (Column) columns.get(0); - mapElt.addAttribute("column", eltCol.getName()); - } else { - log.warn("Warning: multiple columns and emap have not been tested."); - // create column elements - for (Iterator it = columns.iterator(); it.hasNext();) { - final Column col = (Column)it.next(); - addColumnElement(mapElt, "", col, false); - } - } - } - mapElt.addAttribute("type", AbstractMapper.hbType((EDataType) valueType)); - } else { - addOneToMany(collElement, valueType.getName()); - } - } - /** * * @see org.eclipse.emf.teneo.annotations.processing.OneToManyProcessor#processBidirectionalInverse(org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference, @@ -239,7 +154,7 @@ class OneToManyMapper extends AbstractAssociationMapper implements OneToManyProc // MT: note inverse does not work correctly with hibernate for indexed collections, see 7.3.3 of the hibernate // manual 3.1.1 - // collElement.addAttribute("inverse", "true"); + //collElement.addAttribute("inverse", "true"); final Element keyElement = collElement.addElement("key"); // MT: added handling of join info diff --git a/tests/org.eclipse.emf.teneo.commontest/build.properties b/tests/org.eclipse.emf.teneo.commontest/build.properties index fe66b9e5d..09ae1673f 100644 --- a/tests/org.eclipse.emf.teneo.commontest/build.properties +++ b/tests/org.eclipse.emf.teneo.commontest/build.properties @@ -21,7 +21,8 @@ bin.includes = plugin.properties,\ src/org/eclipse/emf/teneo/test/emf/annotations/_template.persistence.xml,\ lib/mysql-connector-java-3.1.10-bin.jar,\ readme.txt,\ - lib/tools.jar + lib/tools.jar,\ + src/org/eclipse/emf/teneo/test/emf/sample/Ecore.ecore src.includes = about.html,\ epl-v10.html,\ copyright.txt diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/AssociationOverrideAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/AssociationOverrideAction.java index 2ab06f0ba..54eb167e3 100644 --- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/AssociationOverrideAction.java +++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/AssociationOverrideAction.java @@ -12,7 +12,7 @@ * Laurens Fridael
* </copyright>
*
- * $Id: AssociationOverrideAction.java,v 1.2 2006/08/03 09:58:23 mtaal Exp $
+ * $Id: AssociationOverrideAction.java,v 1.3 2006/09/29 12:30:28 mtaal Exp $
*/
package org.eclipse.emf.teneo.test.emf.annotations;
@@ -57,7 +57,7 @@ public class AssociationOverrideAction extends AbstractTestAction { }
private static final String STUDENT_VERIFICATION_QUERY =
- "SELECT COUNT(*) FROM STUDENT A INNER JOIN ADDRESS B ON A.ADDRESS_ID = B.MYID".toLowerCase();
+ "SELECT COUNT(*) FROM STUDENT A INNER JOIN ADDRESS B ON A.ADDRESS_ADDRESS_ID = B.MYID".toLowerCase();
private static final String EMPLOYEE_VERIFICATION_QUERY =
"SELECT COUNT(*) FROM EMPLOYEE A INNER JOIN ADDRESS B ON A.EMPLOYEE_ADDRESS_ID = B.MYID".toLowerCase();
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/JoinColumnsAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/JoinColumnsAction.java index 96b46f006..af1b9c4ce 100644 --- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/JoinColumnsAction.java +++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/JoinColumnsAction.java @@ -11,12 +11,11 @@ * Martin Taal * </copyright> * - * $Id: JoinColumnsAction.java,v 1.2 2006/07/22 10:16:31 mtaal Exp $ + * $Id: JoinColumnsAction.java,v 1.3 2006/09/29 12:30:28 mtaal Exp $ */ package org.eclipse.emf.teneo.test.emf.annotations; - import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; @@ -26,8 +25,8 @@ import java.util.Properties; import org.eclipse.emf.teneo.PersistenceOptions; import org.eclipse.emf.teneo.annotations.pannotation.InheritanceType; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidFactory; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsFactory; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent; import org.eclipse.emf.teneo.test.AbstractTestAction; import org.eclipse.emf.teneo.test.StoreTestException; @@ -35,23 +34,21 @@ import org.eclipse.emf.teneo.test.stores.TestStore; /** * Testcase - * + * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.2 $ -*/ -public class JoinColumnsAction extends AbstractTestAction -{ + * @version $Revision: 1.3 $ + */ +public class JoinColumnsAction extends AbstractTestAction { /** * Constructor */ - public JoinColumnsAction() - { - super(CompositeidPackage.eINSTANCE); + public JoinColumnsAction() { + super(JoincolumnsPackage.eINSTANCE); } - - - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.emf.teneo.test.AbstractTestAction#getExtraConfigurationProperties() */ public Properties getExtraConfigurationProperties() { @@ -61,63 +58,65 @@ public class JoinColumnsAction extends AbstractTestAction } /** Creates an item, an address and links them to a po. */ - public void doAction(TestStore store) - { - final CompositeidFactory factory = CompositeidFactory.eINSTANCE; - { - store.beginTransaction(); - Parent parent = factory.createParent(); - parent.setFirstName("John"); - parent.setLastName("Smith"); - Child child1 = factory.createChild(); - child1.setFirstName("Johnny"); - child1.setLastName("Smith"); - parent.getChildren().add(child1); - Child child2 = factory.createChild(); - child2.setFirstName("Jane"); - child2.setLastName("Smith"); - parent.getChildren().add(child2); - store.store(parent); - store.commitTransaction(); - } - - // read again - { - store.beginTransaction(); - Parent parent = (Parent)store.getObject(Parent.class); - assertEquals(2, parent.getChildren().size()); - assertEquals("Johnny", ((Child)parent.getChildren().get(0)).getFirstName()); - assertEquals("Jane", ((Child)parent.getChildren().get(1)).getFirstName()); - store.commitTransaction(); - } - - // check version column and foreign keys - Connection conn = null; - Statement stmt = null; - try { + public void doAction(TestStore store) { + final JoincolumnsFactory factory = JoincolumnsFactory.eINSTANCE; + { + store.beginTransaction(); + Parent parent = factory.createParent(); + parent.setFirstName("John"); + parent.setLastName("Smith"); + Child child1 = factory.createChild(); + child1.setFirstName("Johnny"); + child1.setLastName("Smith"); + parent.getChildren().add(child1); + Child child2 = factory.createChild(); + child2.setFirstName("Jane"); + child2.setLastName("Smith"); + parent.getChildren().add(child2); + store.store(parent); + store.commitTransaction(); + } + + // read again + { + store.beginTransaction(); + Parent parent = (Parent) store.getObject(Parent.class); + assertEquals(2, parent.getChildren().size()); + assertEquals("Johnny", ((Child) parent.getChildren().get(0)).getFirstName()); + assertEquals("Jane", ((Child) parent.getChildren().get(1)).getFirstName()); + store.commitTransaction(); + } + + // check version column and foreign keys + Connection conn = null; + Statement stmt = null; + try { try { - conn = store.getConnection(); - stmt = conn.createStatement(); + conn = store.getConnection(); + stmt = conn.createStatement(); + + checkVersion(store); + + // depending on the inheritance strategy the foreign key is stored in different table + if (store.getInheritanceType().getValue() == InheritanceType.SINGLE_TABLE) { + ResultSet rs = stmt.executeQuery("select myParentFirstName from person"); + assertTrue(rs.next()); + } else { + ResultSet rs = stmt.executeQuery("select myParentFirstName from child"); + assertTrue(rs.next()); + } + } finally { + if (stmt != null) + stmt.close(); + if (conn != null) + conn.close(); + } + } catch (SQLException e) { + throw new StoreTestException("Sql exception when checking db schema", e); + } + } - checkVersion(store); - - // depending on the inheritance strategy the foreign key is stored in different table - if (store.getInheritanceType().getValue() == InheritanceType.SINGLE_TABLE) { - ResultSet rs = stmt.executeQuery("select myParentFirstName from person"); - assertTrue(rs.next()); - } else { - ResultSet rs = stmt.executeQuery("select myParentFirstName from child"); - assertTrue(rs.next()); - } - } finally { - if (stmt != null) stmt.close(); - if (conn != null) conn.close(); - } - } catch (SQLException e) { - throw new StoreTestException("Sql exception when checking db schema", e); - } - } - /** Checks the version column */ - protected void checkVersion(TestStore store) { } + protected void checkVersion(TestStore store) { + } }
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/LazyLibraryAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/LazyLibraryAction.java index 749d3dc30..66618ac15 100644 --- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/LazyLibraryAction.java +++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/LazyLibraryAction.java @@ -11,14 +11,12 @@ * Martin Taal * </copyright> * - * $Id: LazyLibraryAction.java,v 1.4 2006/09/22 13:58:54 mtaal Exp $ + * $Id: LazyLibraryAction.java,v 1.5 2006/09/29 12:30:28 mtaal Exp $ */ package org.eclipse.emf.teneo.test.emf.annotations; import java.io.IOException; -import java.util.Iterator; -import java.util.List; import java.util.Properties; import org.eclipse.emf.common.notify.Notification; @@ -43,7 +41,7 @@ import org.eclipse.emf.teneo.test.stores.TestStore; * does not result in loaded containment elists. * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.4 $ + * @version $Revision: 1.5 $ */ public class LazyLibraryAction extends AbstractTestAction { diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/Ecore.ecore b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/Ecore.ecore new file mode 100644 index 000000000..7ef58de7a --- /dev/null +++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/Ecore.ecore @@ -0,0 +1,357 @@ +<?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="ecore" + nsURI="http://www.eclipse.org/emf/2002/Ecore" nsPrefix="ecore"> + <eClassifiers xsi:type="ecore:EClass" name="EAttribute" eSuperTypes="#//EStructuralFeature"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eAttributeType" lowerBound="1" + eType="#//EDataType" changeable="false" volatile="true" transient="true" derived="true"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EAnnotation" eSuperTypes="#//EModelElement"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="details" upperBound="-1" + eType="#//EStringToStringMapEntry" containment="true" resolveProxies="false"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eModelElement" eType="#//EModelElement" + transient="true" resolveProxies="false" eOpposite="#//EModelElement/eAnnotations"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="contents" upperBound="-1" + eType="#//EObject" containment="true" resolveProxies="false"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="references" upperBound="-1" + eType="#//EObject"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EClass" eSuperTypes="#//EClassifier"> + <eOperations name="isSuperTypeOf" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eParameters name="someClass" eType="#//EClass"/> + </eOperations> + <eOperations name="getFeatureCount" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + <eOperations name="getEStructuralFeature" eType="#//EStructuralFeature"> + <eParameters name="featureID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + </eOperations> + <eOperations name="getFeatureID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"> + <eParameters name="feature" eType="#//EStructuralFeature"/> + </eOperations> + <eOperations name="getEStructuralFeature" eType="#//EStructuralFeature"> + <eParameters name="featureName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eOperations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="interface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eSuperTypes" upperBound="-1" + eType="#//EClass"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eOperations" upperBound="-1" + eType="#//EOperation" containment="true" resolveProxies="false" eOpposite="#//EOperation/eContainingClass"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eAllAttributes" upperBound="-1" + eType="#//EAttribute" changeable="false" volatile="true" transient="true" + derived="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eAllReferences" upperBound="-1" + eType="#//EReference" changeable="false" volatile="true" transient="true" + derived="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eReferences" upperBound="-1" + eType="#//EReference" changeable="false" volatile="true" transient="true" + derived="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eAttributes" upperBound="-1" + eType="#//EAttribute" changeable="false" volatile="true" transient="true" + derived="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eAllContainments" upperBound="-1" + eType="#//EReference" changeable="false" volatile="true" transient="true" + derived="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eAllOperations" upperBound="-1" + eType="#//EOperation" changeable="false" volatile="true" transient="true" + derived="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eAllStructuralFeatures" + upperBound="-1" eType="#//EStructuralFeature" changeable="false" volatile="true" + transient="true" derived="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eAllSuperTypes" upperBound="-1" + eType="#//EClass" changeable="false" volatile="true" transient="true" derived="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eIDAttribute" eType="#//EAttribute" + changeable="false" volatile="true" transient="true" derived="true" resolveProxies="false"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eStructuralFeatures" upperBound="-1" + eType="#//EStructuralFeature" containment="true" resolveProxies="false" eOpposite="#//EStructuralFeature/eContainingClass"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EClassifier" abstract="true" eSuperTypes="#//ENamedElement"> + <eOperations name="isInstance" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eParameters name="object" eType="#//EJavaObject"/> + </eOperations> + <eOperations name="getClassifierID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="instanceClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="instanceClass" eType="#//EJavaClass" + changeable="false" volatile="true" transient="true" derived="true"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultValue" eType="#//EJavaObject" + changeable="false" volatile="true" transient="true" derived="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage" eType="#//EPackage" + changeable="false" transient="true" eOpposite="#//EPackage/eClassifiers"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EDataType" eSuperTypes="#//EClassifier"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="serializable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" + defaultValueLiteral="true"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EEnum" eSuperTypes="#//EDataType"> + <eOperations name="getEEnumLiteral" eType="#//EEnumLiteral"> + <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eOperations> + <eOperations name="getEEnumLiteral" eType="#//EEnumLiteral"> + <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + </eOperations> + <eOperations name="getEEnumLiteralByLiteral" eType="#//EEnumLiteral"> + <eParameters name="literal" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eOperations> + <eStructuralFeatures xsi:type="ecore:EReference" name="eLiterals" upperBound="-1" + eType="#//EEnumLiteral" containment="true" resolveProxies="false" eOpposite="#//EEnumLiteral/eEnum"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EEnumLiteral" eSuperTypes="#//ENamedElement"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="instance" eType="#//EEnumerator" + transient="true"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="literal" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eEnum" eType="#//EEnum" + changeable="false" transient="true" resolveProxies="false" eOpposite="#//EEnum/eLiterals"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EFactory" eSuperTypes="#//EModelElement"> + <eOperations name="create" eType="#//EObject"> + <eParameters name="eClass" eType="#//EClass"/> + </eOperations> + <eOperations name="createFromString" eType="#//EJavaObject"> + <eParameters name="eDataType" eType="#//EDataType"/> + <eParameters name="literalValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eOperations> + <eOperations name="convertToString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> + <eParameters name="eDataType" eType="#//EDataType"/> + <eParameters name="instanceValue" eType="#//EJavaObject"/> + </eOperations> + <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage" lowerBound="1" + eType="#//EPackage" transient="true" resolveProxies="false" eOpposite="#//EPackage/eFactoryInstance"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EModelElement" abstract="true" eSuperTypes="#//EObject"> + <eOperations name="getEAnnotation" eType="#//EAnnotation"> + <eParameters name="source" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eOperations> + <eStructuralFeatures xsi:type="ecore:EReference" name="eAnnotations" upperBound="-1" + eType="#//EAnnotation" containment="true" resolveProxies="false" eOpposite="#//EAnnotation/eModelElement"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="ENamedElement" abstract="true" eSuperTypes="#//EModelElement"> + <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="EObject"> + <eOperations name="eClass" eType="#//EClass"/> + <eOperations name="eIsProxy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eOperations name="eResource" eType="#//EResource"/> + <eOperations name="eContainer" eType="#//EObject"/> + <eOperations name="eContainingFeature" eType="#//EStructuralFeature"/> + <eOperations name="eContainmentFeature" eType="#//EReference"/> + <eOperations name="eContents" eType="#//EEList"/> + <eOperations name="eAllContents" eType="#//ETreeIterator"/> + <eOperations name="eCrossReferences" eType="#//EEList"/> + <eOperations name="eGet" eType="#//EJavaObject"> + <eParameters name="feature" eType="#//EStructuralFeature"/> + </eOperations> + <eOperations name="eGet" eType="#//EJavaObject"> + <eParameters name="feature" eType="#//EStructuralFeature"/> + <eParameters name="resolve" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + </eOperations> + <eOperations name="eSet"> + <eParameters name="feature" eType="#//EStructuralFeature"/> + <eParameters name="newValue" eType="#//EJavaObject"/> + </eOperations> + <eOperations name="eIsSet" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eParameters name="feature" eType="#//EStructuralFeature"/> + </eOperations> + <eOperations name="eUnset"> + <eParameters name="feature" eType="#//EStructuralFeature"/> + </eOperations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EOperation" eSuperTypes="#//ETypedElement"> + <eStructuralFeatures xsi:type="ecore:EReference" name="eContainingClass" eType="#//EClass" + changeable="false" transient="true" resolveProxies="false" eOpposite="#//EClass/eOperations"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eParameters" upperBound="-1" + eType="#//EParameter" containment="true" resolveProxies="false" eOpposite="#//EParameter/eOperation"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eExceptions" upperBound="-1" + eType="#//EClassifier"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EPackage" eSuperTypes="#//ENamedElement"> + <eOperations name="getEClassifier" eType="#//EClassifier"> + <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eOperations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="nsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="nsPrefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eFactoryInstance" lowerBound="1" + eType="#//EFactory" transient="true" resolveProxies="false" eOpposite="#//EFactory/ePackage"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eClassifiers" upperBound="-1" + eType="#//EClassifier" containment="true" eOpposite="#//EClassifier/ePackage"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eSubpackages" upperBound="-1" + eType="#//EPackage" containment="true" eOpposite="#//EPackage/eSuperPackage"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eSuperPackage" eType="#//EPackage" + changeable="false" transient="true" eOpposite="#//EPackage/eSubpackages"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EParameter" eSuperTypes="#//ETypedElement"> + <eStructuralFeatures xsi:type="ecore:EReference" name="eOperation" eType="#//EOperation" + changeable="false" transient="true" resolveProxies="false" eOpposite="#//EOperation/eParameters"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EReference" eSuperTypes="#//EStructuralFeature"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="containment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="container" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" + changeable="false" volatile="true" transient="true" derived="true"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="resolveProxies" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" + defaultValueLiteral="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eOpposite" eType="#//EReference"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eReferenceType" lowerBound="1" + eType="#//EClass" changeable="false" volatile="true" transient="true" derived="true"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EStructuralFeature" abstract="true" + eSuperTypes="#//ETypedElement"> + <eOperations name="getFeatureID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + <eOperations name="getContainerClass" eType="#//EJavaClass"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="changeable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" + defaultValueLiteral="true"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="volatile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="transient" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultValueLiteral" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultValue" eType="#//EJavaObject" + changeable="false" volatile="true" transient="true" derived="true"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="unsettable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="derived" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eContainingClass" eType="#//EClass" + changeable="false" transient="true" resolveProxies="false" eOpposite="#//EClass/eStructuralFeatures"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="ETypedElement" abstract="true" eSuperTypes="#//ENamedElement"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="ordered" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" + defaultValueLiteral="true"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="unique" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" + defaultValueLiteral="true"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="lowerBound" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="upperBound" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" + defaultValueLiteral="1"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="many" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" + changeable="false" volatile="true" transient="true" derived="true"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="required" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" + changeable="false" volatile="true" transient="true" derived="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="eType" eType="#//EClassifier"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EBigDecimal" instanceClassName="java.math.BigDecimal"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="http://www.w3.org/2001/XMLSchema#decimal"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EBigInteger" instanceClassName="java.math.BigInteger"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="http://www.w3.org/2001/XMLSchema#integer"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EBoolean" instanceClassName="boolean"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="http://www.w3.org/2001/XMLSchema#boolean"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EBooleanObject" instanceClassName="java.lang.Boolean"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="EBoolean"/> + <details key="name" value="EBoolean:Object"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EByte" instanceClassName="byte"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="http://www.w3.org/2001/XMLSchema#byte"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EByteArray" instanceClassName="byte[]"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="http://www.w3.org/2001/XMLSchema#hexBinary"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EByteObject" instanceClassName="java.lang.Byte"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="EByte"/> + <details key="name" value="EByte:Object"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EChar" instanceClassName="char"/> + <eClassifiers xsi:type="ecore:EDataType" name="ECharacterObject" instanceClassName="java.lang.Character"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="EChar"/> + <details key="name" value="EChar:Object"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EDate" instanceClassName="java.util.Date"/> + <eClassifiers xsi:type="ecore:EDataType" name="EDiagnosticChain" instanceClassName="org.eclipse.emf.common.util.DiagnosticChain" + serializable="false"/> + <eClassifiers xsi:type="ecore:EDataType" name="EDouble" instanceClassName="double"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="http://www.w3.org/2001/XMLSchema#double"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EDoubleObject" instanceClassName="java.lang.Double"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="EDouble"/> + <details key="name" value="EDouble:Object"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EEList" instanceClassName="org.eclipse.emf.common.util.EList" + serializable="false"/> + <eClassifiers xsi:type="ecore:EDataType" name="EEnumerator" instanceClassName="org.eclipse.emf.common.util.Enumerator" + serializable="false"/> + <eClassifiers xsi:type="ecore:EDataType" name="EFeatureMap" instanceClassName="org.eclipse.emf.ecore.util.FeatureMap" + serializable="false"/> + <eClassifiers xsi:type="ecore:EDataType" name="EFeatureMapEntry" instanceClassName="org.eclipse.emf.ecore.util.FeatureMap$Entry"/> + <eClassifiers xsi:type="ecore:EDataType" name="EFloat" instanceClassName="float"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="http://www.w3.org/2001/XMLSchema#float"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EFloatObject" instanceClassName="java.lang.Float"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="EFloat"/> + <details key="name" value="EFloat:Object"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EInt" instanceClassName="int"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="http://www.w3.org/2001/XMLSchema#int"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EIntegerObject" instanceClassName="java.lang.Integer"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="EInt"/> + <details key="name" value="EInt:Object"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EJavaClass" instanceClassName="java.lang.Class"/> + <eClassifiers xsi:type="ecore:EDataType" name="EJavaObject" instanceClassName="java.lang.Object" + serializable="false"/> + <eClassifiers xsi:type="ecore:EDataType" name="ELong" instanceClassName="long"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="http://www.w3.org/2001/XMLSchema#long"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="ELongObject" instanceClassName="java.lang.Long"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="ELong"/> + <details key="name" value="ELong:Object"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EMap" instanceClassName="java.util.Map" + serializable="false"/> + <eClassifiers xsi:type="ecore:EDataType" name="EResource" instanceClassName="org.eclipse.emf.ecore.resource.Resource" + serializable="false"/> + <eClassifiers xsi:type="ecore:EDataType" name="EResourceSet" instanceClassName="org.eclipse.emf.ecore.resource.ResourceSet" + serializable="false"/> + <eClassifiers xsi:type="ecore:EDataType" name="EShort" instanceClassName="short"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="http://www.w3.org/2001/XMLSchema#short"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EShortObject" instanceClassName="java.lang.Short"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="EShort"/> + <details key="name" value="EShort:Object"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="EString" instanceClassName="java.lang.String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="baseType" value="http://www.w3.org/2001/XMLSchema#string"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EStringToStringMapEntry" instanceClassName="java.util.Map$Entry"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="ETreeIterator" instanceClassName="org.eclipse.emf.common.util.TreeIterator" + serializable="false"/> +</ecore:EPackage> diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/EcoreAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/EcoreAction.java new file mode 100644 index 000000000..a9babb6f7 --- /dev/null +++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/EcoreAction.java @@ -0,0 +1,112 @@ +/** + * <copyright> + * + * Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Martin Taal + * </copyright> + * + * $Id: EcoreAction.java,v 1.1 2006/09/29 12:30:28 mtaal Exp $ + */ + +package org.eclipse.emf.teneo.test.emf.sample; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EcorePackage; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; +import org.eclipse.emf.teneo.test.AbstractTestAction; +import org.eclipse.emf.teneo.test.StoreTestException; +import org.eclipse.emf.teneo.test.stores.TestStore; + +/** + * Tests persisting of ecore models in a relational store. + * + * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> + * @version $Revision: 1.1 $ +*/ +public class EcoreAction extends AbstractTestAction { + + /** Constructor */ + public EcoreAction() { + super(EcorePackage.eINSTANCE); + } + + /** Creates a supplier, a product, relates then, saves and retrieves them again. */ + public void doAction(TestStore store) { + + // read ecore as a resource + try { + // read from the resource + { + // a file handle to the current class + // the play.xml is in the model directory + final Resource resource = new XMIResourceImpl(); + resource.load(this.getClass().getResourceAsStream("library.ecore"), Collections.EMPTY_MAP); + resource.load(Collections.EMPTY_MAP); + //EPackage epack = (EPackage)resource.getContents().get(0); + // resource.unload(); + store.beginTransaction(); + store.store(EcorePackage.eINSTANCE); + store.commitTransaction(); + } + + // read from the relational store + // and save it in a xml byte array + byte[] bytes; + { + store.beginTransaction(); + final List result = store.getObjects(EPackage.class); + final ByteArrayOutputStream bos = new ByteArrayOutputStream(); + final Resource resource = new XMIResourceImpl(); + resource.getContents().addAll(result); + resource.save(bos, Collections.EMPTY_MAP); + bytes = bos.toByteArray(); + store.commitTransaction(); + } + + // now compare the two resources + compareResult("library.ecore", bytes); + + } catch (Exception e) { + throw new StoreTestException("Exception when testing persistence of ecore", e); + } + } + + /** Compare the original and the generated xml file */ + protected void compareResult(String fileNameOne, byte[] bytes) throws IOException { + final InputStream isOne = this.getClass().getResourceAsStream(fileNameOne); + + final Resource original_resource = new XMIResourceImpl(); + original_resource.load(isOne, Collections.EMPTY_MAP); + final Iterator original_iterator = original_resource.getAllContents(); + + final Resource new_resource = new XMIResourceImpl(); + new_resource.load(new ByteArrayInputStream(bytes), Collections.EMPTY_MAP); + final Iterator new_iterator = new_resource.getAllContents(); + + // rough structural test + while (original_iterator.hasNext()) { + assertTrue(new_iterator.hasNext()); + + final EObject original_object = (EObject) original_iterator.next(); + final EObject new_object = (EObject) new_iterator.next(); + assertEquals(original_object.getClass(), new_object.getClass()); + } + assertTrue(!new_iterator.hasNext()); + } +} diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/LibraryResourceCutPasteAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/LibraryResourceCutPasteAction.java index 676f2075d..8ef14d07f 100644 --- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/LibraryResourceCutPasteAction.java +++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/LibraryResourceCutPasteAction.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: LibraryResourceCutPasteAction.java,v 1.3 2006/09/21 00:57:18 mtaal Exp $ + * $Id: LibraryResourceCutPasteAction.java,v 1.4 2006/09/29 12:30:28 mtaal Exp $ */ package org.eclipse.emf.teneo.test.emf.sample; @@ -21,7 +21,6 @@ import java.util.Collections; import java.util.Properties; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.teneo.PersistenceOptions; import org.eclipse.emf.teneo.samples.emf.sample.library.Book; import org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory; @@ -37,7 +36,7 @@ import org.eclipse.emf.teneo.test.stores.TestStore; * Tests cut/paste action * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public class LibraryResourceCutPasteAction extends AbstractTestAction { /** diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/PlayAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/PlayAction.java index 556496b62..b2b7cb1e3 100644 --- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/PlayAction.java +++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/PlayAction.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: PlayAction.java,v 1.5 2006/09/01 08:57:18 mtaal Exp $ + * $Id: PlayAction.java,v 1.6 2006/09/29 12:30:28 mtaal Exp $ */ package org.eclipse.emf.teneo.test.emf.sample; @@ -34,26 +34,22 @@ import org.eclipse.emf.teneo.test.StoreTestException; import org.eclipse.emf.teneo.test.stores.TestStore; /** - * Tests by reading a play.xml file storing it in the database, then retrieve it again, store it in an xml file - * and compare the data in this xml file with the original. + * Tests by reading a play.xml file storing it in the database, then retrieve it again, store it in an xml file and + * compare the data in this xml file with the original. * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.5 $ -*/ -public class PlayAction extends AbstractTestAction -{ - public PlayAction() - { + * @version $Revision: 1.6 $ + */ +public class PlayAction extends AbstractTestAction { + public PlayAction() { super(PlayPackage.eINSTANCE); } - + /** Creates a supplier, a product, relates then, saves and retrieves them again. */ - public void doAction(TestStore store) - { + public void doAction(TestStore store) { // read play.xml as a resource! PlayType play = null; - try - { + try { // read from the resource { // a file handle to the current class @@ -61,57 +57,54 @@ public class PlayAction extends AbstractTestAction final Resource resource = new XMLResourceImpl(); resource.load(PlayType.class.getResourceAsStream("data/small_play.xml"), Collections.EMPTY_MAP); resource.load(Collections.EMPTY_MAP); - play = (PlayType)resource.getContents().get(0); - //resource.unload(); + play = (PlayType) resource.getContents().get(0); + // resource.unload(); } - + // store the play in the database - { - store.beginTransaction(); - store.store(play); - /* - apparently jpox started to find the element name group a reserved word which was - not allowed anymore in the where clause. - List list = store.query("SELECT FROM org.eclipse.emf.teneo.test.emf.sample.play.impl.SceneTypeImpl WHERE " + - " group.contains(sceneGroup) && sceneGroup.speech == speech &&" + - " speech.group.contains(puckSpeaker) && puckSpeaker.speaker==\"PUCK\"" + - " VARIABLES org.eclipse.emf.teneo.test.emf.sample.play.impl.SceneTypeImplgroup sceneGroup; " + - " org.eclipse.emf.teneo.test.emf.sample.play.impl.SpeechTypeImpl speech; " + - " org.eclipse.emf.teneo.test.emf.sample.play.impl.SpeechTypeImplgroup puckSpeaker"); - assertEquals(6, list.size()); - */ - store.commitTransaction(); - play = null; - } - - // read from the relational store - // and save it in a xml byte array - byte[] bytes; - { + { + store.beginTransaction(); + store.store(play); + /* + * apparently jpox started to find the element name group a reserved word which was not allowed anymore + * in the where clause. List list = store.query("SELECT FROM + * org.eclipse.emf.teneo.test.emf.sample.play.impl.SceneTypeImpl WHERE " + " group.contains(sceneGroup) && + * sceneGroup.speech == speech &&" + " speech.group.contains(puckSpeaker) && + * puckSpeaker.speaker==\"PUCK\"" + " VARIABLES + * org.eclipse.emf.teneo.test.emf.sample.play.impl.SceneTypeImplgroup sceneGroup; " + " + * org.eclipse.emf.teneo.test.emf.sample.play.impl.SpeechTypeImpl speech; " + " + * org.eclipse.emf.teneo.test.emf.sample.play.impl.SpeechTypeImplgroup puckSpeaker"); assertEquals(6, + * list.size()); + */ + store.commitTransaction(); + play = null; + } + + // read from the relational store + // and save it in a xml byte array + byte[] bytes; + { store.beginTransaction(); - final PlayType myplay = (PlayType)store.getObject(PlayType.class); - final ByteArrayOutputStream bos = new ByteArrayOutputStream(); + final PlayType myplay = (PlayType) store.getObject(PlayType.class); + final ByteArrayOutputStream bos = new ByteArrayOutputStream(); final Resource resource = new XMLResourceImpl(); resource.getContents().add(myplay); resource.save(bos, Collections.EMPTY_MAP); bytes = bos.toByteArray(); - store.commitTransaction(); - } - - // now compare the two resources - compareResult("small_play.xml", bytes, true); - } - catch (Exception e) - { + store.commitTransaction(); + } + + // now compare the two resources + compareResult("small_play.xml", bytes, true); + } catch (Exception e) { throw new StoreTestException("Exception when loading play.xml", e); } - } - + } + /** Compare the original and the generated xml file */ - protected void compareResult(String fileNameOne, byte[] bytes, boolean asXML) throws IOException - { + protected void compareResult(String fileNameOne, byte[] bytes, boolean asXML) throws IOException { final InputStream isOne = PlayType.class.getResourceAsStream("data/" + fileNameOne); - + final Resource original_resource; if (asXML) { original_resource = new XMLResourceImpl(); @@ -129,14 +122,13 @@ public class PlayAction extends AbstractTestAction } new_resource.load(new ByteArrayInputStream(bytes), Collections.EMPTY_MAP); final Iterator new_iterator = new_resource.getAllContents(); - + // rough structural test - while (original_iterator.hasNext()) - { + while (original_iterator.hasNext()) { assertTrue("The new_play.xml has less nodes", new_iterator.hasNext()); - - final EObject original_object = (EObject)original_iterator.next(); - final EObject new_object = (EObject)new_iterator.next(); + + final EObject original_object = (EObject) original_iterator.next(); + final EObject new_object = (EObject) new_iterator.next(); assertEquals(original_object.getClass(), new_object.getClass()); } assertTrue("The original_play.xml has less nodes", !new_iterator.hasNext()); diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/library.ecore b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/library.ecore new file mode 100644 index 000000000..f23b12e84 --- /dev/null +++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/library.ecore @@ -0,0 +1,104 @@ +<?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="library" + nsURI="http://www.eclipse.org/emf/teneo/samples/emf/sample/Library" nsPrefix="library"> + <eClassifiers xsi:type="ecore:EClass" name="Book"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="Book"/> + <details key="kind" value="elementOnly"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" unique="false" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="title"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="pages" unique="false" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Int" unsettable="true"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="pages"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" unique="false" + lowerBound="1" eType="#//BookCategory" defaultValueLiteral="Mystery" unsettable="true"> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Enumerated(ORDINAL)"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="category"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="author" lowerBound="1" + eType="#//Writer" eOpposite="#//Writer/books"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="author"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EEnum" name="BookCategory"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="BookCategory"/> + </eAnnotations> + <eLiterals name="Mystery"/> + <eLiterals name="ScienceFiction" value="1"/> + <eLiterals name="Biography" value="2"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="BookCategoryObject" instanceClassName="org.eclipse.emf.common.util.Enumerator"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="BookCategory:Object"/> + <details key="baseType" value="BookCategory"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Library"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="Library"/> + <details key="kind" value="elementOnly"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="name"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="writers" upperBound="-1" + eType="#//Writer" containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="writers"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="books" upperBound="-1" + eType="#//Book" containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="books"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Writer"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="Writer"/> + <details key="kind" value="elementOnly"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="name"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="books" upperBound="-1" + eType="#//Book" eOpposite="#//Book/author"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="books"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> +</ecore:EPackage> diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/schemaconstructs/EMapAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/schemaconstructs/EMapAction.java index cb7979518..e4ff18393 100644 --- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/schemaconstructs/EMapAction.java +++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/schemaconstructs/EMapAction.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: EMapAction.java,v 1.1 2006/09/28 20:03:33 mtaal Exp $ + * $Id: EMapAction.java,v 1.2 2006/09/29 12:30:28 mtaal Exp $ */ package org.eclipse.emf.teneo.test.emf.schemaconstructs; @@ -23,7 +23,6 @@ import java.util.List; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.teneo.mapping.elist.PersistableEList; -import org.eclipse.emf.teneo.mapping.elist.PersistableEMap; import org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Book; import org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.EmapFactory; import org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.EmapPackage; @@ -36,7 +35,7 @@ import org.eclipse.emf.teneo.test.stores.TestStore; * Tests support for emaps. * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ public class EMapAction extends AbstractTestAction { /** diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/schemaconstructs/SimpleTypeAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/schemaconstructs/SimpleTypeAction.java index cb9dfc79c..34eb25028 100644 --- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/schemaconstructs/SimpleTypeAction.java +++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/schemaconstructs/SimpleTypeAction.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: SimpleTypeAction.java,v 1.2 2006/09/22 13:58:54 mtaal Exp $ + * $Id: SimpleTypeAction.java,v 1.3 2006/09/29 12:30:28 mtaal Exp $ */ package org.eclipse.emf.teneo.test.emf.schemaconstructs; @@ -28,13 +28,12 @@ import org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.Simpletype import org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpletypesPackage; import org.eclipse.emf.teneo.test.AbstractTestAction; import org.eclipse.emf.teneo.test.stores.TestStore; -import org.jpox.enhancer.bcel.method.SimpleStateManagerCall; /** * Tests if simple types are stored/retrieved correctly. * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class SimpleTypeAction extends AbstractTestAction { /** Simple Type Values we test against */ diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml index db5acb5d0..a34504c3c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:02 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:54 CEST 2006 --> <hibernate-mapping> <class entity-name="IdentityID" abstract="false" lazy="false" discriminator-value="IdentityID" table="`identityid`"> <id name="myid" type="long" column="`myid`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml index 9df0dd647..f8f698077 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:40 CEST 2006 --> <hibernate-mapping> <class entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`"> <id name="myid" type="long" column="`myid`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml index 4b3f33912..75f8b2be3 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:02 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:54 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl" discriminator-value="Person" table="`person`"> <composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml index 76e87581b..5e12814a8 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:47 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:40 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl" table="`person`"> <composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml index ade85bd06..971521d16 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:56 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:49 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml index 61a2ec6ef..acea02a7e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:41 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:34 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml index 47ec61c1b..a4bde5077 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:13 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:04 CEST 2006 --> <hibernate-mapping> <class entity-name="Contacts" abstract="false" lazy="false" discriminator-value="Contacts" table="`contacts`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="persons" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`persons_id`" not-null="false" unique="false"/> + <column name="`contacts_persons_id`" not-null="false" unique="false"/> </key> <list-index column="`contacts_persons_idx`"/> <one-to-many entity-name="Person"/> @@ -26,7 +26,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="phones" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`phones_id`" not-null="false" unique="false"/> + <column name="`person_phones_id`" not-null="false" unique="false"/> </key> <list-index column="`person_phones_idx`"/> <one-to-many entity-name="Person_phones"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml index ac4196147..c7c49bab1 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:11 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:01 CEST 2006 --> <hibernate-mapping> <class entity-name="Contacts" abstract="false" lazy="false" table="`contacts`"> <id type="long" name="e_id" column="e_id"> @@ -10,7 +10,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="persons" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`persons_id`" not-null="false" unique="false"/> + <column name="`contacts_persons_id`" not-null="false" unique="false"/> </key> <list-index column="`contacts_persons_idx`"/> <one-to-many entity-name="Person"/> @@ -24,7 +24,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="phones" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`phones_id`" not-null="false" unique="false"/> + <column name="`person_phones_id`" not-null="false" unique="false"/> </key> <list-index column="`person_phones_idx`"/> <one-to-many entity-name="Person_phones"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml index c12aee31a..9c5e98e91 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:13 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:03 CEST 2006 --> <hibernate-mapping> <class entity-name="TestA" abstract="false" lazy="false" discriminator-value="TestA" table="`testa`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="true"/> <many-to-one name="testB" entity-name="TestB" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`testb_id`"/> + <column not-null="true" unique="false" name="`testb_testb_id`"/> </many-to-one> </class> <class entity-name="TestB" abstract="false" lazy="false" discriminator-value="TestB" table="`testb`"> @@ -32,7 +32,7 @@ <property name="myDate" type="serializable" lazy="false" column="`mydate`" not-null="true"/> <list name="testB" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`testb_id`" not-null="false" unique="false"/> + <column name="`testc_testb_id`" not-null="false" unique="false"/> </key> <list-index column="`testc_testb_idx`"/> <one-to-many entity-name="TestB"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml index 9bd693b15..4064d041a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:11 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:01 CEST 2006 --> <hibernate-mapping> <class entity-name="TestA" abstract="false" lazy="false" table="`testa`"> <id type="long" name="e_id" column="e_id"> @@ -10,7 +10,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="true"/> <many-to-one name="testB" entity-name="TestB" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`testb_id`"/> + <column not-null="true" unique="false" name="`testb_testb_id`"/> </many-to-one> </class> <class entity-name="TestB" abstract="false" lazy="false" table="`testb`"> @@ -29,7 +29,7 @@ <property name="myDate" type="serializable" lazy="false" column="`mydate`" not-null="true"/> <list name="testB" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`testb_id`" not-null="false" unique="false"/> + <column name="`testc_testb_id`" not-null="false" unique="false"/> </key> <list-index column="`testc_testb_idx`"/> <one-to-many entity-name="TestB"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml index dd84effa6..95a983edd 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:59 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:46 CEST 2006 --> <hibernate-mapping> <class entity-name="Account" abstract="true" lazy="false" discriminator-value="Account" table="`account`"> <id type="long" name="e_id" column="e_id"> @@ -20,7 +20,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="account" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`account_id`" not-null="false" unique="false"/> + <column name="`accountgroup_account_id`" not-null="false" unique="false"/> </key> <list-index column="`accountgroup_account_idx`"/> <one-to-many entity-name="Account"/> @@ -35,27 +35,27 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="accountGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`accountgroup_id`" not-null="false" unique="false"/> + <column name="`accounting_accountgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`accounting_accountgroup_idx`"/> <one-to-many entity-name="AccountGroup"/> </list> <list name="vat" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`vat_id`" not-null="false" unique="false"/> + <column name="`accounting_vat_id`" not-null="false" unique="false"/> </key> <list-index column="`accounting_vat_idx`"/> <one-to-many entity-name="Vat"/> </list> <many-to-one name="vatAccount" entity-name="BalanceAccount" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`vataccount_id`"/> + <column not-null="false" unique="false" name="`balanceaccount_vataccount_id`"/> </many-to-one> <many-to-one name="report" entity-name="Report" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`report_id`"/> + <column not-null="false" unique="false" name="`report_report_id`"/> </many-to-one> <list name="journalGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`journalgroup_id`" not-null="false" unique="false"/> + <column name="`accounting_journalgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`accounting_journalgroup_idx`"/> <one-to-many entity-name="JournalGroup"/> @@ -81,14 +81,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="journalGroups" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`journalgroups_id`" not-null="false" unique="false"/> + <column name="`journalgroup_journalgroups_id`" not-null="false" unique="false"/> </key> <list-index column="`journalgroup_journalgroups_idx`"/> <one-to-many entity-name="JournalGroup"/> </list> <list name="journalStatements" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`journalstatements_id`" not-null="false" unique="false"/> + <column name="`journalgroup_journalstatements_id`" not-null="false" unique="false"/> </key> <list-index column="`journalgroup_journalstatements_idx`"/> <one-to-many entity-name="JournalStatement"/> @@ -104,13 +104,13 @@ <property name="date" type="date" lazy="false" column="`date`" not-null="true" unique="false"/> <property name="amount" type="float" lazy="false" column="`amount`" not-null="false"/> <many-to-one name="debitAccount" entity-name="Account" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`debitaccount_id`"/> + <column not-null="true" unique="false" name="`account_debitaccount_id`"/> </many-to-one> <many-to-one name="creditAccount" entity-name="Account" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`creditaccount_id`"/> + <column not-null="true" unique="false" name="`account_creditaccount_id`"/> </many-to-one> <many-to-one name="vat" entity-name="Vat" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`vat_id`"/> + <column not-null="false" unique="false" name="`vat_vat_id`"/> </many-to-one> </class> <subclass entity-name="PLAccount" abstract="false" lazy="false" extends="Account" discriminator-value="PLAccount"/> @@ -122,10 +122,10 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <many-to-one name="debitReportGroup" entity-name="ReportGroup" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`debitreportgroup_id`"/> + <column not-null="true" unique="false" name="`reportgroup_debitreportgroup_id`"/> </many-to-one> <many-to-one name="creditReportGroup" entity-name="ReportGroup" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`creditreportgroup_id`"/> + <column not-null="true" unique="false" name="`reportgroup_creditreportgroup_id`"/> </many-to-one> </class> <class entity-name="ReportGroup" abstract="false" lazy="false" discriminator-value="ReportGroup" table="`reportgroup`"> @@ -137,7 +137,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="reportGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`reportgroup_id`" not-null="false" unique="false"/> + <column name="`reportgroup_reportgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`reportgroup_reportgroup_idx`"/> <one-to-many entity-name="ReportGroup"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml index cba6b6234..8535e3581 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:21 CEST 2006 --> <hibernate-mapping> <class entity-name="Account" abstract="true" lazy="false" table="`account`"> <id type="long" name="e_id" column="e_id"> @@ -18,7 +18,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="account" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`account_id`" not-null="false" unique="false"/> + <column name="`accountgroup_account_id`" not-null="false" unique="false"/> </key> <list-index column="`accountgroup_account_idx`"/> <one-to-many entity-name="Account"/> @@ -32,27 +32,27 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="accountGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`accountgroup_id`" not-null="false" unique="false"/> + <column name="`accounting_accountgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`accounting_accountgroup_idx`"/> <one-to-many entity-name="AccountGroup"/> </list> <list name="vat" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`vat_id`" not-null="false" unique="false"/> + <column name="`accounting_vat_id`" not-null="false" unique="false"/> </key> <list-index column="`accounting_vat_idx`"/> <one-to-many entity-name="Vat"/> </list> <many-to-one name="vatAccount" entity-name="BalanceAccount" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`vataccount_id`"/> + <column not-null="false" unique="false" name="`balanceaccount_vataccount_id`"/> </many-to-one> <many-to-one name="report" entity-name="Report" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`report_id`"/> + <column not-null="false" unique="false" name="`report_report_id`"/> </many-to-one> <list name="journalGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`journalgroup_id`" not-null="false" unique="false"/> + <column name="`accounting_journalgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`accounting_journalgroup_idx`"/> <one-to-many entity-name="JournalGroup"/> @@ -80,14 +80,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="journalGroups" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`journalgroups_id`" not-null="false" unique="false"/> + <column name="`journalgroup_journalgroups_id`" not-null="false" unique="false"/> </key> <list-index column="`journalgroup_journalgroups_idx`"/> <one-to-many entity-name="JournalGroup"/> </list> <list name="journalStatements" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`journalstatements_id`" not-null="false" unique="false"/> + <column name="`journalgroup_journalstatements_id`" not-null="false" unique="false"/> </key> <list-index column="`journalgroup_journalstatements_idx`"/> <one-to-many entity-name="JournalStatement"/> @@ -102,13 +102,13 @@ <property name="date" type="date" lazy="false" column="`date`" not-null="true" unique="false"/> <property name="amount" type="float" lazy="false" column="`amount`" not-null="false"/> <many-to-one name="debitAccount" entity-name="Account" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`debitaccount_id`"/> + <column not-null="true" unique="false" name="`account_debitaccount_id`"/> </many-to-one> <many-to-one name="creditAccount" entity-name="Account" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`creditaccount_id`"/> + <column not-null="true" unique="false" name="`account_creditaccount_id`"/> </many-to-one> <many-to-one name="vat" entity-name="Vat" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`vat_id`"/> + <column not-null="false" unique="false" name="`vat_vat_id`"/> </many-to-one> </class> <joined-subclass entity-name="PLAccount" abstract="false" lazy="false" extends="Account" table="`placcount`"> @@ -123,10 +123,10 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <many-to-one name="debitReportGroup" entity-name="ReportGroup" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`debitreportgroup_id`"/> + <column not-null="true" unique="false" name="`reportgroup_debitreportgroup_id`"/> </many-to-one> <many-to-one name="creditReportGroup" entity-name="ReportGroup" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`creditreportgroup_id`"/> + <column not-null="true" unique="false" name="`reportgroup_creditreportgroup_id`"/> </many-to-one> </class> <class entity-name="ReportGroup" abstract="false" lazy="false" table="`reportgroup`"> @@ -137,7 +137,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="reportGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`reportgroup_id`" not-null="false" unique="false"/> + <column name="`reportgroup_reportgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`reportgroup_reportgroup_idx`"/> <one-to-many entity-name="ReportGroup"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml index af19b257b..ade020bc5 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:58 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:44 CEST 2006 --> <hibernate-mapping> <class entity-name="CapacityEntry" abstract="false" lazy="false" discriminator-value="CapacityEntry" table="`capacityentry`"> <id type="long" name="e_id" column="e_id"> @@ -19,7 +19,7 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="workWeek" entity-name="WorkWeek" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`workweek_id`"/> + <column not-null="true" unique="false" name="`workweek_workweek_id`"/> </many-to-one> <property name="machineId" type="java.lang.String" lazy="false" column="`machineid`" not-null="false"/> <property name="machineSearchString" type="java.lang.String" lazy="false" column="`machinesearchstring`" not-null="false"/> @@ -34,7 +34,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="machines" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`machines_id`" not-null="false" unique="false"/> + <column name="`machinelist_machines_id`" not-null="false" unique="false"/> </key> <list-index column="`machinelist_machines_idx`"/> <one-to-many entity-name="Machine"/> @@ -60,10 +60,10 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="capacityEntry" entity-name="CapacityEntry" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`capacityentry_id`"/> + <column not-null="true" unique="false" name="`capacityentry_capacityentry_id`"/> </many-to-one> <many-to-one name="production" entity-name="Production" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`production_id`"/> + <column not-null="true" unique="false" name="`production_production_id`"/> </many-to-one> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <property name="taskId" type="java.lang.String" lazy="false" column="`taskid`" not-null="false"/> @@ -88,7 +88,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="days" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`days_id`" not-null="false" unique="false"/> + <column name="`workweek_days_id`" not-null="false" unique="false"/> </key> <list-index column="`workweek_days_idx`"/> <one-to-many entity-name="WorkDay"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml index b607eb920..b9da4f8ae 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:35 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:19 CEST 2006 --> <hibernate-mapping> <class entity-name="CapacityEntry" abstract="false" lazy="false" table="`capacityentry`"> <id type="long" name="e_id" column="e_id"> @@ -17,7 +17,7 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="workWeek" entity-name="WorkWeek" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`workweek_id`"/> + <column not-null="true" unique="false" name="`workweek_workweek_id`"/> </many-to-one> <property name="machineId" type="java.lang.String" lazy="false" column="`machineid`" not-null="false"/> <property name="machineSearchString" type="java.lang.String" lazy="false" column="`machinesearchstring`" not-null="false"/> @@ -31,7 +31,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="machines" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`machines_id`" not-null="false" unique="false"/> + <column name="`machinelist_machines_id`" not-null="false" unique="false"/> </key> <list-index column="`machinelist_machines_idx`"/> <one-to-many entity-name="Machine"/> @@ -55,10 +55,10 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="capacityEntry" entity-name="CapacityEntry" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`capacityentry_id`"/> + <column not-null="true" unique="false" name="`capacityentry_capacityentry_id`"/> </many-to-one> <many-to-one name="production" entity-name="Production" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`production_id`"/> + <column not-null="true" unique="false" name="`production_production_id`"/> </many-to-one> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <property name="taskId" type="java.lang.String" lazy="false" column="`taskid`" not-null="false"/> @@ -81,7 +81,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="days" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`days_id`" not-null="false" unique="false"/> + <column name="`workweek_days_id`" not-null="false" unique="false"/> </key> <list-index column="`workweek_days_idx`"/> <one-to-many entity-name="WorkDay"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml index 6d33faa37..080b01b07 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:05 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:51 CEST 2006 --> <hibernate-mapping> <class entity-name="CatalogType" abstract="false" lazy="false" discriminator-value="CatalogType" table="`catalogtype`"> <id name="name" type="java.lang.String" column="`name`"/> @@ -10,14 +10,14 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> <list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`subcatalog_name`" not-null="false" unique="false"/> + <column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_subcatalog_idx`"/> <one-to-many entity-name="CatalogType"/> </list> <list name="product" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`product_name`" not-null="false" unique="false"/> + <column name="`catalogtype_product_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_product_idx`"/> <one-to-many entity-name="ProductType"/> @@ -32,7 +32,7 @@ <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> <property name="quantityTo" type="double" lazy="false" column="`quantityto`" not-null="false"/> <many-to-one name="supplier" entity-name="SupplierType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`supplier_id`"/> + <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> </class> <class entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`"> @@ -42,13 +42,13 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> <list name="remark" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`remark_code`" not-null="false" unique="false"/> + <column name="`producttype_remark_code`" not-null="false" unique="false"/> </key> <list-index column="`producttype_remark_idx`"/> <one-to-many entity-name="StringType"/> </list> <many-to-one name="price" entity-name="PriceType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`price_id`"/> + <column not-null="true" unique="false" name="`pricetype_price_id`"/> </many-to-one> </class> <class entity-name="StringType" abstract="false" lazy="false" discriminator-value="StringType" table="`stringtype`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml index c26d86584..1ad99cb6b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:27 CEST 2006 --> <hibernate-mapping> <class entity-name="CatalogType" abstract="false" lazy="false" table="`catalogtype`"> <id name="name" type="java.lang.String" column="`name`"/> @@ -9,14 +9,14 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> <list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`subcatalog_name`" not-null="false" unique="false"/> + <column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_subcatalog_idx`"/> <one-to-many entity-name="CatalogType"/> </list> <list name="product" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`product_name`" not-null="false" unique="false"/> + <column name="`catalogtype_product_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_product_idx`"/> <one-to-many entity-name="ProductType"/> @@ -30,7 +30,7 @@ <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> <property name="quantityTo" type="double" lazy="false" column="`quantityto`" not-null="false"/> <many-to-one name="supplier" entity-name="SupplierType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`supplier_id`"/> + <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> </class> <class entity-name="ProductType" abstract="false" lazy="false" table="`producttype`"> @@ -39,13 +39,13 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> <list name="remark" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`remark_code`" not-null="false" unique="false"/> + <column name="`producttype_remark_code`" not-null="false" unique="false"/> </key> <list-index column="`producttype_remark_idx`"/> <one-to-many entity-name="StringType"/> </list> <many-to-one name="price" entity-name="PriceType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`price_id`"/> + <column not-null="true" unique="false" name="`pricetype_price_id`"/> </many-to-one> </class> <class entity-name="StringType" abstract="false" lazy="false" table="`stringtype`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml index 7accc8c46..c50952dc1 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:59 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:45 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml index 2f289f719..8ec3bf8c3 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:35 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:20 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml index 4da374c71..969db4f96 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:14 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:58 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`"> <id type="long" name="e_id" column="e_id"> @@ -9,8 +9,8 @@ </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> - <many-to-one name="order" entity-name="PurchaseOrder" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`order_id`"/> + <many-to-one name="order" entity-name="PurchaseOrder" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`item_order_id`"/> </many-to-one> <property name="productName" type="java.lang.String" lazy="false" column="`productname`" not-null="false"/> <property name="quantity" type="int" lazy="false" column="`quantity`" not-null="false"/> @@ -42,16 +42,16 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="items" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`order_id`" not-null="false" unique="false"/> + <column name="`item_order_id`" not-null="false" unique="false"/> </key> <list-index column="`purchaseorder_items_idx`"/> <one-to-many entity-name="Item"/> </list> <many-to-one name="billTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`billto_id`"/> + <column not-null="true" unique="false" name="`address_billto_id`"/> </many-to-one> <many-to-one name="shipTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`shipto_id`"/> + <column not-null="false" unique="false" name="`address_shipto_id`"/> </many-to-one> <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="false"/> <property name="orderDate" type="date" lazy="false" column="`orderdate`" not-null="false" unique="true"/> @@ -60,11 +60,11 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.epo2.OrderStatus</param> </type> </property> - <many-to-one name="customer" entity-name="Customer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`customer_id`"/> + <many-to-one name="customer" entity-name="Customer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`purchaseorder_customer_id`"/> </many-to-one> <many-to-one name="previousOrder" entity-name="PurchaseOrder" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`previousorder_id`"/> + <column not-null="false" unique="false" name="`purchaseorder_previousorder_id`"/> </many-to-one> </class> <class entity-name="Supplier" abstract="false" lazy="false" discriminator-value="Supplier" table="`supplier`"> @@ -76,14 +76,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="customers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`customers_id`" not-null="false" unique="false"/> + <column name="`supplier_customers_id`" not-null="false" unique="false"/> </key> <list-index column="`supplier_customers_idx`"/> <one-to-many entity-name="Customer"/> </list> <list name="orders" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`orders_id`" not-null="false" unique="false"/> + <column name="`supplier_orders_id`" not-null="false" unique="false"/> </key> <list-index column="`supplier_orders_idx`"/> <one-to-many entity-name="PurchaseOrder"/> @@ -98,7 +98,7 @@ <property name="customerID" type="int" lazy="false" column="`customerid`" not-null="false"/> <list name="orders" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`customer_id`" not-null="false" unique="false"/> + <column name="`purchaseorder_customer_id`" not-null="false" unique="false"/> </key> <list-index column="`customer_orders_idx`"/> <one-to-many entity-name="PurchaseOrder"/> @@ -108,7 +108,7 @@ <property name="countryCode" type="int" lazy="false" column="`countrycode`" not-null="false"/> <list name="location" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`location_id`" not-null="true" unique="false"/> + <column name="`globaladdress_location_id`" not-null="true" unique="false"/> </key> <list-index column="`globaladdress_location_idx`"/> <element type="java.lang.String"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml index 9ecf0443f..3edc564b3 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:35 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" table="`item`"> <id type="long" name="e_id" column="e_id"> <generator class="native"/> </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> - <many-to-one name="order" entity-name="PurchaseOrder" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`order_id`"/> + <many-to-one name="order" entity-name="PurchaseOrder" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`item_order_id`"/> </many-to-one> <property name="productName" type="java.lang.String" lazy="false" column="`productname`" not-null="false"/> <property name="quantity" type="int" lazy="false" column="`quantity`" not-null="false"/> @@ -42,16 +42,16 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="items" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`order_id`" not-null="false" unique="false"/> + <column name="`item_order_id`" not-null="false" unique="false"/> </key> <list-index column="`purchaseorder_items_idx`"/> <one-to-many entity-name="Item"/> </list> <many-to-one name="billTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`billto_id`"/> + <column not-null="true" unique="false" name="`address_billto_id`"/> </many-to-one> <many-to-one name="shipTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`shipto_id`"/> + <column not-null="false" unique="false" name="`address_shipto_id`"/> </many-to-one> <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="false"/> <property name="orderDate" type="date" lazy="false" column="`orderdate`" not-null="false" unique="true"/> @@ -60,11 +60,11 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.epo2.OrderStatus</param> </type> </property> - <many-to-one name="customer" entity-name="Customer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`customer_id`"/> + <many-to-one name="customer" entity-name="Customer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`purchaseorder_customer_id`"/> </many-to-one> <many-to-one name="previousOrder" entity-name="PurchaseOrder" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`previousorder_id`"/> + <column not-null="false" unique="false" name="`purchaseorder_previousorder_id`"/> </many-to-one> </class> <class entity-name="Supplier" abstract="false" lazy="false" table="`supplier`"> @@ -75,14 +75,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="customers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`customers_id`" not-null="false" unique="false"/> + <column name="`supplier_customers_id`" not-null="false" unique="false"/> </key> <list-index column="`supplier_customers_idx`"/> <one-to-many entity-name="Customer"/> </list> <list name="orders" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`orders_id`" not-null="false" unique="false"/> + <column name="`supplier_orders_id`" not-null="false" unique="false"/> </key> <list-index column="`supplier_orders_idx`"/> <one-to-many entity-name="PurchaseOrder"/> @@ -96,7 +96,7 @@ <property name="customerID" type="int" lazy="false" column="`customerid`" not-null="false"/> <list name="orders" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`customer_id`" not-null="false" unique="false"/> + <column name="`purchaseorder_customer_id`" not-null="false" unique="false"/> </key> <list-index column="`customer_orders_idx`"/> <one-to-many entity-name="PurchaseOrder"/> @@ -109,7 +109,7 @@ <property name="countryCode" type="int" lazy="false" column="`countrycode`" not-null="false"/> <list name="location" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`location_id`" not-null="true" unique="false"/> + <column name="`globaladdress_location_id`" not-null="true" unique="false"/> </key> <list-index column="`globaladdress_location_idx`"/> <element type="java.lang.String"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml index 913c3baf3..c7db85215 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:04 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:49 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml index 0280da238..ac4a8efbb 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:41 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:26 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml index 10827e695..48979fac7 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:08 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:53 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml index 86ee577f9..f01fef366 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:45 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:30 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml index 21b83965d..2f26f766e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:05 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:50 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml index 52c53ecb7..a1fe97990 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:41 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:26 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml index f6fc4d215..859134067 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:22 CEST 2006 --> <hibernate-mapping> <class entity-name="A" abstract="false" lazy="false" discriminator-value="A" table="`a`"> <id name="id" type="java.lang.String" column="`id`"/> @@ -13,7 +13,7 @@ <property name="comment" type="double" lazy="false" column="`comment`" not-null="false"/> <property name="d" type="java.lang.String" lazy="false" column="`d`" not-null="true"/> <many-to-one name="myR" entity-name="R" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`myr_id`"/> + <column not-null="false" unique="false" name="`r_myr_id`"/> </many-to-one> </class> <class entity-name="R" abstract="false" lazy="false" discriminator-value="R" table="`r`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml index c161905c4..28d0aa347 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:07 CEST 2006 --> <hibernate-mapping> <class entity-name="A" abstract="false" lazy="false" table="`a`"> <id name="id" type="java.lang.String" column="`id`"/> @@ -12,7 +12,7 @@ <property name="comment" type="double" lazy="false" column="`comment`" not-null="false"/> <property name="d" type="java.lang.String" lazy="false" column="`d`" not-null="true"/> <many-to-one name="myR" entity-name="R" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`myr_id`"/> + <column not-null="false" unique="false" name="`r_myr_id`"/> </many-to-one> </class> <class entity-name="R" abstract="false" lazy="false" table="`r`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml index 82e898e7f..301574471 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:01 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:53 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`"> <id type="long" name="myid" column="myid"> @@ -28,7 +28,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <many-to-one name="address" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`address_id`"/> + <column not-null="false" unique="false" name="`address_address_id`"/> </many-to-one> <property name="faculty" type="java.lang.String" lazy="false" column="`faculty`" not-null="true"/> </class> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml index a5767bab2..aacf7d9f5 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:47 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:39 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" table="`address`"> <id type="long" name="myid" column="myid"> @@ -25,7 +25,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <many-to-one name="address" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`address_id`"/> + <column not-null="false" unique="false" name="`address_address_id`"/> </many-to-one> <property name="faculty" type="java.lang.String" lazy="false" column="`faculty`" not-null="true"/> </class> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml index 95c044294..f59c16495 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:09 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:59 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml index cadf1d76c..96bd5b7e9 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:53 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:45 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml index a320aae4a..e76e857e7 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:05 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:55 CEST 2006 --> <hibernate-mapping> <class entity-name="Basic" abstract="false" lazy="false" discriminator-value="Basic" table="`basic`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml index c7ebdc4d6..9242967ba 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:49 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:42 CEST 2006 --> <hibernate-mapping> <class entity-name="Basic" abstract="false" lazy="false" table="`basic`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/hibernate.hbm.xml index 04a5f3265..73424a64b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:57 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:50 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/hibernate.hbm.xml index d4c486f19..5157d22e8 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:35 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`mybooktable`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml index eeec153b3..293c681db 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:06 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:56 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml index 967a4f184..0dd4daeed 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:43 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml index 8ed53e675..76b390932 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:07 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:57 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" discriminator-value="Person" table="`person`"> <composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true"> @@ -14,8 +14,8 @@ <subclass entity-name="Parent" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ParentImpl" extends="Person" discriminator-value="Parent"> <list name="children" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`children_firstname`" not-null="false" unique="false"/> - <column name="`children_lastname`" not-null="false" unique="false"/> + <column name="`parent_children_firstname`" not-null="false" unique="false"/> + <column name="`parent_children_lastname`" not-null="false" unique="false"/> </key> <list-index column="`parent_children_idx`"/> <one-to-many entity-name="Child"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml index c88ef2d2d..0f69c26f5 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:51 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:43 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" table="`person`"> <composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true"> @@ -17,8 +17,8 @@ </key> <list name="children" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`children_firstname`" not-null="false" unique="false"/> - <column name="`children_lastname`" not-null="false" unique="false"/> + <column name="`parent_children_firstname`" not-null="false" unique="false"/> + <column name="`parent_children_lastname`" not-null="false" unique="false"/> </key> <list-index column="`parent_children_idx`"/> <one-to-many entity-name="Child"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml index e301d3cf2..1b676b084 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:09 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:46 CEST 2006 --> <hibernate-mapping> <class entity-name="ChildItem" abstract="false" lazy="false" discriminator-value="ChildItem" table="`childitem`"> <id type="long" name="e_id" column="e_id"> @@ -18,10 +18,12 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <list name="childItem" table="item_childitem" lazy="true" cascade="all,delete-orphan"> - <key/> + <list name="childItem" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`item_childitem_id`" not-null="false" unique="false"/> + </key> <list-index column="`item_childitem_idx`"/> - <many-to-many entity-name="ChildItem" unique="false"/> + <one-to-many entity-name="ChildItem"/> </list> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml index 776dfc758..d04e54490 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:53 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:27 CEST 2006 --> <hibernate-mapping> <class entity-name="ChildItem" abstract="false" lazy="false" table="`childitem`"> <id type="long" name="e_id" column="e_id"> @@ -16,10 +16,12 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <list name="childItem" table="item_childitem" lazy="true" cascade="all,delete-orphan"> - <key/> + <list name="childItem" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`item_childitem_id`" not-null="false" unique="false"/> + </key> <list-index column="`item_childitem_idx`"/> - <many-to-many entity-name="ChildItem" unique="false"/> + <one-to-many entity-name="ChildItem"/> </list> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/hibernate.hbm.xml index 04a5f3265..73424a64b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:57 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:50 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o/hibernate.hbm.xml index c0c330164..5157d22e8 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:43 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:35 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`mybooktable`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml index f465ea68c..0963a705b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:07 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:57 CEST 2006 --> <hibernate-mapping> <class entity-name="Embedder" abstract="false" lazy="false" discriminator-value="Embedder" table="`embedder`"> <id type="long" name="e_id" column="e_id"> @@ -33,7 +33,7 @@ </component> <list name="fourthEmbedded" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`fourthembedded_id`" not-null="true" unique="false"/> + <column name="`embedder_fourthembedded_id`" not-null="true" unique="false"/> </key> <list-index column="`embedder_fourthembedded_idx`"/> <composite-element class="Embeddable"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml index 4b993aee9..50e933e9d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:51 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:44 CEST 2006 --> <hibernate-mapping> <class entity-name="Embedder" abstract="false" lazy="false" table="`embedder`"> <id type="long" name="e_id" column="e_id"> @@ -32,7 +32,7 @@ </component> <list name="fourthEmbedded" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`fourthembedded_id`" not-null="true" unique="false"/> + <column name="`embedder_fourthembedded_id`" not-null="true" unique="false"/> </key> <list-index column="`embedder_fourthembedded_idx`"/> <composite-element class="Embeddable"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml index a0a6060a9..93ab2f13e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:59 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" discriminator-value="Person" table="`person`"> <composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml index 29ff696b8..68ed63754 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:54 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:46 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" table="`person`"> <composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml index 9ca744b6c..4a92e3d0b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:02 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:54 CEST 2006 --> <hibernate-mapping> <class entity-name="IdentityID" abstract="false" lazy="false" discriminator-value="IdentityID" table="`identityid`"> <id name="myid" type="long" column="`myid`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml index 600545ab3..e529075a0 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:40 CEST 2006 --> <hibernate-mapping> <class entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`"> <id name="myid" type="long" column="`myid`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml index 5a6f14e81..d6b2b5092 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:58 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:50 CEST 2006 --> <hibernate-mapping> <class entity-name="User" abstract="false" lazy="false" discriminator-value="User" table="`user`"> <id type="long" name="e_id" column="e_id"> @@ -15,7 +15,7 @@ <generator class="increment"/> </collection-id> <key update="true"> - <column name="`roles_id`" not-null="true" unique="false"/> + <column name="`user_roles_id`" not-null="true" unique="false"/> </key> <element type="java.lang.String"/> </idbag> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml index 4f4a2084e..52a7535ed 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:43 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:36 CEST 2006 --> <hibernate-mapping> <class entity-name="User" abstract="false" lazy="false" table="`user`"> <id type="long" name="e_id" column="e_id"> @@ -14,7 +14,7 @@ <generator class="increment"/> </collection-id> <key update="true"> - <column name="`roles_id`" not-null="true" unique="false"/> + <column name="`user_roles_id`" not-null="true" unique="false"/> </key> <element type="java.lang.String"/> </idbag> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml index bfd0a047b..a6df1081b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:55 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:47 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <id name="name" type="java.lang.String" column="`name`"/> @@ -15,14 +15,14 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`address_name`" not-null="false" unique="false"/> + <column name="`contentlist_address_name`" not-null="false" unique="false"/> </key> <list-index column="`contentlist_address_idx`"/> <one-to-many entity-name="Address"/> </list> <list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`price_name`" not-null="false" unique="false"/> + <column name="`contentlist_price_name`" not-null="false" unique="false"/> </key> <list-index column="`contentlist_price_idx`"/> <one-to-many entity-name="Price"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml index 5878d46f5..ba6c6624b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:38 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:32 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <id name="name" type="java.lang.String" column="`name`"/> @@ -14,14 +14,14 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`address_name`" not-null="false" unique="false"/> + <column name="`contentlist_address_name`" not-null="false" unique="false"/> </key> <list-index column="`contentlist_address_idx`"/> <one-to-many entity-name="Address"/> </list> <list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`price_name`" not-null="false" unique="false"/> + <column name="`contentlist_price_name`" not-null="false" unique="false"/> </key> <list-index column="`contentlist_price_idx`"/> <one-to-many entity-name="Price"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml index ce785cd47..d7e023f5f 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:56 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:48 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.lazy.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml index aed1ea8fe..990a89923 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:39 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:33 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.lazy.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml index 92cbd798d..922a1b8b2 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:59 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml index 228bafd21..3bb6fd8e8 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:54 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:46 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml index 627e8eca5..ee3e3de9a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:59 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:51 CEST 2006 --> <hibernate-mapping> <class entity-name="Cntr" abstract="false" lazy="false" discriminator-value="Cntr" table="`cntr`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml index fcdcdd248..a4d9a2a54 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:37 CEST 2006 --> <hibernate-mapping> <class entity-name="Cntr" abstract="false" lazy="false" table="`cntr`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml index 36e998da2..84f4802b9 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:03 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:55 CEST 2006 --> <hibernate-mapping> <class entity-name="SpecificDocument" abstract="false" lazy="false" discriminator-value="SpecificDocument" table="`specificdocument`"> <id name="myId" type="long" column="`myid`"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml index c445510d7..871a24615 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:41 CEST 2006 --> <hibernate-mapping> <class entity-name="SpecificDocument" abstract="false" lazy="false" table="`specificdocument`"> <id name="myId" type="long" column="`myid`"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml index d4a771e48..eff65ecdc 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:07 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:57 CEST 2006 --> <hibernate-mapping> <class entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`"> <id name="theID" type="long" column="`theid`"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml index 4158c60da..1aa07ef76 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:51 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:44 CEST 2006 --> <hibernate-mapping> <class entity-name="Body" abstract="false" lazy="false" table="`body`"> <id name="theID" type="long" column="`theid`"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml index 589cac3ad..f75389062 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:58 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:51 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`PERSON`"> <id name="id" type="long" column="`ID`"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml index 65b8e50fa..5da6a2019 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:37 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`PERSON`"> <id name="id" type="long" column="`ID`"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml index db217bea0..feeab1e7c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:03 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:55 CEST 2006 --> <hibernate-mapping> <class entity-name="ContainedItem" abstract="false" lazy="false" discriminator-value="ContainedItem" table="`containeditem`"> <id type="long" name="e_id" column="e_id"> @@ -18,8 +18,8 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`itemlist_id`"/> + <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`item_itemlist_id`"/> </many-to-one> </class> <class entity-name="ItemList" abstract="false" lazy="false" discriminator-value="ItemList" table="`itemlist`"> @@ -31,13 +31,13 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <bag name="containedItem" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`containeditem_id`" not-null="false" unique="false"/> + <column name="`itemlist_containeditem_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="ContainedItem"/> </bag> <bag name="item" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`itemlist_id`" not-null="false" unique="false"/> + <column name="`item_itemlist_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="Item"/> </bag> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml index 5ba3d92de..d31883c31 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:41 CEST 2006 --> <hibernate-mapping> <class entity-name="ContainedItem" abstract="false" lazy="false" table="`containeditem`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`itemlist_id`"/> + <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`item_itemlist_id`"/> </many-to-one> </class> <class entity-name="ItemList" abstract="false" lazy="false" table="`itemlist`"> @@ -28,13 +28,13 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <bag name="containedItem" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`containeditem_id`" not-null="false" unique="false"/> + <column name="`itemlist_containeditem_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="ContainedItem"/> </bag> <bag name="item" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`itemlist_id`" not-null="false" unique="false"/> + <column name="`item_itemlist_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="Item"/> </bag> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml index 72ac16722..819012c22 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:08 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:58 CEST 2006 --> <hibernate-mapping> <class entity-name="MyItem" abstract="false" lazy="false" discriminator-value="MyItem" table="`myitem`"> <id type="long" name="e_id" column="e_id"> @@ -26,14 +26,13 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <list name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="youritem_myitem"> + <bag name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="youritem_myitem"> <key update="true"> <column name="`youritem_id`" not-null="true" unique="false"/> </key> - <list-index column="`youritem_myitem_idx`"/> <many-to-many entity-name="MyItem" unique="false"> <column name="`myitem_id`" not-null="true" unique="false"/> </many-to-many> - </list> + </bag> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml index f355fb3db..b150c2343 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:52 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:45 CEST 2006 --> <hibernate-mapping> <class entity-name="MyItem" abstract="false" lazy="false" table="`myitem`"> <id type="long" name="e_id" column="e_id"> @@ -24,14 +24,13 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <list name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="youritem_myitem"> + <bag name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="youritem_myitem"> <key update="true"> <column name="`youritem_id`" not-null="true" unique="false"/> </key> - <list-index column="`youritem_myitem_idx`"/> <many-to-many entity-name="MyItem" unique="false"> <column name="`myitem_id`" not-null="true" unique="false"/> </many-to-many> - </list> + </bag> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml index 73e1b1048..5764a3a84 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:08 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:58 CEST 2006 --> <hibernate-mapping> <class entity-name="ContainedItem" abstract="false" lazy="false" discriminator-value="ContainedItem" table="`containeditem`"> <id type="long" name="e_id" column="e_id"> @@ -18,8 +18,8 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`itemlist_id`"/> + <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`item_itemlist_id`"/> </many-to-one> </class> <class entity-name="ItemList" abstract="false" lazy="false" discriminator-value="ItemList" table="`itemlist`"> @@ -31,13 +31,13 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <bag name="containedItem" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`containeditem_id`" not-null="false" unique="false"/> + <column name="`itemlist_containeditem_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="ContainedItem"/> </bag> <bag name="item" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`itemlist_id`" not-null="false" unique="false"/> + <column name="`item_itemlist_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="Item"/> </bag> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml index 647f5f72c..9ac291add 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:52 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:44 CEST 2006 --> <hibernate-mapping> <class entity-name="ContainedItem" abstract="false" lazy="false" table="`containeditem`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`itemlist_id`"/> + <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`item_itemlist_id`"/> </many-to-one> </class> <class entity-name="ItemList" abstract="false" lazy="false" table="`itemlist`"> @@ -28,13 +28,13 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <bag name="containedItem" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`containeditem_id`" not-null="false" unique="false"/> + <column name="`itemlist_containeditem_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="ContainedItem"/> </bag> <bag name="item" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`itemlist_id`" not-null="false" unique="false"/> + <column name="`item_itemlist_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="Item"/> </bag> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml index 1dd48e2ac..86b091885 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:57 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:49 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -27,7 +27,7 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="address" entity-name="Address" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`address_id`"/> + <column not-null="false" unique="false" name="`address_address_id`"/> </many-to-one> <one-to-one name="head" entity-name="Head" cascade="all" lazy="false"/> </class> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml index b2a01c1c5..b12f48cd4 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:34 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -24,7 +24,7 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="address" entity-name="Address" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`address_id`"/> + <column not-null="false" unique="false" name="`address_address_id`"/> </many-to-one> <one-to-one name="head" entity-name="Head" cascade="all" lazy="false"/> </class> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml index 26ab44b76..64972e3fb 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:05 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:55 CEST 2006 --> <hibernate-mapping> <class entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`"> <id name="theID" type="long" column="`theid`"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml index efc437475..90759a676 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:49 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:41 CEST 2006 --> <hibernate-mapping> <class entity-name="Body" abstract="false" lazy="false" table="`body`"> <id name="theID" type="long" column="`theid`"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml index 7a71df43c..97d54090e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:07 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:47 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`myitemtable`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml index 3e189f0d3..ef9331e80 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:17:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:31 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" table="`myitemtable`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml index 1681e346f..00b073640 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:12 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:02 CEST 2006 --> <hibernate-mapping> <class entity-name="Contacts" abstract="false" lazy="false" discriminator-value="Contacts" table="`contacts`"> <id type="long" name="e_id" column="e_id"> @@ -11,14 +11,14 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="persons" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`persons_id`" not-null="false" unique="false"/> + <column name="`contacts_persons_id`" not-null="false" unique="false"/> </key> <list-index column="`contacts_persons_idx`"/> <one-to-many entity-name="Person"/> </list> <list name="containedPersons" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`containedpersons_id`" not-null="false" unique="false"/> + <column name="`contacts_containedpersons_id`" not-null="false" unique="false"/> </key> <list-index column="`contacts_containedpersons_idx`"/> <one-to-many entity-name="Person"/> @@ -33,7 +33,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="children" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`children_id`" not-null="false" unique="false"/> + <column name="`person_children_id`" not-null="false" unique="false"/> </key> <list-index column="`person_children_idx`"/> <one-to-many entity-name="Person"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml index 5469abbb0..5f3fddafc 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:00 CEST 2006 --> <hibernate-mapping> <class entity-name="Contacts" abstract="false" lazy="false" table="`contacts`"> <id type="long" name="e_id" column="e_id"> @@ -10,14 +10,14 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="persons" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`persons_id`" not-null="false" unique="false"/> + <column name="`contacts_persons_id`" not-null="false" unique="false"/> </key> <list-index column="`contacts_persons_idx`"/> <one-to-many entity-name="Person"/> </list> <list name="containedPersons" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`containedpersons_id`" not-null="false" unique="false"/> + <column name="`contacts_containedpersons_id`" not-null="false" unique="false"/> </key> <list-index column="`contacts_containedpersons_idx`"/> <one-to-many entity-name="Person"/> @@ -31,7 +31,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="children" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`children_id`" not-null="false" unique="false"/> + <column name="`person_children_id`" not-null="false" unique="false"/> </key> <list-index column="`person_children_idx`"/> <one-to-many entity-name="Person"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml index 7770862c0..c1278aab8 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:19 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:06 CEST 2006 --> <hibernate-mapping> <class entity-name="PriceByQuantityType" abstract="false" lazy="false" discriminator-value="PriceByQuantityType" table="`pricebyquantitytype`"> <id type="long" name="e_id" column="e_id"> @@ -18,7 +18,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_name`" not-null="false" unique="false"/> + <column name="`producttype_group_name`" not-null="false" unique="false"/> </key> <list-index column="`producttype_group_idx`"/> <one-to-many entity-name="ProductType_group"/> @@ -30,7 +30,7 @@ </property> <list name="group1" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group1_name`" not-null="false" unique="false"/> + <column name="`producttype_group1_name`" not-null="false" unique="false"/> </key> <list-index column="`producttype_group1_idx`"/> <one-to-many entity-name="ProductType_group1"/> @@ -45,7 +45,7 @@ <property name="fme_feature" type="java.lang.String"/> <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> <many-to-one name="translatedDescription" entity-name="TranslatedDescriptionType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`translateddescription_id`"/> + <column not-null="false" unique="false" name="`translateddescriptiontype_translateddescription_id`"/> </many-to-one> </class> <class entity-name="ProductType_group1" lazy="false" table="`producttype_group1`"> @@ -56,10 +56,10 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="priceByQuantity" entity-name="PriceByQuantityType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`pricebyquantity_id`"/> + <column not-null="false" unique="false" name="`pricebyquantitytype_pricebyquantity_id`"/> </many-to-one> <many-to-one name="priceFromSupplier" entity-name="SupplierPriceType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`pricefromsupplier_id`"/> + <column not-null="false" unique="false" name="`supplierpricetype_pricefromsupplier_id`"/> </many-to-one> <property name="simplePrice" type="double" lazy="false" column="`simpleprice`" not-null="false"/> </class> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml index 659ae85c2..b8132feae 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:14 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:05 CEST 2006 --> <hibernate-mapping> <class entity-name="PriceByQuantityType" abstract="false" lazy="false" table="`pricebyquantitytype`"> <id type="long" name="e_id" column="e_id"> @@ -16,7 +16,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_name`" not-null="false" unique="false"/> + <column name="`producttype_group_name`" not-null="false" unique="false"/> </key> <list-index column="`producttype_group_idx`"/> <one-to-many entity-name="ProductType_group"/> @@ -28,7 +28,7 @@ </property> <list name="group1" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group1_name`" not-null="false" unique="false"/> + <column name="`producttype_group1_name`" not-null="false" unique="false"/> </key> <list-index column="`producttype_group1_idx`"/> <one-to-many entity-name="ProductType_group1"/> @@ -43,7 +43,7 @@ <property name="fme_feature" type="java.lang.String"/> <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> <many-to-one name="translatedDescription" entity-name="TranslatedDescriptionType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`translateddescription_id`"/> + <column not-null="false" unique="false" name="`translateddescriptiontype_translateddescription_id`"/> </many-to-one> </class> <class entity-name="ProductType_group1" lazy="false" table="`producttype_group1`"> @@ -54,10 +54,10 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="priceByQuantity" entity-name="PriceByQuantityType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`pricebyquantity_id`"/> + <column not-null="false" unique="false" name="`pricebyquantitytype_pricebyquantity_id`"/> </many-to-one> <many-to-one name="priceFromSupplier" entity-name="SupplierPriceType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`pricefromsupplier_id`"/> + <column not-null="false" unique="false" name="`supplierpricetype_pricefromsupplier_id`"/> </many-to-one> <property name="simplePrice" type="double" lazy="false" column="`simpleprice`" not-null="false"/> </class> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml index 22e50e90a..deb21b016 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:27 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:12 CEST 2006 --> <hibernate-mapping> <class entity-name="ContainedChildNR" abstract="false" lazy="false" discriminator-value="ContainedChildNR" table="`containedchildnr`"> <id type="long" name="e_id" column="e_id"> @@ -27,16 +27,16 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <many-to-one name="containedonewayrequired" entity-name="ContainedChildR" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`containedonewayrequired_id`"/> + <column not-null="true" unique="false" name="`containedchildr_containedonewayrequired_id`"/> </many-to-one> <many-to-one name="containedoneWaynotrequired" entity-name="ContainedChildNR" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`containedonewaynotrequired_id`"/> + <column not-null="false" unique="false" name="`containedchildnr_containedonewaynotrequired_id`"/> </many-to-one> <many-to-one name="notcontainedonewayrequired" entity-name="NotContainedChildR" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`notcontainedonewayrequired_id`"/> + <column not-null="true" unique="false" name="`notcontainedchildr_notcontainedonewayrequired_id`"/> </many-to-one> <many-to-one name="notcontainedonewaynotrequired" entity-name="NotContainedChildNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`notcontainedonewaynotrequired_id`"/> + <column not-null="false" unique="false" name="`notcontainedchildnr_notcontainedonewaynotrequired_id`"/> </many-to-one> <many-to-one name="notcontainedtwowaynotrequired" entity-name="NotContainedChildNRT" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/> <many-to-one name="notcontainedtwowayrequirednr" entity-name="NotContainedChildRTNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml index 4d89f4eb3..7fbf950d6 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:20 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:07 CEST 2006 --> <hibernate-mapping> <class entity-name="ContainedChildNR" abstract="false" lazy="false" table="`containedchildnr`"> <id type="long" name="e_id" column="e_id"> @@ -24,16 +24,16 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <many-to-one name="containedonewayrequired" entity-name="ContainedChildR" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`containedonewayrequired_id`"/> + <column not-null="true" unique="false" name="`containedchildr_containedonewayrequired_id`"/> </many-to-one> <many-to-one name="containedoneWaynotrequired" entity-name="ContainedChildNR" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`containedonewaynotrequired_id`"/> + <column not-null="false" unique="false" name="`containedchildnr_containedonewaynotrequired_id`"/> </many-to-one> <many-to-one name="notcontainedonewayrequired" entity-name="NotContainedChildR" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`notcontainedonewayrequired_id`"/> + <column not-null="true" unique="false" name="`notcontainedchildr_notcontainedonewayrequired_id`"/> </many-to-one> <many-to-one name="notcontainedonewaynotrequired" entity-name="NotContainedChildNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`notcontainedonewaynotrequired_id`"/> + <column not-null="false" unique="false" name="`notcontainedchildnr_notcontainedonewaynotrequired_id`"/> </many-to-one> <many-to-one name="notcontainedtwowaynotrequired" entity-name="NotContainedChildNRT" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/> <many-to-one name="notcontainedtwowayrequirednr" entity-name="NotContainedChildRTNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml index 558e79649..63cee782e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:29 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:14 CEST 2006 --> <hibernate-mapping> <class entity-name="Main" abstract="false" lazy="false" discriminator-value="Main" table="`main`"> <id type="long" name="e_id" column="e_id"> @@ -12,56 +12,56 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="onecr" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`onecr_id`" not-null="false" unique="false"/> + <column name="`main_onecr_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onecr_idx`"/> <one-to-many entity-name="OneCR"/> </list> <list name="onecn" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`onecn_id`" not-null="false" unique="false"/> + <column name="`main_onecn_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onecn_idx`"/> <one-to-many entity-name="OneCN"/> </list> <list name="onenr" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`onenr_id`" not-null="false" unique="false"/> + <column name="`main_onenr_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onenr_idx`"/> <one-to-many entity-name="OneNR"/> </list> <list name="onenn" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`onenn_id`" not-null="false" unique="false"/> + <column name="`main_onenn_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onenn_idx`"/> <one-to-many entity-name="OneNN"/> </list> <list name="twocr" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twocr_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twocr_idx`"/> <one-to-many entity-name="TwoCR"/> </list> <list name="twocn" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twocn_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twocn_idx`"/> <one-to-many entity-name="TwoCN"/> </list> <list name="twonr" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twonr_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twonr_idx`"/> <one-to-many entity-name="TwoNR"/> </list> <list name="twonn" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twonn_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twonn_idx`"/> <one-to-many entity-name="TwoNN"/> @@ -106,8 +106,8 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`twocn_main_id`"/> </many-to-one> </class> <class entity-name="TwoCR" abstract="false" lazy="false" discriminator-value="TwoCR" table="`twocr`"> @@ -117,8 +117,8 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`twocr_main_id`"/> </many-to-one> </class> <class entity-name="TwoNN" abstract="false" lazy="false" discriminator-value="TwoNN" table="`twonn`"> @@ -128,8 +128,8 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`twonn_main_id`"/> </many-to-one> </class> <class entity-name="TwoNR" abstract="false" lazy="false" discriminator-value="TwoNR" table="`twonr`"> @@ -139,8 +139,8 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`twonr_main_id`"/> </many-to-one> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml index 3090e6eba..8e96f656c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:10 CEST 2006 --> <hibernate-mapping> <class entity-name="Main" abstract="false" lazy="false" table="`main`"> <id type="long" name="e_id" column="e_id"> @@ -11,56 +11,56 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="onecr" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`onecr_id`" not-null="false" unique="false"/> + <column name="`main_onecr_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onecr_idx`"/> <one-to-many entity-name="OneCR"/> </list> <list name="onecn" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`onecn_id`" not-null="false" unique="false"/> + <column name="`main_onecn_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onecn_idx`"/> <one-to-many entity-name="OneCN"/> </list> <list name="onenr" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`onenr_id`" not-null="false" unique="false"/> + <column name="`main_onenr_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onenr_idx`"/> <one-to-many entity-name="OneNR"/> </list> <list name="onenn" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`onenn_id`" not-null="false" unique="false"/> + <column name="`main_onenn_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onenn_idx`"/> <one-to-many entity-name="OneNN"/> </list> <list name="twocr" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twocr_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twocr_idx`"/> <one-to-many entity-name="TwoCR"/> </list> <list name="twocn" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twocn_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twocn_idx`"/> <one-to-many entity-name="TwoCN"/> </list> <list name="twonr" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twonr_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twonr_idx`"/> <one-to-many entity-name="TwoNR"/> </list> <list name="twonn" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twonn_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twonn_idx`"/> <one-to-many entity-name="TwoNN"/> @@ -100,8 +100,8 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`twocn_main_id`"/> </many-to-one> </class> <class entity-name="TwoCR" abstract="false" lazy="false" table="`twocr`"> @@ -110,8 +110,8 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`twocr_main_id`"/> </many-to-one> </class> <class entity-name="TwoNN" abstract="false" lazy="false" table="`twonn`"> @@ -120,8 +120,8 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`twonn_main_id`"/> </many-to-one> </class> <class entity-name="TwoNR" abstract="false" lazy="false" table="`twonr`"> @@ -130,8 +130,8 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`twonr_main_id`"/> </many-to-one> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml index a9e1d1d4f..0aa57d75d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:30 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:16 CEST 2006 --> <hibernate-mapping> <class entity-name="Main" abstract="false" lazy="false" discriminator-value="Main" table="`main`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml index 5f203821c..0486ad67b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:25 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:11 CEST 2006 --> <hibernate-mapping> <class entity-name="Main" abstract="false" lazy="false" table="`main`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml index 76c559e36..df688d4c9 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:09 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:54 CEST 2006 --> <hibernate-mapping> <class entity-name="CatalogType" abstract="false" lazy="false" discriminator-value="CatalogType" table="`catalogtype`"> <id name="name" type="java.lang.String" column="`name`"/> @@ -10,14 +10,14 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> <list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`subcatalog_name`" not-null="false" unique="false"/> + <column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_subcatalog_idx`"/> <one-to-many entity-name="CatalogType"/> </list> <list name="product" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`product_name`" not-null="false" unique="false"/> + <column name="`catalogtype_product_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_product_idx`"/> <one-to-many entity-name="ProductType"/> @@ -32,7 +32,7 @@ <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> <property name="quantityTo" type="double" lazy="false" column="`quantityto`" not-null="false"/> <many-to-one name="supplier" entity-name="SupplierType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`supplier_id`"/> + <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> </class> <class entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`"> @@ -42,13 +42,13 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> <list name="remark" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`remark_code`" not-null="false" unique="false"/> + <column name="`producttype_remark_code`" not-null="false" unique="false"/> </key> <list-index column="`producttype_remark_idx`"/> <one-to-many entity-name="StringType"/> </list> <many-to-one name="price" entity-name="PriceType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`price_id`"/> + <column not-null="true" unique="false" name="`pricetype_price_id`"/> </many-to-one> </class> <class entity-name="StringType" abstract="false" lazy="false" discriminator-value="StringType" table="`stringtype`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml index 7afc0df8b..c010fb09b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:45 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:30 CEST 2006 --> <hibernate-mapping> <class entity-name="CatalogType" abstract="false" lazy="false" table="`catalogtype`"> <id name="name" type="java.lang.String" column="`name`"/> @@ -9,14 +9,14 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> <list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`subcatalog_name`" not-null="false" unique="false"/> + <column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_subcatalog_idx`"/> <one-to-many entity-name="CatalogType"/> </list> <list name="product" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`product_name`" not-null="false" unique="false"/> + <column name="`catalogtype_product_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_product_idx`"/> <one-to-many entity-name="ProductType"/> @@ -30,7 +30,7 @@ <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> <property name="quantityTo" type="double" lazy="false" column="`quantityto`" not-null="false"/> <many-to-one name="supplier" entity-name="SupplierType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`supplier_id`"/> + <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> </class> <class entity-name="ProductType" abstract="false" lazy="false" table="`producttype`"> @@ -39,13 +39,13 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> <list name="remark" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`remark_code`" not-null="false" unique="false"/> + <column name="`producttype_remark_code`" not-null="false" unique="false"/> </key> <list-index column="`producttype_remark_idx`"/> <one-to-many entity-name="StringType"/> </list> <many-to-one name="price" entity-name="PriceType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`price_id`"/> + <column not-null="true" unique="false" name="`pricetype_price_id`"/> </many-to-one> </class> <class entity-name="StringType" abstract="false" lazy="false" table="`stringtype`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml index ac7dc8755..b23c9068b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:56 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:41 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <id type="long" name="e_id" column="e_id"> @@ -12,7 +12,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`person_group_id`" not-null="false" unique="false"/> </key> <list-index column="`person_group_idx`"/> <one-to-many entity-name="Person_group"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml index fd51f2dbc..32ffca0cc 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:33 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:17 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`person_group_id`" not-null="false" unique="false"/> </key> <list-index column="`person_group_idx`"/> <one-to-many entity-name="Person_group"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.EcoreAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.EcoreAction/mysql_a_o/hibernate.hbm.xml new file mode 100644 index 000000000..37be34540 --- /dev/null +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.EcoreAction/mysql_a_o/hibernate.hbm.xml @@ -0,0 +1,187 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<!-- Generated by Teneo on Fri Sep 29 11:01:35 CEST 2006 --> +<hibernate-mapping> + <class entity-name="EObject" abstract="false" lazy="false" discriminator-value="EObject" table="`eobject`"> + <id type="long" name="e_id" column="e_id"> + <generator class="native"/> + </id> + <discriminator column="`dtype`" type="string"/> + <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> + </class> + <subclass entity-name="EModelElement" abstract="true" lazy="false" extends="EObject" discriminator-value="EModelElement"> + <list name="eAnnotations" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eannotation_emodelelement_id`" not-null="false" unique="false"/> + </key> + <list-index column="`emodelelement_eannotations_idx`"/> + <one-to-many entity-name="EAnnotation"/> + </list> + </subclass> + <subclass entity-name="ENamedElement" abstract="true" lazy="false" extends="EModelElement" discriminator-value="ENamedElement"> + <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + </subclass> + <subclass entity-name="ETypedElement" abstract="true" lazy="false" extends="ENamedElement" discriminator-value="ETypedElement"> + <property name="ordered" type="boolean" lazy="false" column="`ordered`" not-null="false"/> + <property name="unique" type="boolean" lazy="false" column="`unique`" not-null="false"/> + <property name="lowerBound" type="int" lazy="false" column="`lowerbound`" not-null="false"/> + <property name="upperBound" type="int" lazy="false" column="`upperbound`" not-null="false"/> + <many-to-one name="eType" entity-name="EClassifier" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> + <column not-null="false" unique="false" name="`eclassifier_etype_id`"/> + </many-to-one> + </subclass> + <subclass entity-name="EStructuralFeature" abstract="true" lazy="false" extends="ETypedElement" discriminator-value="EStructuralFeature"> + <property name="changeable" type="boolean" lazy="false" column="`changeable`" not-null="false"/> + <property name="volatile" type="boolean" lazy="false" column="`volatile`" not-null="false"/> + <property name="transient" type="boolean" lazy="false" column="`transient`" not-null="false"/> + <property name="defaultValueLiteral" type="java.lang.String" lazy="false" column="`defaultvalueliteral`" not-null="false"/> + <property name="unsettable" type="boolean" lazy="false" column="`unsettable`" not-null="false"/> + <property name="derived" type="boolean" lazy="false" column="`derived`" not-null="false"/> + <many-to-one name="eContainingClass" entity-name="EClass" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`estructuralfeature_econtainingclass_id`"/> + </many-to-one> + </subclass> + <subclass entity-name="EAttribute" abstract="false" lazy="false" extends="EStructuralFeature" discriminator-value="EAttribute"> + <property name="iD" type="boolean" lazy="false" column="`id`" not-null="false"/> + </subclass> + <subclass entity-name="EAnnotation" abstract="false" lazy="false" extends="EModelElement" discriminator-value="EAnnotation"> + <property name="source" type="java.lang.String" lazy="false" column="`source`" not-null="false"/> + <list name="details" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eannotation_details_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eannotation_details_idx`"/> + <one-to-many entity-name="EStringToStringMapEntry"/> + </list> + <many-to-one name="eModelElement" entity-name="EModelElement" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eannotation_emodelelement_id`"/> + </many-to-one> + <list name="contents" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eannotation_contents_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eannotation_contents_idx`"/> + <one-to-many entity-name="EObject"/> + </list> + <list name="references" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true"> + <column name="`eannotation_references_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eannotation_references_idx`"/> + <one-to-many entity-name="EObject"/> + </list> + </subclass> + <subclass entity-name="EClassifier" abstract="true" lazy="false" extends="ENamedElement" discriminator-value="EClassifier"> + <property name="instanceClassName" type="java.lang.String" lazy="false" column="`instanceclassname`" not-null="false"/> + <many-to-one name="ePackage" entity-name="EPackage" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eclassifier_epackage_id`"/> + </many-to-one> + </subclass> + <subclass entity-name="EClass" abstract="false" lazy="false" extends="EClassifier" discriminator-value="EClass"> + <property name="abstract" type="boolean" lazy="false" column="`abstract`" not-null="false"/> + <property name="interface" type="boolean" lazy="false" column="`interface`" not-null="false"/> + <list name="eSuperTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true"> + <column name="`eclass_esupertypes_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eclass_esupertypes_idx`"/> + <one-to-many entity-name="EClass"/> + </list> + <list name="eOperations" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eoperation_econtainingclass_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eclass_eoperations_idx`"/> + <one-to-many entity-name="EOperation"/> + </list> + <list name="eStructuralFeatures" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`estructuralfeature_econtainingclass_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eclass_estructuralfeatures_idx`"/> + <one-to-many entity-name="EStructuralFeature"/> + </list> + </subclass> + <subclass entity-name="EDataType" abstract="false" lazy="false" extends="EClassifier" discriminator-value="EDataType"> + <property name="serializable" type="boolean" lazy="false" column="`serializable`" not-null="false"/> + </subclass> + <subclass entity-name="EEnum" abstract="false" lazy="false" extends="EDataType" discriminator-value="EEnum"> + <list name="eLiterals" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eenumliteral_eenum_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eenum_eliterals_idx`"/> + <one-to-many entity-name="EEnumLiteral"/> + </list> + </subclass> + <subclass entity-name="EEnumLiteral" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="EEnumLiteral"> + <property name="value" type="int" lazy="false" column="`value`" not-null="false"/> + <property name="literal" type="java.lang.String" lazy="false" column="`literal`" not-null="false"/> + <many-to-one name="eEnum" entity-name="EEnum" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eenumliteral_eenum_id`"/> + </many-to-one> + </subclass> + <subclass entity-name="EFactory" abstract="false" lazy="false" extends="EModelElement" discriminator-value="EFactory"/> + <subclass entity-name="EOperation" abstract="false" lazy="false" extends="ETypedElement" discriminator-value="EOperation"> + <many-to-one name="eContainingClass" entity-name="EClass" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eoperation_econtainingclass_id`"/> + </many-to-one> + <list name="eParameters" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eparameter_eoperation_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eoperation_eparameters_idx`"/> + <one-to-many entity-name="EParameter"/> + </list> + <list name="eExceptions" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true"> + <column name="`eoperation_eexceptions_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eoperation_eexceptions_idx`"/> + <one-to-many entity-name="EClassifier"/> + </list> + </subclass> + <subclass entity-name="EPackage" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="EPackage"> + <property name="nsURI" type="java.lang.String" lazy="false" column="`nsuri`" not-null="false"/> + <property name="nsPrefix" type="java.lang.String" lazy="false" column="`nsprefix`" not-null="false"/> + <list name="eClassifiers" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eclassifier_epackage_id`" not-null="false" unique="false"/> + </key> + <list-index column="`epackage_eclassifiers_idx`"/> + <one-to-many entity-name="EClassifier"/> + </list> + <list name="eSubpackages" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`epackage_esuperpackage_id`" not-null="false" unique="false"/> + </key> + <list-index column="`epackage_esubpackages_idx`"/> + <one-to-many entity-name="EPackage"/> + </list> + <many-to-one name="eSuperPackage" entity-name="EPackage" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`epackage_esuperpackage_id`"/> + </many-to-one> + </subclass> + <subclass entity-name="EParameter" abstract="false" lazy="false" extends="ETypedElement" discriminator-value="EParameter"> + <many-to-one name="eOperation" entity-name="EOperation" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eparameter_eoperation_id`"/> + </many-to-one> + </subclass> + <subclass entity-name="EReference" abstract="false" lazy="false" extends="EStructuralFeature" discriminator-value="EReference"> + <property name="containment" type="boolean" lazy="false" column="`containment`" not-null="false"/> + <property name="resolveProxies" type="boolean" lazy="false" column="`resolveproxies`" not-null="false"/> + <many-to-one name="eOpposite" entity-name="EReference" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> + <column not-null="false" unique="false" name="`ereference_eopposite_id`"/> + </many-to-one> + </subclass> + <class entity-name="EStringToStringMapEntry" abstract="false" lazy="false" discriminator-value="EStringToStringMapEntry" table="`estringtostringmapentry`"> + <id type="long" name="e_id" column="e_id"> + <generator class="native"/> + </id> + <discriminator column="`dtype`" type="string"/> + <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> + <property name="key" type="java.lang.String" lazy="false" column="`key`" not-null="false"/> + <property name="value" type="java.lang.String" lazy="false" column="`value`" not-null="false"/> + </class> +</hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.EcoreAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.EcoreAction/mysql_s_o/hibernate.hbm.xml new file mode 100644 index 000000000..6c19ca93e --- /dev/null +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.EcoreAction/mysql_s_o/hibernate.hbm.xml @@ -0,0 +1,234 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<!-- Generated by Teneo on Fri Sep 29 11:00:58 CEST 2006 --> +<hibernate-mapping> + <class entity-name="EObject" abstract="false" lazy="false" table="`eobject`"> + <id type="long" name="e_id" column="e_id"> + <generator class="native"/> + </id> + <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> + </class> + <joined-subclass entity-name="EModelElement" abstract="true" lazy="false" extends="EObject" table="`emodelelement`"> + <key> + <column name="`eobject_id`"/> + </key> + <list name="eAnnotations" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eannotation_emodelelement_id`" not-null="false" unique="false"/> + </key> + <list-index column="`emodelelement_eannotations_idx`"/> + <one-to-many entity-name="EAnnotation"/> + </list> + </joined-subclass> + <joined-subclass entity-name="ENamedElement" abstract="true" lazy="false" extends="EModelElement" table="`enamedelement`"> + <key> + <column name="`emodelelement_id`"/> + </key> + <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + </joined-subclass> + <joined-subclass entity-name="ETypedElement" abstract="true" lazy="false" extends="ENamedElement" table="`etypedelement`"> + <key> + <column name="`enamedelement_id`"/> + </key> + <property name="ordered" type="boolean" lazy="false" column="`ordered`" not-null="false"/> + <property name="unique" type="boolean" lazy="false" column="`unique`" not-null="false"/> + <property name="lowerBound" type="int" lazy="false" column="`lowerbound`" not-null="false"/> + <property name="upperBound" type="int" lazy="false" column="`upperbound`" not-null="false"/> + <many-to-one name="eType" entity-name="EClassifier" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> + <column not-null="false" unique="false" name="`eclassifier_etype_id`"/> + </many-to-one> + </joined-subclass> + <joined-subclass entity-name="EStructuralFeature" abstract="true" lazy="false" extends="ETypedElement" table="`estructuralfeature`"> + <key> + <column name="`etypedelement_id`"/> + </key> + <property name="changeable" type="boolean" lazy="false" column="`changeable`" not-null="false"/> + <property name="volatile" type="boolean" lazy="false" column="`volatile`" not-null="false"/> + <property name="transient" type="boolean" lazy="false" column="`transient`" not-null="false"/> + <property name="defaultValueLiteral" type="java.lang.String" lazy="false" column="`defaultvalueliteral`" not-null="false"/> + <property name="unsettable" type="boolean" lazy="false" column="`unsettable`" not-null="false"/> + <property name="derived" type="boolean" lazy="false" column="`derived`" not-null="false"/> + <many-to-one name="eContainingClass" entity-name="EClass" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`estructuralfeature_econtainingclass_id`"/> + </many-to-one> + </joined-subclass> + <joined-subclass entity-name="EAttribute" abstract="false" lazy="false" extends="EStructuralFeature" table="`eattribute`"> + <key> + <column name="`estructuralfeature_id`"/> + </key> + <property name="iD" type="boolean" lazy="false" column="`id`" not-null="false"/> + </joined-subclass> + <joined-subclass entity-name="EAnnotation" abstract="false" lazy="false" extends="EModelElement" table="`eannotation`"> + <key> + <column name="`emodelelement_id`"/> + </key> + <property name="source" type="java.lang.String" lazy="false" column="`source`" not-null="false"/> + <list name="details" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eannotation_details_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eannotation_details_idx`"/> + <one-to-many entity-name="EStringToStringMapEntry"/> + </list> + <many-to-one name="eModelElement" entity-name="EModelElement" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eannotation_emodelelement_id`"/> + </many-to-one> + <list name="contents" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eannotation_contents_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eannotation_contents_idx`"/> + <one-to-many entity-name="EObject"/> + </list> + <list name="references" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true"> + <column name="`eannotation_references_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eannotation_references_idx`"/> + <one-to-many entity-name="EObject"/> + </list> + </joined-subclass> + <joined-subclass entity-name="EClassifier" abstract="true" lazy="false" extends="ENamedElement" table="`eclassifier`"> + <key> + <column name="`enamedelement_id`"/> + </key> + <property name="instanceClassName" type="java.lang.String" lazy="false" column="`instanceclassname`" not-null="false"/> + <many-to-one name="ePackage" entity-name="EPackage" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eclassifier_epackage_id`"/> + </many-to-one> + </joined-subclass> + <joined-subclass entity-name="EClass" abstract="false" lazy="false" extends="EClassifier" table="`eclass`"> + <key> + <column name="`eclassifier_id`"/> + </key> + <property name="abstract" type="boolean" lazy="false" column="`abstract`" not-null="false"/> + <property name="interface" type="boolean" lazy="false" column="`interface`" not-null="false"/> + <list name="eSuperTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true"> + <column name="`eclass_esupertypes_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eclass_esupertypes_idx`"/> + <one-to-many entity-name="EClass"/> + </list> + <list name="eOperations" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eoperation_econtainingclass_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eclass_eoperations_idx`"/> + <one-to-many entity-name="EOperation"/> + </list> + <list name="eStructuralFeatures" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`estructuralfeature_econtainingclass_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eclass_estructuralfeatures_idx`"/> + <one-to-many entity-name="EStructuralFeature"/> + </list> + </joined-subclass> + <joined-subclass entity-name="EDataType" abstract="false" lazy="false" extends="EClassifier" table="`edatatype`"> + <key> + <column name="`eclassifier_id`"/> + </key> + <property name="serializable" type="boolean" lazy="false" column="`serializable`" not-null="false"/> + </joined-subclass> + <joined-subclass entity-name="EEnum" abstract="false" lazy="false" extends="EDataType" table="`eenum`"> + <key> + <column name="`edatatype_id`"/> + </key> + <list name="eLiterals" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eenumliteral_eenum_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eenum_eliterals_idx`"/> + <one-to-many entity-name="EEnumLiteral"/> + </list> + </joined-subclass> + <joined-subclass entity-name="EEnumLiteral" abstract="false" lazy="false" extends="ENamedElement" table="`eenumliteral`"> + <key> + <column name="`enamedelement_id`"/> + </key> + <property name="value" type="int" lazy="false" column="`value`" not-null="false"/> + <property name="literal" type="java.lang.String" lazy="false" column="`literal`" not-null="false"/> + <many-to-one name="eEnum" entity-name="EEnum" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eenumliteral_eenum_id`"/> + </many-to-one> + </joined-subclass> + <joined-subclass entity-name="EFactory" abstract="false" lazy="false" extends="EModelElement" table="`efactory`"> + <key> + <column name="`emodelelement_id`"/> + </key> + </joined-subclass> + <joined-subclass entity-name="EOperation" abstract="false" lazy="false" extends="ETypedElement" table="`eoperation`"> + <key> + <column name="`etypedelement_id`"/> + </key> + <many-to-one name="eContainingClass" entity-name="EClass" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eoperation_econtainingclass_id`"/> + </many-to-one> + <list name="eParameters" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eparameter_eoperation_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eoperation_eparameters_idx`"/> + <one-to-many entity-name="EParameter"/> + </list> + <list name="eExceptions" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true"> + <column name="`eoperation_eexceptions_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eoperation_eexceptions_idx`"/> + <one-to-many entity-name="EClassifier"/> + </list> + </joined-subclass> + <joined-subclass entity-name="EPackage" abstract="false" lazy="false" extends="ENamedElement" table="`epackage`"> + <key> + <column name="`enamedelement_id`"/> + </key> + <property name="nsURI" type="java.lang.String" lazy="false" column="`nsuri`" not-null="false"/> + <property name="nsPrefix" type="java.lang.String" lazy="false" column="`nsprefix`" not-null="false"/> + <list name="eClassifiers" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eclassifier_epackage_id`" not-null="false" unique="false"/> + </key> + <list-index column="`epackage_eclassifiers_idx`"/> + <one-to-many entity-name="EClassifier"/> + </list> + <list name="eSubpackages" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`epackage_esuperpackage_id`" not-null="false" unique="false"/> + </key> + <list-index column="`epackage_esubpackages_idx`"/> + <one-to-many entity-name="EPackage"/> + </list> + <many-to-one name="eSuperPackage" entity-name="EPackage" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`epackage_esuperpackage_id`"/> + </many-to-one> + </joined-subclass> + <joined-subclass entity-name="EParameter" abstract="false" lazy="false" extends="ETypedElement" table="`eparameter`"> + <key> + <column name="`etypedelement_id`"/> + </key> + <many-to-one name="eOperation" entity-name="EOperation" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eparameter_eoperation_id`"/> + </many-to-one> + </joined-subclass> + <joined-subclass entity-name="EReference" abstract="false" lazy="false" extends="EStructuralFeature" table="`ereference`"> + <key> + <column name="`estructuralfeature_id`"/> + </key> + <property name="containment" type="boolean" lazy="false" column="`containment`" not-null="false"/> + <property name="resolveProxies" type="boolean" lazy="false" column="`resolveproxies`" not-null="false"/> + <many-to-one name="eOpposite" entity-name="EReference" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> + <column not-null="false" unique="false" name="`ereference_eopposite_id`"/> + </many-to-one> + </joined-subclass> + <class entity-name="EStringToStringMapEntry" abstract="false" lazy="false" table="`estringtostringmapentry`"> + <id type="long" name="e_id" column="e_id"> + <generator class="native"/> + </id> + <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> + <property name="key" type="java.lang.String" lazy="false" column="`key`" not-null="false"/> + <property name="value" type="java.lang.String" lazy="false" column="`value`" not-null="false"/> + </class> +</hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml index 05dde151a..0e8f22669 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:17 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:01 CEST 2006 --> <hibernate-mapping> <class entity-name="Forum" abstract="false" lazy="false" discriminator-value="Forum" table="`forum`"> <id type="long" name="e_id" column="e_id"> @@ -12,14 +12,14 @@ <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> <list name="members" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`members_id`" not-null="false" unique="false"/> + <column name="`forum_members_id`" not-null="false" unique="false"/> </key> <list-index column="`forum_members_idx`"/> <one-to-many entity-name="Member"/> </list> <list name="topics" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`topics_id`" not-null="false" unique="false"/> + <column name="`forum_topics_id`" not-null="false" unique="false"/> </key> <list-index column="`forum_topics_idx`"/> <one-to-many entity-name="Topic"/> @@ -34,14 +34,14 @@ <property name="nickname" type="java.lang.String" lazy="false" column="`nickname`" not-null="true"/> <list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`post_author_id`" not-null="false" unique="false"/> </key> <list-index column="`member_posts_idx`"/> <one-to-many entity-name="Post"/> </list> <list name="created" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`creator_id`" not-null="false" unique="false"/> + <column name="`topic_creator_id`" not-null="false" unique="false"/> </key> <list-index column="`member_created_idx`"/> <one-to-many entity-name="Topic"/> @@ -54,11 +54,11 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="true"/> - <many-to-one name="author" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`post_author_id`"/> </many-to-one> - <many-to-one name="topic" entity-name="Topic" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`topic_id`"/> + <many-to-one name="topic" entity-name="Topic" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`post_topic_id`"/> </many-to-one> </class> <class entity-name="Topic" abstract="false" lazy="false" discriminator-value="Topic" table="`topic`"> @@ -73,12 +73,12 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.forum.TopicCategory</param> </type> </property> - <many-to-one name="creator" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`creator_id`"/> + <many-to-one name="creator" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`topic_creator_id`"/> </many-to-one> <list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`topic_id`" not-null="false" unique="false"/> + <column name="`post_topic_id`" not-null="false" unique="false"/> </key> <list-index column="`topic_posts_idx`"/> <one-to-many entity-name="Post"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml index 8c8150e51..386a57b36 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:55 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:39 CEST 2006 --> <hibernate-mapping> <class entity-name="Forum" abstract="false" lazy="false" table="`forum`"> <id type="long" name="e_id" column="e_id"> @@ -11,14 +11,14 @@ <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> <list name="members" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`members_id`" not-null="false" unique="false"/> + <column name="`forum_members_id`" not-null="false" unique="false"/> </key> <list-index column="`forum_members_idx`"/> <one-to-many entity-name="Member"/> </list> <list name="topics" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`topics_id`" not-null="false" unique="false"/> + <column name="`forum_topics_id`" not-null="false" unique="false"/> </key> <list-index column="`forum_topics_idx`"/> <one-to-many entity-name="Topic"/> @@ -32,14 +32,14 @@ <property name="nickname" type="java.lang.String" lazy="false" column="`nickname`" not-null="true"/> <list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`post_author_id`" not-null="false" unique="false"/> </key> <list-index column="`member_posts_idx`"/> <one-to-many entity-name="Post"/> </list> <list name="created" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`creator_id`" not-null="false" unique="false"/> + <column name="`topic_creator_id`" not-null="false" unique="false"/> </key> <list-index column="`member_created_idx`"/> <one-to-many entity-name="Topic"/> @@ -51,11 +51,11 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="true"/> - <many-to-one name="author" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`post_author_id`"/> </many-to-one> - <many-to-one name="topic" entity-name="Topic" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`topic_id`"/> + <many-to-one name="topic" entity-name="Topic" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`post_topic_id`"/> </many-to-one> </class> <class entity-name="Topic" abstract="false" lazy="false" table="`topic`"> @@ -69,12 +69,12 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.forum.TopicCategory</param> </type> </property> - <many-to-one name="creator" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`creator_id`"/> + <many-to-one name="creator" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`topic_creator_id`"/> </many-to-one> <list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`topic_id`" not-null="false" unique="false"/> + <column name="`post_topic_id`" not-null="false" unique="false"/> </key> <list-index column="`topic_posts_idx`"/> <one-to-many entity-name="Post"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml index 0536f0cad..299153b2d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:06 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:52 CEST 2006 --> <hibernate-mapping> <class entity-name="PType" abstract="false" lazy="false" discriminator-value="PType" table="`ptype`"> <id name="id" type="long" column="`id`"> @@ -10,12 +10,12 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> - <many-to-one name="base" entity-name="PType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`base_id`"/> + <many-to-one name="base" entity-name="PType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`ptype_base_id`"/> </many-to-one> <bag name="subTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`base_id`" not-null="false" unique="false"/> + <column name="`ptype_base_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="PType"/> </bag> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml index df186f4ee..5ee639dff 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:43 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:28 CEST 2006 --> <hibernate-mapping> <class entity-name="PType" abstract="false" lazy="false" table="`ptype`"> <id name="id" type="long" column="`id`"> @@ -9,12 +9,12 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> - <many-to-one name="base" entity-name="PType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`base_id`"/> + <many-to-one name="base" entity-name="PType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`ptype_base_id`"/> </many-to-one> <bag name="subTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`base_id`" not-null="false" unique="false"/> + <column name="`ptype_base_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="PType"/> </bag> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml index e8df07361..a3da1a03e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:57 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:43 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml index 93f284ed7..41d1c0d14 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:34 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:18 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml index fbccf1e0d..95826c0ae 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:07 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:52 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="myID" column="myID"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`au_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`bo_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`libra`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`wr_id`" not-null="false" unique="false"/> + <column name="`li_id`" not-null="false" unique="false"/> </key> <list-index column="`l_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`bo_id`" not-null="false" unique="false"/> + <column name="`li_id`" not-null="false" unique="false"/> </key> <list-index column="`l_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`au_id`" not-null="false" unique="false"/> + <column name="`bo_id`" not-null="false" unique="false"/> </key> <list-index column="`w_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml index 1d36db22b..921980e4d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:29 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="myID" column="myID"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`au_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`bo_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`libra`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`wr_id`" not-null="false" unique="false"/> + <column name="`li_id`" not-null="false" unique="false"/> </key> <list-index column="`l_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`bo_id`" not-null="false" unique="false"/> + <column name="`li_id`" not-null="false" unique="false"/> </key> <list-index column="`l_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`au_id`" not-null="false" unique="false"/> + <column name="`bo_id`" not-null="false" unique="false"/> </key> <list-index column="`w_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml index 61dc65e37..1a97cd35c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:55 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml index 5ad74d389..fabd853ba 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:47 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:32 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml index 7accc8c46..af965fee0 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:59 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:46 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml index 821135807..8ec3bf8c3 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:20 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml index 4e6ae7c90..d0ddeef7e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:54 CEST 2006 --> <hibernate-mapping> <class entity-name="library.Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="library.Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="library.Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="library.Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="library.Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="library.Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="library.Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml index 212be7ff4..9d07af39c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:46 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:31 CEST 2006 --> <hibernate-mapping> <class entity-name="library.Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="library.Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="library.Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="library.Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="library.Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="library.Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="library.Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml index 4e4cf59d9..823eec5c3 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:11 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:56 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml index 19db173ca..bddf8b8f7 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:47 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:33 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml index 121b4b3e0..716a12eac 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:08 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:53 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml index cfb9eaed9..206ff1b51 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:29 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml index e8df07361..981adef6f 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:57 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:42 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml index ef6390338..41d1c0d14 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:33 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:18 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/hibernate.hbm.xml index 4add3180a..44420d30e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:12 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:56 CEST 2006 --> <hibernate-mapping> <class entity-name="ActType" abstract="false" lazy="false" discriminator-value="ActType" table="`acttype`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="scene" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`scene_id`" not-null="false" unique="false"/> + <column name="`acttype_scene_id`" not-null="false" unique="false"/> </key> <list-index column="`acttype_scene_idx`"/> <one-to-many entity-name="SceneType"/> @@ -27,7 +27,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="p" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`p_id`" not-null="true" unique="false"/> + <column name="`fmtype_p_id`" not-null="true" unique="false"/> </key> <list-index column="`fmtype_p_idx`"/> <element type="java.lang.String"/> @@ -41,7 +41,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`personaetype_group_id`" not-null="false" unique="false"/> </key> <list-index column="`personaetype_group_idx`"/> <one-to-many entity-name="PersonaeType_group"/> @@ -57,7 +57,7 @@ <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="false"/> <property name="persona" type="java.lang.String" lazy="false" column="`persona`" not-null="false"/> <many-to-one name="personaGroup" entity-name="PersonaGroupType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`personagroup_id`"/> + <column not-null="false" unique="false" name="`personagrouptype_personagroup_id`"/> </many-to-one> </class> <class entity-name="PersonaGroupType" abstract="false" lazy="false" discriminator-value="PersonaGroupType" table="`personagrouptype`"> @@ -68,7 +68,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="persona" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`persona_id`" not-null="true" unique="false"/> + <column name="`personagrouptype_persona_id`" not-null="true" unique="false"/> </key> <list-index column="`personagrouptype_persona_idx`"/> <element type="java.lang.String"/> @@ -83,16 +83,16 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> <many-to-one name="fm" entity-name="FmType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`fm_id`"/> + <column not-null="true" unique="false" name="`fmtype_fm_id`"/> </many-to-one> <many-to-one name="personae" entity-name="PersonaeType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`personae_id`"/> + <column not-null="true" unique="false" name="`personaetype_personae_id`"/> </many-to-one> <property name="sceneDescription" type="java.lang.String" lazy="false" column="`scenedescription`" not-null="true"/> <property name="playSubTitle" type="java.lang.String" lazy="false" column="`playsubtitle`" not-null="true"/> <list name="act" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`act_id`" not-null="false" unique="false"/> + <column name="`playtype_act_id`" not-null="false" unique="false"/> </key> <list-index column="`playtype_act_idx`"/> <one-to-many entity-name="ActType"/> @@ -106,7 +106,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`scenetype_group_id`" not-null="false" unique="false"/> </key> <list-index column="`scenetype_group_idx`"/> <one-to-many entity-name="SceneType_group"/> @@ -123,7 +123,7 @@ <property name="fme_feature" type="java.lang.String"/> <property name="stageDirections" type="java.lang.String" lazy="false" column="`stagedirections`" not-null="false"/> <many-to-one name="speech" entity-name="SpeechType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`speech_id`"/> + <column not-null="false" unique="false" name="`speechtype_speech_id`"/> </many-to-one> </class> <class entity-name="SpeechType" abstract="false" lazy="false" discriminator-value="SpeechType" table="`speechtype`"> @@ -134,7 +134,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`speechtype_group_id`" not-null="false" unique="false"/> </key> <list-index column="`speechtype_group_idx`"/> <one-to-many entity-name="SpeechType_group"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/hibernate.hbm.xml index 67037f666..6b376bc3a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:33 CEST 2006 --> <hibernate-mapping> <class entity-name="ActType" abstract="false" lazy="false" table="`acttype`"> <id type="long" name="e_id" column="e_id"> @@ -10,7 +10,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="scene" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`scene_id`" not-null="false" unique="false"/> + <column name="`acttype_scene_id`" not-null="false" unique="false"/> </key> <list-index column="`acttype_scene_idx`"/> <one-to-many entity-name="SceneType"/> @@ -25,7 +25,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="p" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`p_id`" not-null="true" unique="false"/> + <column name="`fmtype_p_id`" not-null="true" unique="false"/> </key> <list-index column="`fmtype_p_idx`"/> <element type="java.lang.String"/> @@ -38,7 +38,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`personaetype_group_id`" not-null="false" unique="false"/> </key> <list-index column="`personaetype_group_idx`"/> <one-to-many entity-name="PersonaeType_group"/> @@ -54,7 +54,7 @@ <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="false"/> <property name="persona" type="java.lang.String" lazy="false" column="`persona`" not-null="false"/> <many-to-one name="personaGroup" entity-name="PersonaGroupType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`personagroup_id`"/> + <column not-null="false" unique="false" name="`personagrouptype_personagroup_id`"/> </many-to-one> </class> <class entity-name="PersonaGroupType" abstract="false" lazy="false" table="`personagrouptype`"> @@ -64,7 +64,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="persona" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`persona_id`" not-null="true" unique="false"/> + <column name="`personagrouptype_persona_id`" not-null="true" unique="false"/> </key> <list-index column="`personagrouptype_persona_idx`"/> <element type="java.lang.String"/> @@ -78,16 +78,16 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> <many-to-one name="fm" entity-name="FmType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`fm_id`"/> + <column not-null="true" unique="false" name="`fmtype_fm_id`"/> </many-to-one> <many-to-one name="personae" entity-name="PersonaeType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`personae_id`"/> + <column not-null="true" unique="false" name="`personaetype_personae_id`"/> </many-to-one> <property name="sceneDescription" type="java.lang.String" lazy="false" column="`scenedescription`" not-null="true"/> <property name="playSubTitle" type="java.lang.String" lazy="false" column="`playsubtitle`" not-null="true"/> <list name="act" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`act_id`" not-null="false" unique="false"/> + <column name="`playtype_act_id`" not-null="false" unique="false"/> </key> <list-index column="`playtype_act_idx`"/> <one-to-many entity-name="ActType"/> @@ -100,7 +100,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`scenetype_group_id`" not-null="false" unique="false"/> </key> <list-index column="`scenetype_group_idx`"/> <one-to-many entity-name="SceneType_group"/> @@ -117,7 +117,7 @@ <property name="fme_feature" type="java.lang.String"/> <property name="stageDirections" type="java.lang.String" lazy="false" column="`stagedirections`" not-null="false"/> <many-to-one name="speech" entity-name="SpeechType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`speech_id`"/> + <column not-null="false" unique="false" name="`speechtype_speech_id`"/> </many-to-one> </class> <class entity-name="SpeechType" abstract="false" lazy="false" table="`speechtype`"> @@ -127,7 +127,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`speechtype_group_id`" not-null="false" unique="false"/> </key> <list-index column="`speechtype_group_idx`"/> <one-to-many entity-name="SpeechType_group"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml index b3609be87..f9ccbf1b5 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:15 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:59 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`"> <id type="long" name="e_id" column="e_id"> @@ -23,15 +23,15 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="shipTo" entity-name="USAddress" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`shipto_id`"/> + <column not-null="false" unique="false" name="`usaddress_shipto_id`"/> </many-to-one> <many-to-one name="billTo" entity-name="USAddress" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`billto_id`"/> + <column not-null="true" unique="false" name="`usaddress_billto_id`"/> </many-to-one> <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="false"/> <list name="items" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`items_id`" not-null="false" unique="false"/> + <column name="`purchaseorder_items_id`" not-null="false" unique="false"/> </key> <list-index column="`purchaseorder_items_idx`"/> <one-to-many entity-name="Item"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml index 36b86df21..ae91e9712 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:52 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:36 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" table="`item`"> <id type="long" name="e_id" column="e_id"> @@ -21,15 +21,15 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="shipTo" entity-name="USAddress" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`shipto_id`"/> + <column not-null="false" unique="false" name="`usaddress_shipto_id`"/> </many-to-one> <many-to-one name="billTo" entity-name="USAddress" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`billto_id`"/> + <column not-null="true" unique="false" name="`usaddress_billto_id`"/> </many-to-one> <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="false"/> <list name="items" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`items_id`" not-null="false" unique="false"/> + <column name="`purchaseorder_items_id`" not-null="false" unique="false"/> </key> <list-index column="`purchaseorder_items_idx`"/> <one-to-many entity-name="Item"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml index 450413f8e..6d5a09d2a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:16 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:00 CEST 2006 --> <hibernate-mapping> <class entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`"> <id name="id" type="java.lang.String" column="`id`"/> @@ -9,7 +9,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> <many-to-one name="supplier" entity-name="SupplierType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`supplier_id`"/> + <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> <property name="createdOn" type="serializable" lazy="false" column="`createdon`" not-null="true"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml index 6df4f44dd..2b5c9c37d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:52 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:37 CEST 2006 --> <hibernate-mapping> <class entity-name="ProductType" abstract="false" lazy="false" table="`producttype`"> <id name="id" type="java.lang.String" column="`id`"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> <many-to-one name="supplier" entity-name="SupplierType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`supplier_id`"/> + <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> <property name="createdOn" type="serializable" lazy="false" column="`createdon`" not-null="true"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml index aa18e18ab..b1f1c1149 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:03 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:48 CEST 2006 --> <hibernate-mapping> <class entity-name="AuthorsType" abstract="false" lazy="false" discriminator-value="AuthorsType" table="`authorstype`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="authorName" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`authorname_id`" not-null="true" unique="false"/> + <column name="`authorstype_authorname_id`" not-null="true" unique="false"/> </key> <list-index column="`authorstype_authorname_idx`"/> <element type="java.lang.String"/> @@ -25,7 +25,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="book" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`book_id`" not-null="false" unique="false"/> + <column name="`bookstype_book_id`" not-null="false" unique="false"/> </key> <list-index column="`bookstype_book_idx`"/> <one-to-many entity-name="BookType"/> @@ -41,11 +41,11 @@ <property name="iSBN" type="long" lazy="false" column="`isbn`" not-null="false"/> <property name="price" type="java.lang.String" lazy="false" column="`price`" not-null="true"/> <many-to-one name="authors" entity-name="AuthorsType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`authors_id`"/> + <column not-null="true" unique="false" name="`authorstype_authors_id`"/> </many-to-one> <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> <many-to-one name="promotion" entity-name="PromotionType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`promotion_id`"/> + <column not-null="true" unique="false" name="`promotiontype_promotion_id`"/> </many-to-one> <property name="publicationDate" type="serializable" lazy="false" column="`publicationdate`" not-null="true"/> <property name="bookCategory" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`bookcategory`" not-null="false" unique="false"> @@ -62,7 +62,7 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="books" entity-name="BooksType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`books_id`"/> + <column not-null="true" unique="false" name="`bookstype_books_id`"/> </many-to-one> </class> <class entity-name="PromotionType" abstract="false" lazy="false" discriminator-value="PromotionType" table="`promotiontype`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml index d73fb6715..5f25e6fac 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:40 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:25 CEST 2006 --> <hibernate-mapping> <class entity-name="AuthorsType" abstract="false" lazy="false" table="`authorstype`"> <id type="long" name="e_id" column="e_id"> @@ -10,7 +10,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="authorName" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`authorname_id`" not-null="true" unique="false"/> + <column name="`authorstype_authorname_id`" not-null="true" unique="false"/> </key> <list-index column="`authorstype_authorname_idx`"/> <element type="java.lang.String"/> @@ -23,7 +23,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="book" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`book_id`" not-null="false" unique="false"/> + <column name="`bookstype_book_id`" not-null="false" unique="false"/> </key> <list-index column="`bookstype_book_idx`"/> <one-to-many entity-name="BookType"/> @@ -38,11 +38,11 @@ <property name="iSBN" type="long" lazy="false" column="`isbn`" not-null="false"/> <property name="price" type="java.lang.String" lazy="false" column="`price`" not-null="true"/> <many-to-one name="authors" entity-name="AuthorsType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`authors_id`"/> + <column not-null="true" unique="false" name="`authorstype_authors_id`"/> </many-to-one> <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> <many-to-one name="promotion" entity-name="PromotionType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`promotion_id`"/> + <column not-null="true" unique="false" name="`promotiontype_promotion_id`"/> </many-to-one> <property name="publicationDate" type="serializable" lazy="false" column="`publicationdate`" not-null="true"/> <property name="bookCategory" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`bookcategory`" not-null="false" unique="false"> @@ -58,7 +58,7 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="books" entity-name="BooksType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`books_id`"/> + <column not-null="true" unique="false" name="`bookstype_books_id`"/> </many-to-one> </class> <class entity-name="PromotionType" abstract="false" lazy="false" table="`promotiontype`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml index e60f3b110..e0f1d7f71 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:16 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:00 CEST 2006 --> <hibernate-mapping> <class entity-name="WorkflowElement" abstract="true" lazy="false" discriminator-value="WorkflowElement" table="`workflowelement`"> <id type="long" name="e_id" column="e_id"> @@ -19,40 +19,40 @@ <subclass entity-name="Workflow" abstract="false" lazy="false" extends="WorkflowElement" discriminator-value="Workflow"> <list name="nodes" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`workflow_id`" not-null="false" unique="false"/> + <column name="`workflownode_workflow_id`" not-null="false" unique="false"/> </key> <list-index column="`workflow_nodes_idx`"/> <one-to-many entity-name="WorkflowNode"/> </list> <list name="edges" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`workflow_id`" not-null="false" unique="false"/> + <column name="`edge_workflow_id`" not-null="false" unique="false"/> </key> <list-index column="`workflow_edges_idx`"/> <one-to-many entity-name="Edge"/> </list> <list name="comments" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`workflow_id`" not-null="false" unique="false"/> + <column name="`comment_workflow_id`" not-null="false" unique="false"/> </key> <list-index column="`workflow_comments_idx`"/> <one-to-many entity-name="Comment"/> </list> </subclass> <subclass entity-name="WorkflowNode" abstract="true" lazy="false" extends="WorkflowElement" discriminator-value="WorkflowNode"> - <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`workflow_id`"/> + <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`workflownode_workflow_id`"/> </many-to-one> <list name="outputs" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`node_id`" not-null="false" unique="false"/> + <column name="`outputport_node_id`" not-null="false" unique="false"/> </key> <list-index column="`workflownode_outputs_idx`"/> <one-to-many entity-name="OutputPort"/> </list> <list name="inputs" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`node_id`" not-null="false" unique="false"/> + <column name="`inputport_node_id`" not-null="false" unique="false"/> </key> <list-index column="`workflownode_inputs_idx`"/> <one-to-many entity-name="InputPort"/> @@ -61,36 +61,36 @@ <property name="isFinish" type="boolean" lazy="false" column="`isfinish`" not-null="false"/> </subclass> <subclass entity-name="Edge" abstract="false" lazy="false" extends="WorkflowElement" discriminator-value="Edge"> - <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`workflow_id`"/> + <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`edge_workflow_id`"/> </many-to-one> - <many-to-one name="target" entity-name="InputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`target_id`"/> + <many-to-one name="target" entity-name="InputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`edge_target_id`"/> </many-to-one> - <many-to-one name="source" entity-name="OutputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`source_id`"/> + <many-to-one name="source" entity-name="OutputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`edge_source_id`"/> </many-to-one> </subclass> <subclass entity-name="Port" abstract="true" lazy="false" extends="WorkflowElement" discriminator-value="Port"/> <subclass entity-name="InputPort" abstract="false" lazy="false" extends="Port" discriminator-value="InputPort"> - <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`node_id`"/> + <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`inputport_node_id`"/> </many-to-one> <list name="edges" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`target_id`" not-null="false" unique="false"/> + <column name="`edge_target_id`" not-null="false" unique="false"/> </key> <list-index column="`inputport_edges_idx`"/> <one-to-many entity-name="Edge"/> </list> </subclass> <subclass entity-name="OutputPort" abstract="false" lazy="false" extends="Port" discriminator-value="OutputPort"> - <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`node_id`"/> + <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`outputport_node_id`"/> </many-to-one> <list name="edges" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`source_id`" not-null="false" unique="false"/> + <column name="`edge_source_id`" not-null="false" unique="false"/> </key> <list-index column="`outputport_edges_idx`"/> <one-to-many entity-name="Edge"/> @@ -99,7 +99,7 @@ <subclass entity-name="Fault" abstract="false" lazy="false" extends="OutputPort" discriminator-value="Fault"/> <subclass entity-name="CompoundTask" abstract="false" lazy="false" extends="WorkflowNode" discriminator-value="CompoundTask"> <many-to-one name="subworkflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`subworkflow_id`"/> + <column not-null="false" unique="false" name="`workflow_subworkflow_id`"/> </many-to-one> </subclass> <subclass entity-name="TransformationTask" abstract="false" lazy="false" extends="WorkflowNode" discriminator-value="TransformationTask"> @@ -113,8 +113,8 @@ <property name="condition" type="java.lang.String" lazy="false" column="`condition`" not-null="false"/> </subclass> <subclass entity-name="Comment" abstract="false" lazy="false" extends="WorkflowElement" discriminator-value="Comment"> - <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`workflow_id`"/> + <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`comment_workflow_id`"/> </many-to-one> </subclass> <subclass entity-name="Task" abstract="false" lazy="false" extends="WorkflowNode" discriminator-value="Task"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml index 9524228ca..aa53252cb 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:18:52 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:37 CEST 2006 --> <hibernate-mapping> <class entity-name="WorkflowElement" abstract="true" lazy="false" table="`workflowelement`"> <id type="long" name="e_id" column="e_id"> @@ -21,21 +21,21 @@ </key> <list name="nodes" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`workflow_id`" not-null="false" unique="false"/> + <column name="`workflownode_workflow_id`" not-null="false" unique="false"/> </key> <list-index column="`workflow_nodes_idx`"/> <one-to-many entity-name="WorkflowNode"/> </list> <list name="edges" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`workflow_id`" not-null="false" unique="false"/> + <column name="`edge_workflow_id`" not-null="false" unique="false"/> </key> <list-index column="`workflow_edges_idx`"/> <one-to-many entity-name="Edge"/> </list> <list name="comments" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`workflow_id`" not-null="false" unique="false"/> + <column name="`comment_workflow_id`" not-null="false" unique="false"/> </key> <list-index column="`workflow_comments_idx`"/> <one-to-many entity-name="Comment"/> @@ -45,19 +45,19 @@ <key> <column name="`workflowelement_id`"/> </key> - <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`workflow_id`"/> + <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`workflownode_workflow_id`"/> </many-to-one> <list name="outputs" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`node_id`" not-null="false" unique="false"/> + <column name="`outputport_node_id`" not-null="false" unique="false"/> </key> <list-index column="`workflownode_outputs_idx`"/> <one-to-many entity-name="OutputPort"/> </list> <list name="inputs" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`node_id`" not-null="false" unique="false"/> + <column name="`inputport_node_id`" not-null="false" unique="false"/> </key> <list-index column="`workflownode_inputs_idx`"/> <one-to-many entity-name="InputPort"/> @@ -69,14 +69,14 @@ <key> <column name="`workflowelement_id`"/> </key> - <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`workflow_id`"/> + <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`edge_workflow_id`"/> </many-to-one> - <many-to-one name="target" entity-name="InputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`target_id`"/> + <many-to-one name="target" entity-name="InputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`edge_target_id`"/> </many-to-one> - <many-to-one name="source" entity-name="OutputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`source_id`"/> + <many-to-one name="source" entity-name="OutputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`edge_source_id`"/> </many-to-one> </joined-subclass> <joined-subclass entity-name="Port" abstract="true" lazy="false" extends="WorkflowElement" table="`port`"> @@ -88,12 +88,12 @@ <key> <column name="`port_id`"/> </key> - <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`node_id`"/> + <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`inputport_node_id`"/> </many-to-one> <list name="edges" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`target_id`" not-null="false" unique="false"/> + <column name="`edge_target_id`" not-null="false" unique="false"/> </key> <list-index column="`inputport_edges_idx`"/> <one-to-many entity-name="Edge"/> @@ -103,12 +103,12 @@ <key> <column name="`port_id`"/> </key> - <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`node_id`"/> + <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`outputport_node_id`"/> </many-to-one> <list name="edges" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`source_id`" not-null="false" unique="false"/> + <column name="`edge_source_id`" not-null="false" unique="false"/> </key> <list-index column="`outputport_edges_idx`"/> <one-to-many entity-name="Edge"/> @@ -124,7 +124,7 @@ <column name="`workflownode_id`"/> </key> <many-to-one name="subworkflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`subworkflow_id`"/> + <column not-null="true" unique="false" name="`workflow_subworkflow_id`"/> </many-to-one> </joined-subclass> <joined-subclass entity-name="TransformationTask" abstract="false" lazy="false" extends="WorkflowNode" table="`transformationtask`"> @@ -154,8 +154,8 @@ <key> <column name="`workflowelement_id`"/> </key> - <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`workflow_id`"/> + <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`comment_workflow_id`"/> </many-to-one> </joined-subclass> <joined-subclass entity-name="Task" abstract="false" lazy="false" extends="WorkflowNode" table="`task`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/hibernate.hbm.xml index 2f726bc2c..ac056913d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:29 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:17 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -12,21 +12,21 @@ <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`book_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`book_writers_idx`"/> <one-to-many entity-name="StringToWriterMapEntry"/> </list> <list name="keyWords" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`keywords_id`" not-null="false" unique="false"/> + <column name="`book_keywords_id`" not-null="false" unique="false"/> </key> <list-index column="`book_keywords_idx`"/> <one-to-many entity-name="StringToStringMapEntry"/> </list> <list name="cityByWriter" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`citybywriter_id`" not-null="false" unique="false"/> + <column name="`book_citybywriter_id`" not-null="false" unique="false"/> </key> <list-index column="`book_citybywriter_idx`"/> <one-to-many entity-name="WriterToStringMapEntry"/> @@ -49,7 +49,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="key" type="java.lang.String" lazy="false" column="`key`" not-null="false"/> <many-to-one name="value" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`value_id`"/> + <column not-null="false" unique="false" name="`writer_value_id`"/> </many-to-one> </class> <class entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`"> @@ -67,7 +67,7 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="key" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`key_id`"/> + <column not-null="false" unique="false" name="`writer_key_id`"/> </many-to-one> <property name="value" type="java.lang.String" lazy="false" column="`value`" not-null="false"/> </class> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_s_o/hibernate.hbm.xml index 5b84a3f55..c5d049527 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:18 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:02 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -11,21 +11,21 @@ <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`book_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`book_writers_idx`"/> <one-to-many entity-name="StringToWriterMapEntry"/> </list> <list name="keyWords" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`keywords_id`" not-null="false" unique="false"/> + <column name="`book_keywords_id`" not-null="false" unique="false"/> </key> <list-index column="`book_keywords_idx`"/> <one-to-many entity-name="StringToStringMapEntry"/> </list> <list name="cityByWriter" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`citybywriter_id`" not-null="false" unique="false"/> + <column name="`book_citybywriter_id`" not-null="false" unique="false"/> </key> <list-index column="`book_citybywriter_idx`"/> <one-to-many entity-name="WriterToStringMapEntry"/> @@ -46,7 +46,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="key" type="java.lang.String" lazy="false" column="`key`" not-null="false"/> <many-to-one name="value" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`value_id`"/> + <column not-null="false" unique="false" name="`writer_value_id`"/> </many-to-one> </class> <class entity-name="Writer" abstract="false" lazy="false" table="`writer`"> @@ -62,7 +62,7 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="key" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`key_id`"/> + <column not-null="false" unique="false" name="`writer_key_id`"/> </many-to-one> <property name="value" type="java.lang.String" lazy="false" column="`value`" not-null="false"/> </class> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml index b039fab8b..f3c5e998b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:34 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:20 CEST 2006 --> <hibernate-mapping> <class entity-name="Element" abstract="false" lazy="false" discriminator-value="Element" table="`element`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="nameMap" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`namemap_id`" not-null="false" unique="false"/> + <column name="`element_namemap_id`" not-null="false" unique="false"/> </key> <list-index column="`element_namemap_idx`"/> <one-to-many entity-name="Element_nameMap"/> @@ -25,7 +25,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="names" entity-name="NameList" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`names_id`"/> + <column not-null="false" unique="false" name="`namelist_names_id`"/> </many-to-one> </class> <class entity-name="Feature" abstract="false" lazy="false" discriminator-value="Feature" table="`feature`"> @@ -36,7 +36,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="aMap" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`amap_id`" not-null="false" unique="false"/> + <column name="`feature_amap_id`" not-null="false" unique="false"/> </key> <list-index column="`feature_amap_idx`"/> <one-to-many entity-name="Feature_aMap"/> @@ -60,7 +60,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`mixed_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`mixed_mixed_idx`"/> <one-to-many entity-name="Mixed_mixed"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml index 24acb40e4..dd242b0f2 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:21 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:05 CEST 2006 --> <hibernate-mapping> <class entity-name="Element" abstract="false" lazy="false" table="`element`"> <id type="long" name="e_id" column="e_id"> @@ -10,7 +10,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="nameMap" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`namemap_id`" not-null="false" unique="false"/> + <column name="`element_namemap_id`" not-null="false" unique="false"/> </key> <list-index column="`element_namemap_idx`"/> <one-to-many entity-name="Element_nameMap"/> @@ -24,7 +24,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="names" entity-name="NameList" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`names_id`"/> + <column not-null="false" unique="false" name="`namelist_names_id`"/> </many-to-one> </class> <class entity-name="Feature" abstract="false" lazy="false" table="`feature`"> @@ -34,7 +34,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="aMap" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`amap_id`" not-null="false" unique="false"/> + <column name="`feature_amap_id`" not-null="false" unique="false"/> </key> <list-index column="`feature_amap_idx`"/> <one-to-many entity-name="Feature_aMap"/> @@ -57,7 +57,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`mixed_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`mixed_mixed_idx`"/> <one-to-many entity-name="Mixed_mixed"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml index 5237863f1..f79af8611 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:37 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:22 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -21,11 +21,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <many-to-one name="firstAddress" entity-name="FirstAddressHolder" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`firstaddress_id`"/> + <column not-null="true" unique="false" name="`firstaddressholder_firstaddress_id`"/> </many-to-one> <list name="secondAddress" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`secondaddress_id`" not-null="false" unique="false"/> + <column name="`addresslist_secondaddress_id`" not-null="false" unique="false"/> </key> <list-index column="`addresslist_secondaddress_idx`"/> <one-to-many entity-name="Address"/> @@ -46,7 +46,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="value" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`value_id`" not-null="false" unique="false"/> + <column name="`firstaddressholder_value_id`" not-null="false" unique="false"/> </key> <list-index column="`firstaddressholder_value_idx`"/> <one-to-many entity-name="Address"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml index 7be3ed106..b69bea56b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:24 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:08 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -19,11 +19,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <many-to-one name="firstAddress" entity-name="FirstAddressHolder" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`firstaddress_id`"/> + <column not-null="true" unique="false" name="`firstaddressholder_firstaddress_id`"/> </many-to-one> <list name="secondAddress" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`secondaddress_id`" not-null="false" unique="false"/> + <column name="`addresslist_secondaddress_id`" not-null="false" unique="false"/> </key> <list-index column="`addresslist_secondaddress_idx`"/> <one-to-many entity-name="Address"/> @@ -49,7 +49,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="value" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`value_id`" not-null="false" unique="false"/> + <column name="`firstaddressholder_value_id`" not-null="false" unique="false"/> </key> <list-index column="`firstaddressholder_value_idx`"/> <one-to-many entity-name="Address"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml index ab940d71f..6dd1d7a03 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:37 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:23 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`address_group_id`" not-null="false" unique="false"/> </key> <list-index column="`address_group_idx`"/> <one-to-many entity-name="Address_group"/> @@ -35,10 +35,10 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="groupName" type="java.lang.String" lazy="false" column="`groupname`" not-null="true"/> <many-to-one name="shipTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`shipto_id`"/> + <column not-null="false" unique="false" name="`address_shipto_id`"/> </many-to-one> <many-to-one name="billTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`billto_id`"/> + <column not-null="false" unique="false" name="`address_billto_id`"/> </many-to-one> <property name="simpleAddress" type="java.lang.String" lazy="false" column="`simpleaddress`" not-null="false"/> </class> @@ -51,7 +51,7 @@ <property name="groupName" type="java.lang.String" lazy="false" column="`groupname`" not-null="true"/> <list name="addrs" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`addrs_id`" not-null="false" unique="false"/> + <column name="`addresslist_addrs_id`" not-null="false" unique="false"/> </key> <list-index column="`addresslist_addrs_idx`"/> <one-to-many entity-name="AddressList_addrs"/> @@ -65,10 +65,10 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="shipTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`shipto_id`"/> + <column not-null="false" unique="false" name="`address_shipto_id`"/> </many-to-one> <many-to-one name="billTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`billto_id`"/> + <column not-null="false" unique="false" name="`address_billto_id`"/> </many-to-one> </class> <class entity-name="SimpleAllMapType" abstract="false" lazy="false" discriminator-value="SimpleAllMapType" table="`simpleallmaptype`"> @@ -79,7 +79,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="allMap" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`allmap_id`" not-null="false" unique="false"/> + <column name="`simpleallmaptype_allmap_id`" not-null="false" unique="false"/> </key> <list-index column="`simpleallmaptype_allmap_idx`"/> <one-to-many entity-name="SimpleAllMapType_allMap"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml index 4ba5aec01..51d188664 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:25 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:12 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -10,7 +10,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`address_group_id`" not-null="false" unique="false"/> </key> <list-index column="`address_group_idx`"/> <one-to-many entity-name="Address_group"/> @@ -33,10 +33,10 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="groupName" type="java.lang.String" lazy="false" column="`groupname`" not-null="true"/> <many-to-one name="shipTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`shipto_id`"/> + <column not-null="false" unique="false" name="`address_shipto_id`"/> </many-to-one> <many-to-one name="billTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`billto_id`"/> + <column not-null="false" unique="false" name="`address_billto_id`"/> </many-to-one> <property name="simpleAddress" type="java.lang.String" lazy="false" column="`simpleaddress`" not-null="false"/> </class> @@ -48,7 +48,7 @@ <property name="groupName" type="java.lang.String" lazy="false" column="`groupname`" not-null="true"/> <list name="addrs" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`addrs_id`" not-null="false" unique="false"/> + <column name="`addresslist_addrs_id`" not-null="false" unique="false"/> </key> <list-index column="`addresslist_addrs_idx`"/> <one-to-many entity-name="AddressList_addrs"/> @@ -62,10 +62,10 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="shipTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`shipto_id`"/> + <column not-null="false" unique="false" name="`address_shipto_id`"/> </many-to-one> <many-to-one name="billTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`billto_id`"/> + <column not-null="false" unique="false" name="`address_billto_id`"/> </many-to-one> </class> <class entity-name="SimpleAllMapType" abstract="false" lazy="false" table="`simpleallmaptype`"> @@ -75,7 +75,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="allMap" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`allmap_id`" not-null="false" unique="false"/> + <column name="`simpleallmaptype_allmap_id`" not-null="false" unique="false"/> </key> <list-index column="`simpleallmaptype_allmap_idx`"/> <one-to-many entity-name="SimpleAllMapType_allMap"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml index 3b47dee84..3f53f84d6 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:34 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:19 CEST 2006 --> <hibernate-mapping> <class entity-name="statesByCountry" abstract="false" lazy="false" discriminator-value="statesByCountry" table="`statesbycountry`"> <id type="long" name="e_id" column="e_id"> @@ -13,14 +13,14 @@ <property name="index" type="int" lazy="false" column="`index`" not-null="false"/> <list name="allStates" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`allstates_id`" not-null="true" unique="false"/> + <column name="`statesbycountry_allstates_id`" not-null="true" unique="false"/> </key> <list-index column="`statesbycountry_allstates_idx`"/> <element type="java.lang.String"/> </list> <list name="sixImportantStates" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`siximportantstates_id`" not-null="true" unique="false"/> + <column name="`statesbycountry_siximportantstates_id`" not-null="true" unique="false"/> </key> <list-index column="`statesbycountry_siximportantstates_idx`"/> <element type="java.lang.String"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml index 932d50b3e..0b4251c22 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:21 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:04 CEST 2006 --> <hibernate-mapping> <class entity-name="statesByCountry" abstract="false" lazy="false" table="`statesbycountry`"> <id type="long" name="e_id" column="e_id"> @@ -12,14 +12,14 @@ <property name="index" type="int" lazy="false" column="`index`" not-null="false"/> <list name="allStates" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`allstates_id`" not-null="true" unique="false"/> + <column name="`statesbycountry_allstates_id`" not-null="true" unique="false"/> </key> <list-index column="`statesbycountry_allstates_idx`"/> <element type="java.lang.String"/> </list> <list name="sixImportantStates" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`siximportantstates_id`" not-null="true" unique="false"/> + <column name="`statesbycountry_siximportantstates_id`" not-null="true" unique="false"/> </key> <list-index column="`statesbycountry_siximportantstates_idx`"/> <element type="java.lang.String"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/hibernate.hbm.xml index 71c5ad841..738de630f 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:35 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:21 CEST 2006 --> <hibernate-mapping> <class entity-name="LetterBodyType" abstract="false" lazy="false" discriminator-value="LetterBodyType" table="`letterbodytype`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`letterbodytype_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`letterbodytype_mixed_idx`"/> <one-to-many entity-name="LetterBodyType_mixed"/> @@ -25,7 +25,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="salutation" entity-name="SalutationType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`salutation_id`"/> + <column not-null="false" unique="false" name="`salutationtype_salutation_id`"/> </many-to-one> <property name="quantity" type="java.math.BigInteger" lazy="false" column="`quantity`" not-null="false"/> <property name="productName" type="java.lang.String" lazy="false" column="`productname`" not-null="false"/> @@ -42,7 +42,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`salutationtype_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`salutationtype_mixed_idx`"/> <one-to-many entity-name="SalutationType_mixed"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml index 495c25f17..1a776deb4 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:22 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:06 CEST 2006 --> <hibernate-mapping> <class entity-name="LetterBodyType" abstract="false" lazy="false" table="`letterbodytype`"> <id type="long" name="e_id" column="e_id"> @@ -10,7 +10,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`letterbodytype_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`letterbodytype_mixed_idx`"/> <one-to-many entity-name="LetterBodyType_mixed"/> @@ -24,7 +24,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="salutation" entity-name="SalutationType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`salutation_id`"/> + <column not-null="false" unique="false" name="`salutationtype_salutation_id`"/> </many-to-one> <property name="quantity" type="java.math.BigInteger" lazy="false" column="`quantity`" not-null="false"/> <property name="productName" type="java.lang.String" lazy="false" column="`productname`" not-null="false"/> @@ -40,7 +40,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`salutationtype_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`salutationtype_mixed_idx`"/> <one-to-many entity-name="SalutationType_mixed"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml index 9e361ec47..cef0ca0fa 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:39 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:24 CEST 2006 --> <hibernate-mapping> <class entity-name="A" abstract="false" lazy="false" discriminator-value="A" table="`a`"> <id type="long" name="e_id" column="e_id"> @@ -12,7 +12,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`a_group_id`" not-null="false" unique="false"/> </key> <list-index column="`a_group_idx`"/> <one-to-many entity-name="A_group"/> @@ -27,7 +27,7 @@ <property name="fme_feature" type="java.lang.String"/> <property name="b" type="java.lang.String" lazy="false" column="`b`" not-null="false"/> <many-to-one name="c" entity-name="CType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`c_id`"/> + <column not-null="false" unique="false" name="`ctype_c_id`"/> </many-to-one> </class> <class entity-name="CType" abstract="false" lazy="false" discriminator-value="CType" table="`ctype`"> @@ -47,7 +47,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`element_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`element_mixed_idx`"/> <one-to-many entity-name="Element_mixed"/> @@ -63,16 +63,16 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="true" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`true_id`" not-null="false" unique="false"/> + <column name="`element_true_id`" not-null="false" unique="false"/> </key> <list-index column="`element_true_idx`"/> <one-to-many entity-name="Element_true"/> </list> <many-to-one name="c" entity-name="CType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`c_id`"/> + <column not-null="false" unique="false" name="`ctype_c_id`"/> </many-to-one> <many-to-one name="recursive" entity-name="Element" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`recursive_id`"/> + <column not-null="false" unique="false" name="`element_recursive_id`"/> </many-to-one> <property name="fme_mixed_text" type="java.lang.String"/> <property name="fme_mixed_cdata" type="java.lang.String"/> @@ -86,7 +86,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="c" entity-name="CType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`c_id`"/> + <column not-null="false" unique="false" name="`ctype_c_id`"/> </many-to-one> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml index e2841597c..bb6b9f13c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:26 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:13 CEST 2006 --> <hibernate-mapping> <class entity-name="A" abstract="false" lazy="false" table="`a`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`a_group_id`" not-null="false" unique="false"/> </key> <list-index column="`a_group_idx`"/> <one-to-many entity-name="A_group"/> @@ -26,7 +26,7 @@ <property name="fme_feature" type="java.lang.String"/> <property name="b" type="java.lang.String" lazy="false" column="`b`" not-null="false"/> <many-to-one name="c" entity-name="CType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`c_id`"/> + <column not-null="false" unique="false" name="`ctype_c_id`"/> </many-to-one> </class> <class entity-name="CType" abstract="false" lazy="false" table="`ctype`"> @@ -44,7 +44,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`element_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`element_mixed_idx`"/> <one-to-many entity-name="Element_mixed"/> @@ -60,16 +60,16 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="true" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`true_id`" not-null="false" unique="false"/> + <column name="`element_true_id`" not-null="false" unique="false"/> </key> <list-index column="`element_true_idx`"/> <one-to-many entity-name="Element_true"/> </list> <many-to-one name="c" entity-name="CType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`c_id`"/> + <column not-null="false" unique="false" name="`ctype_c_id`"/> </many-to-one> <many-to-one name="recursive" entity-name="Element" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`recursive_id`"/> + <column not-null="false" unique="false" name="`element_recursive_id`"/> </many-to-one> <property name="fme_mixed_text" type="java.lang.String"/> <property name="fme_mixed_cdata" type="java.lang.String"/> @@ -83,7 +83,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="c" entity-name="CType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`c_id`"/> + <column not-null="false" unique="false" name="`ctype_c_id`"/> </many-to-one> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml index 545235b1b..4dd95d253 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:22 CEST 2006 --> <hibernate-mapping> <class entity-name="XMLDeviant" abstract="false" lazy="false" discriminator-value="XMLDeviant" table="`xmldeviant`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml index a51fc8f1f..daef74e03 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:07 CEST 2006 --> <hibernate-mapping> <class entity-name="XMLDeviant" abstract="false" lazy="false" table="`xmldeviant`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml index 2fd4176ff..2067d4b9c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:17 CEST 2006 --> <hibernate-mapping> <class entity-name="SimpleList" abstract="false" lazy="false" discriminator-value="SimpleList" table="`simplelist`"> <id type="long" name="e_id" column="e_id"> @@ -12,35 +12,35 @@ <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> <list name="boo" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`boo_id`" not-null="true" unique="false"/> + <column name="`simplelist_boo_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_boo_idx`"/> <element type="boolean"/> </list> <list name="byt" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`byt_id`" not-null="true" unique="false"/> + <column name="`simplelist_byt_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_byt_idx`"/> <element type="java.lang.Byte"/> </list> <list name="doubl" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`doubl_id`" not-null="true" unique="false"/> + <column name="`simplelist_doubl_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_doubl_idx`"/> <element type="java.lang.Double"/> </list> <list name="floa" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`floa_id`" not-null="true" unique="false"/> + <column name="`simplelist_floa_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_floa_idx`"/> <element type="java.lang.Float"/> </list> <list name="inte" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`inte_id`" not-null="true" unique="false"/> + <column name="`simplelist_inte_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_inte_idx`"/> <element type="java.lang.Integer"/> @@ -52,49 +52,49 @@ </list> <list name="shor" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`shor_id`" not-null="true" unique="false"/> + <column name="`simplelist_shor_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_shor_idx`"/> <element type="short"/> </list> <list name="dat" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`dat_id`" not-null="true" unique="false"/> + <column name="`simplelist_dat_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_dat_idx`"/> <element type="java.util.Date"/> </list> <list name="limitedstring" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`limitedstring_id`" not-null="true" unique="false"/> + <column name="`simplelist_limitedstring_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_limitedstring_idx`"/> <element type="java.lang.String"/> </list> <array name="intArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`intarray_id`" not-null="true" unique="false"/> + <column name="`simplelist_intarray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_intarray_idx`"/> <element type="int"/> </array> <array name="doubleArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`doublearray_id`" not-null="true" unique="false"/> + <column name="`simplelist_doublearray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_doublearray_idx`"/> <element type="double"/> </array> <array name="stringArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`stringarray_id`" not-null="true" unique="false"/> + <column name="`simplelist_stringarray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_stringarray_idx`"/> <element type="java.lang.String"/> </array> <array name="byteArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`bytearray_id`" not-null="true" unique="false"/> + <column name="`simplelist_bytearray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_bytearray_idx`"/> <element type="byte"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml index d4558bbbe..6e3d2ca2e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:19 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:02 CEST 2006 --> <hibernate-mapping> <class entity-name="SimpleList" abstract="false" lazy="false" table="`simplelist`"> <id type="long" name="e_id" column="e_id"> @@ -11,35 +11,35 @@ <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> <list name="boo" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`boo_id`" not-null="true" unique="false"/> + <column name="`simplelist_boo_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_boo_idx`"/> <element type="boolean"/> </list> <list name="byt" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`byt_id`" not-null="true" unique="false"/> + <column name="`simplelist_byt_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_byt_idx`"/> <element type="java.lang.Byte"/> </list> <list name="doubl" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`doubl_id`" not-null="true" unique="false"/> + <column name="`simplelist_doubl_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_doubl_idx`"/> <element type="java.lang.Double"/> </list> <list name="floa" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`floa_id`" not-null="true" unique="false"/> + <column name="`simplelist_floa_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_floa_idx`"/> <element type="java.lang.Float"/> </list> <list name="inte" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`inte_id`" not-null="true" unique="false"/> + <column name="`simplelist_inte_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_inte_idx`"/> <element type="java.lang.Integer"/> @@ -51,49 +51,49 @@ </list> <list name="shor" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`shor_id`" not-null="true" unique="false"/> + <column name="`simplelist_shor_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_shor_idx`"/> <element type="short"/> </list> <list name="dat" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`dat_id`" not-null="true" unique="false"/> + <column name="`simplelist_dat_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_dat_idx`"/> <element type="java.util.Date"/> </list> <list name="limitedstring" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`limitedstring_id`" not-null="true" unique="false"/> + <column name="`simplelist_limitedstring_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_limitedstring_idx`"/> <element type="java.lang.String"/> </list> <array name="intArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`intarray_id`" not-null="true" unique="false"/> + <column name="`simplelist_intarray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_intarray_idx`"/> <element type="int"/> </array> <array name="doubleArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`doublearray_id`" not-null="true" unique="false"/> + <column name="`simplelist_doublearray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_doublearray_idx`"/> <element type="double"/> </array> <array name="stringArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`stringarray_id`" not-null="true" unique="false"/> + <column name="`simplelist_stringarray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_stringarray_idx`"/> <element type="java.lang.String"/> </array> <array name="byteArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`bytearray_id`" not-null="true" unique="false"/> + <column name="`simplelist_bytearray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_bytearray_idx`"/> <element type="byte"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml index 5958d01ff..7acf6f2ae 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:21 CEST 2006 --> <hibernate-mapping> <class entity-name="PurchaseOrder" abstract="false" lazy="false" discriminator-value="PurchaseOrder" table="`purchaseorder`"> <id type="long" name="e_id" column="e_id"> @@ -20,7 +20,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="orders" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`orders_id`" not-null="false" unique="false"/> + <column name="`supplier_orders_id`" not-null="false" unique="false"/> </key> <list-index column="`supplier_orders_idx`"/> <one-to-many entity-name="Supplier_orders"/> @@ -34,10 +34,10 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="preferredOrders" entity-name="PurchaseOrder" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`preferredorders_id`"/> + <column not-null="false" unique="false" name="`purchaseorder_preferredorders_id`"/> </many-to-one> <many-to-one name="standardOrders" entity-name="PurchaseOrder" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`standardorders_id`"/> + <column not-null="false" unique="false" name="`purchaseorder_standardorders_id`"/> </many-to-one> <property name="hardCopyOrderReference" type="java.lang.String" lazy="false" column="`hardcopyorderreference`" not-null="false"/> <property name="hardCopyOrderNumber" type="long" lazy="false" column="`hardcopyordernumber`" not-null="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml index 9d86740ab..b17c3706e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:07 CEST 2006 --> <hibernate-mapping> <class entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`"> <id type="long" name="e_id" column="e_id"> @@ -18,7 +18,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="orders" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`orders_id`" not-null="false" unique="false"/> + <column name="`supplier_orders_id`" not-null="false" unique="false"/> </key> <list-index column="`supplier_orders_idx`"/> <one-to-many entity-name="Supplier_orders"/> @@ -32,10 +32,10 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="preferredOrders" entity-name="PurchaseOrder" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`preferredorders_id`"/> + <column not-null="false" unique="false" name="`purchaseorder_preferredorders_id`"/> </many-to-one> <many-to-one name="standardOrders" entity-name="PurchaseOrder" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`standardorders_id`"/> + <column not-null="false" unique="false" name="`purchaseorder_standardorders_id`"/> </many-to-one> <property name="hardCopyOrderReference" type="java.lang.String" lazy="false" column="`hardcopyorderreference`" not-null="false"/> <property name="hardCopyOrderNumber" type="long" lazy="false" column="`hardcopyordernumber`" not-null="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/hibernate.hbm.xml index 8b763ec36..9da8fee2a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:40 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:27 CEST 2006 --> <hibernate-mapping> <class entity-name="ComplexNumber" abstract="false" lazy="false" discriminator-value="ComplexNumber" table="`complexnumber`"> <id type="long" name="e_id" column="e_id"> @@ -22,7 +22,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mycomplexabstractgroup_id`" not-null="false" unique="false"/> + <column name="`multinumbertype_mycomplexabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`multinumbertype_mycomplexabstractgroup_idx`"/> <one-to-many entity-name="MultiNumberType_myComplexAbstractGroup"/> @@ -36,7 +36,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="myComplexAbstract" entity-name="ComplexNumber" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mycomplexabstract_id`"/> + <column not-null="false" unique="false" name="`complexnumber_mycomplexabstract_id`"/> </many-to-one> </class> <class entity-name="NumberType" abstract="false" lazy="false" discriminator-value="NumberType" table="`numbertype`"> @@ -48,14 +48,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="mySimpleAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mysimpleabstractgroup_id`" not-null="false" unique="false"/> + <column name="`numbertype_mysimpleabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`numbertype_mysimpleabstractgroup_idx`"/> <one-to-many entity-name="NumberType_mySimpleAbstractGroup"/> </list> <list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mycomplexabstractgroup_id`" not-null="false" unique="false"/> + <column name="`numbertype_mycomplexabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`numbertype_mycomplexabstractgroup_idx`"/> <one-to-many entity-name="NumberType_myComplexAbstractGroup"/> @@ -78,7 +78,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="myComplexAbstract" entity-name="ComplexNumber" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mycomplexabstract_id`"/> + <column not-null="false" unique="false" name="`complexnumber_mycomplexabstract_id`"/> </many-to-one> </class> <subclass entity-name="OddComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" discriminator-value="OddComplexNumberType"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml index 650485934..b17acc8f5 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:28 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:15 CEST 2006 --> <hibernate-mapping> <class entity-name="ComplexNumber" abstract="false" lazy="false" table="`complexnumber`"> <id type="long" name="e_id" column="e_id"> @@ -24,7 +24,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mycomplexabstractgroup_id`" not-null="false" unique="false"/> + <column name="`multinumbertype_mycomplexabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`multinumbertype_mycomplexabstractgroup_idx`"/> <one-to-many entity-name="MultiNumberType_myComplexAbstractGroup"/> @@ -38,7 +38,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="myComplexAbstract" entity-name="ComplexNumber" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mycomplexabstract_id`"/> + <column not-null="false" unique="false" name="`complexnumber_mycomplexabstract_id`"/> </many-to-one> </class> <class entity-name="NumberType" abstract="false" lazy="false" table="`numbertype`"> @@ -49,14 +49,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="mySimpleAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mysimpleabstractgroup_id`" not-null="false" unique="false"/> + <column name="`numbertype_mysimpleabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`numbertype_mysimpleabstractgroup_idx`"/> <one-to-many entity-name="NumberType_mySimpleAbstractGroup"/> </list> <list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mycomplexabstractgroup_id`" not-null="false" unique="false"/> + <column name="`numbertype_mycomplexabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`numbertype_mycomplexabstractgroup_idx`"/> <one-to-many entity-name="NumberType_myComplexAbstractGroup"/> @@ -79,7 +79,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="myComplexAbstract" entity-name="ComplexNumber" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mycomplexabstract_id`"/> + <column not-null="false" unique="false" name="`complexnumber_mycomplexabstract_id`"/> </many-to-one> </class> <joined-subclass entity-name="OddComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" table="`oddcomplexnumbertype`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml index fb5205035..5449c007a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:39 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:26 CEST 2006 --> <hibernate-mapping> <class entity-name="ComplexAAA" abstract="false" lazy="false" discriminator-value="ComplexAAA" table="`complexaaa`"> <id type="long" name="e_id" column="e_id"> @@ -21,14 +21,14 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="myAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`myabstractgroup_id`" not-null="false" unique="false"/> + <column name="`roottype_myabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`roottype_myabstractgroup_idx`"/> <one-to-many entity-name="RootType_myAbstractGroup"/> </list> <list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mycomplexabstractgroup_id`" not-null="false" unique="false"/> + <column name="`roottype_mycomplexabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`roottype_mycomplexabstractgroup_idx`"/> <one-to-many entity-name="RootType_myComplexAbstractGroup"/> @@ -51,7 +51,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="myComplexAbstract" entity-name="ComplexAAA" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mycomplexabstract_id`"/> + <column not-null="false" unique="false" name="`complexaaa_mycomplexabstract_id`"/> </many-to-one> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml index 3bb624cff..b5be2d031 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:27 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:14 CEST 2006 --> <hibernate-mapping> <class entity-name="ComplexAAA" abstract="false" lazy="false" table="`complexaaa`"> <id type="long" name="e_id" column="e_id"> @@ -27,14 +27,14 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="myAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`myabstractgroup_id`" not-null="false" unique="false"/> + <column name="`roottype_myabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`roottype_myabstractgroup_idx`"/> <one-to-many entity-name="RootType_myAbstractGroup"/> </list> <list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mycomplexabstractgroup_id`" not-null="false" unique="false"/> + <column name="`roottype_mycomplexabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`roottype_mycomplexabstractgroup_idx`"/> <one-to-many entity-name="RootType_myComplexAbstractGroup"/> @@ -57,7 +57,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="myComplexAbstract" entity-name="ComplexAAA" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mycomplexabstract_id`"/> + <column not-null="false" unique="false" name="`complexaaa_mycomplexabstract_id`"/> </many-to-one> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml index e4b255fd2..6ee82e73b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:35 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -12,7 +12,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="country" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`country_id`" not-null="false" unique="false"/> + <column name="`address_country_id`" not-null="false" unique="false"/> </key> <list-index column="`address_country_idx`"/> <one-to-many entity-name="City"/> @@ -27,7 +27,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`address_id`" not-null="false" unique="false"/> + <column name="`city_address_id`" not-null="false" unique="false"/> </key> <list-index column="`city_address_idx`"/> <one-to-many entity-name="Address"/> @@ -42,7 +42,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="address" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`address_id`" not-null="false" unique="false"/> + <column name="`person_address_id`" not-null="false" unique="false"/> </key> <list-index column="`person_address_idx`"/> <one-to-many entity-name="Address"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml index 8661f69cf..f6fc999b4 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:43 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:30 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="country" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`country_id`" not-null="false" unique="false"/> + <column name="`address_country_id`" not-null="false" unique="false"/> </key> <list-index column="`address_country_idx`"/> <one-to-many entity-name="City"/> @@ -25,7 +25,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`address_id`" not-null="false" unique="false"/> + <column name="`city_address_id`" not-null="false" unique="false"/> </key> <list-index column="`city_address_idx`"/> <one-to-many entity-name="Address"/> @@ -39,7 +39,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="address" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`address_id`" not-null="false" unique="false"/> + <column name="`person_address_id`" not-null="false" unique="false"/> </key> <list-index column="`person_address_idx`"/> <one-to-many entity-name="Address"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml index 9dc087a1d..ab4cd0277 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:47 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:35 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <id name="name" type="java.lang.String" column="`name`"/> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="father" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`father_name`"/> + <column not-null="false" unique="false" name="`person_father_name`"/> </many-to-one> <many-to-one name="mother" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mother_name`"/> + <column not-null="false" unique="false" name="`person_mother_name`"/> </many-to-one> <bag name="children" table="person_person" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml index 987a96e2c..45ed01e92 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:29 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <id name="name" type="java.lang.String" column="`name`"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="father" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`father_name`"/> + <column not-null="false" unique="false" name="`person_father_name`"/> </many-to-one> <many-to-one name="mother" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mother_name`"/> + <column not-null="false" unique="false" name="`person_mother_name`"/> </many-to-one> <bag name="children" table="person_person" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml index bd31cef26..a0d414cd4 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:35 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`"> <id name="itemType" column="`itemtype`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml index 965cbe88b..2bae7c518 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:43 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:30 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" table="`item`"> <id name="itemType" column="`itemtype`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml index 116619135..8c25a053b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:46 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:34 CEST 2006 --> <hibernate-mapping> <class entity-name="Thing" abstract="false" lazy="false" discriminator-value="Thing" table="`thing`"> <id name="name" type="java.lang.String" column="`name`"/> @@ -9,7 +9,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="things" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`things_name`" not-null="false" unique="false"/> + <column name="`thing_things_name`" not-null="false" unique="false"/> </key> <list-index column="`thing_things_idx`"/> <one-to-many entity-name="SubThing"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml index a61f26996..54401f62a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:41 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:28 CEST 2006 --> <hibernate-mapping> <class entity-name="Thing" abstract="false" lazy="false" table="`thing`"> <id name="name" type="java.lang.String" column="`name`"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="things" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`things_name`" not-null="false" unique="false"/> + <column name="`thing_things_name`" not-null="false" unique="false"/> </key> <list-index column="`thing_things_idx`"/> <one-to-many entity-name="SubThing"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml index 193b4e9d6..2b072a362 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:49 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:36 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml index 671abb8d1..4e9096ffc 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:31 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml index 9ef25ffbf..b3b712391 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:47 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:34 CEST 2006 --> <hibernate-mapping> <class entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`"> <id name="hair" type="java.lang.String" column="`hair`"/> @@ -13,7 +13,7 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="head" entity-name="Head" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`head_hair`"/> + <column not-null="false" unique="false" name="`head_head_hair`"/> </many-to-one> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml index ab3692790..b03524f77 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:29 CEST 2006 --> <hibernate-mapping> <class entity-name="Head" abstract="false" lazy="false" table="`head`"> <id name="hair" type="java.lang.String" column="`hair`"/> @@ -11,7 +11,7 @@ <id name="name" type="java.lang.String" column="`name`"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="head" entity-name="Head" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`head_hair`"/> + <column not-null="false" unique="false" name="`head_head_hair`"/> </many-to-one> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml index 9890995f6..08ff9fd1a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:49 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:36 CEST 2006 --> <hibernate-mapping> <class entity-name="Me" abstract="false" lazy="false" discriminator-value="Me" table="`me`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml index 6b441f56f..fd2a35591 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:31 CEST 2006 --> <hibernate-mapping> <class entity-name="Me" abstract="false" lazy="false" table="`me`"> <id type="long" name="e_id" column="e_id"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml index 1d549b493..1bf3a5f2c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:49 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:37 CEST 2006 --> <hibernate-mapping> <class entity-name="AbstractSuper" abstract="false" lazy="false" discriminator-value="AbstractSuper" table="`abstractsuper`"> <id type="long" name="e_id" column="e_id"> @@ -25,7 +25,7 @@ <subclass entity-name="MList" abstract="false" lazy="false" extends="AbstractSuper" discriminator-value="MList"> <list name="m" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`m_id`" not-null="false" unique="false"/> + <column name="`mlist_m_id`" not-null="false" unique="false"/> </key> <list-index column="`mlist_m_idx`"/> <one-to-many entity-name="M"/> @@ -45,7 +45,7 @@ <subclass entity-name="PList" abstract="false" lazy="false" extends="AbstractSuper" discriminator-value="PList"> <list name="p" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`p_id`" not-null="false" unique="false"/> + <column name="`plist_p_id`" not-null="false" unique="false"/> </key> <list-index column="`plist_p_idx`"/> <one-to-many entity-name="P"/> @@ -53,10 +53,10 @@ </subclass> <subclass entity-name="R" abstract="false" lazy="false" extends="AbstractSuper" discriminator-value="R"> <many-to-one name="plist" entity-name="PList" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`plist_id`"/> + <column not-null="false" unique="false" name="`plist_plist_id`"/> </many-to-one> <many-to-one name="mlist" entity-name="MList" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mlist_id`"/> + <column not-null="false" unique="false" name="`mlist_mlist_id`"/> </many-to-one> </subclass> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml index a2a61bed8..762613490 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:19:45 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:32 CEST 2006 --> <hibernate-mapping> <class entity-name="AbstractSuper" abstract="false" lazy="false" table="`abstractsuper`"> <id type="long" name="e_id" column="e_id"> @@ -30,7 +30,7 @@ </key> <list name="m" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`m_id`" not-null="false" unique="false"/> + <column name="`mlist_m_id`" not-null="false" unique="false"/> </key> <list-index column="`mlist_m_idx`"/> <one-to-many entity-name="M"/> @@ -56,7 +56,7 @@ </key> <list name="p" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`p_id`" not-null="false" unique="false"/> + <column name="`plist_p_id`" not-null="false" unique="false"/> </key> <list-index column="`plist_p_idx`"/> <one-to-many entity-name="P"/> @@ -67,10 +67,10 @@ <column name="`abstractsuper_id`"/> </key> <many-to-one name="plist" entity-name="PList" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`plist_id`"/> + <column not-null="true" unique="false" name="`plist_plist_id`"/> </many-to-one> <many-to-one name="mlist" entity-name="MList" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`mlist_id`"/> + <column not-null="true" unique="false" name="`mlist_mlist_id`"/> </many-to-one> </joined-subclass> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/HibernateTestbed.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/HibernateTestbed.java index a2bdc6fe3..af1a2f818 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/HibernateTestbed.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/HibernateTestbed.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: HibernateTestbed.java,v 1.8 2006/09/29 05:14:23 mtaal Exp $ + * $Id: HibernateTestbed.java,v 1.9 2006/09/29 12:30:24 mtaal Exp $ */ package org.eclipse.emf.teneo.hibernate.test; @@ -38,7 +38,7 @@ import org.eclipse.emf.teneo.test.stores.TestStore; * Is the testbed which models the base in which a testrun is run. * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.8 $ + * @version $Revision: 1.9 $ */ public class HibernateTestbed extends Testbed { @@ -61,7 +61,6 @@ public class HibernateTestbed extends Testbed { } else { propFileName = "/local_test.properties"; } - System.err.println("Property File " + propFileName); Testbed.setTestBed(new HibernateTestbed()); } catch (Exception e) { throw new StoreTestException("Exception while checking directory " + RUN_BASE_DIR, e); diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/AllTests.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/AllTests.java index e9bc3e1fa..f62f4b070 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/AllTests.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/AllTests.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: AllTests.java,v 1.15 2006/09/28 20:05:52 mtaal Exp $ + * $Id: AllTests.java,v 1.16 2006/09/29 12:30:24 mtaal Exp $ */ package org.eclipse.emf.teneo.hibernate.test.emf.annotations; @@ -51,13 +51,15 @@ import org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction; * All tests * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.15 $ + * @version $Revision: 1.16 $ */ public class AllTests { public static Test suite() { TestSuite suite = new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.hibernate.test.emf.annotations", HibernateTestbed.instance().getConfigurations()); + suite.addTestSuite(DuplicatesAction.class); + suite.addTestSuite(UniqueConstraintsAction.class); suite.addTestSuite(InheritanceAnnotationAction.class); suite.addTestSuite(LazyLibraryAction.class); @@ -87,7 +89,6 @@ public class AllTests { suite.addTestSuite(BasicAction.class); suite.addTestSuite(CascadeNotallAction.class); - suite.addTestSuite(UniqueConstraintsAction.class); suite.addTestSuite(CompositeIdAction.class); suite.addTestSuite(PKeyJoinAction.class); @@ -95,7 +96,6 @@ public class AllTests { suite.addTestSuite(SetResourceAction.class); suite.addTestSuite(SetNMAction.class); - suite.addTestSuite(DuplicatesAction.class); suite.addTestSuite(AttributeOverridesAction.class); suite.addTestSuite(LobAction.class); suite.addTestSuite(EmbeddedIdAction.class); diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java index 9c9492dc9..658d8f0ea 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: AllTests.java,v 1.11 2006/09/22 13:58:14 mtaal Exp $ + * $Id: AllTests.java,v 1.12 2006/09/29 12:30:23 mtaal Exp $ */ package org.eclipse.emf.teneo.hibernate.test.emf.sample; @@ -43,13 +43,15 @@ import org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction; * All sample tests * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.11 $ + * @version $Revision: 1.12 $ */ public class AllTests { public static Test suite() { TestSuite suite = new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.hibernate.test.emf.sample", HibernateTestbed.instance() .getConfigurations()); + //suite.addTestSuite(EcoreAction.class); + suite.addTestSuite(DynamicAction.class); suite.addTestSuite(LibrarySerializationAction.class); @@ -82,7 +84,6 @@ public class AllTests { suite.addTestSuite(ProductAction.class); suite.addTestSuite(WorkFlowAction.class); suite.addTestSuite(ForumAction.class); - return suite; } } diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/stores/HibernateTestStore.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/stores/HibernateTestStore.java index 3320a8e83..bc5c10e43 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/stores/HibernateTestStore.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/stores/HibernateTestStore.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: HibernateTestStore.java,v 1.5 2006/09/08 04:35:42 mtaal Exp $ + * $Id: HibernateTestStore.java,v 1.6 2006/09/29 12:30:23 mtaal Exp $ */ package org.eclipse.emf.teneo.hibernate.test.stores; @@ -54,7 +54,7 @@ import org.hibernate.persister.entity.SingleTableEntityPersister; * The hibernate test store encapsulates the datastore actions to a hibernate store. * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ */ public class HibernateTestStore extends AbstractTestStore { /** The logger */ @@ -201,7 +201,7 @@ public class HibernateTestStore extends AbstractTestStore { /** Store/Makepersistent */ public void store(Object object) { - session.persist(object); + session.saveOrUpdate(object); } /** Deletes an object */ diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_a_o/package.jdo index bd3d0f471..76d28d5e6 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:55 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:43 CEST 2006 --> <jdo> <package name="extlibrary.impl"> <class name="extlibrary.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore"> @@ -16,7 +16,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="extlibrary.impl.WriterImpl"/> </field> @@ -35,7 +35,7 @@ <collection element-type="extlibrary.impl.ItemImpl" dependent-element="true"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="stock_id" allows-null="true"/> + <column name="library_stock_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="none"/> @@ -44,7 +44,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BRANCHES_IDX"/> - <column name="parentbranch_id" allows-null="true"/> + <column name="library_parentbranch_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="people" persistence-modifier="persistent"> @@ -87,7 +87,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -134,7 +134,7 @@ <version strategy="version-number" column="e_version"/> <field name="reader" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="reader_id" allows-null="true"/> + <column name="person_reader_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="extlibrary.impl.PersonImpl"/> </field> @@ -156,7 +156,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="VIDEOCASSETTE_CAST_IDX"/> - <column name="cast_id" allows-null="true"/> + <column name="videocassette_cast_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -194,7 +194,7 @@ <version strategy="version-number" column="e_version"/> <field name="manager" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="manager_id" allows-null="true"/> + <column name="employee_manager_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="extlibrary.impl.EmployeeImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_s_o/package.jdo index 669b14850..38458b25d 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:58 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:52 CEST 2006 --> <jdo> <package name="extlibrary.impl"> <class name="extlibrary.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore"> @@ -14,7 +14,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="extlibrary.impl.WriterImpl"/> </field> @@ -31,7 +31,7 @@ <collection element-type="extlibrary.impl.ItemImpl" dependent-element="true"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="stock_id" allows-null="true"/> + <column name="library_stock_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="none"/> @@ -40,7 +40,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BRANCHES_IDX"/> - <column name="parentbranch_id" allows-null="true"/> + <column name="library_parentbranch_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="people" persistence-modifier="persistent"> @@ -81,7 +81,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -120,7 +120,7 @@ <version strategy="version-number" column="e_version"/> <field name="reader" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="reader_id" allows-null="true"/> + <column name="person_reader_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="extlibrary.impl.PersonImpl"/> </field> @@ -140,7 +140,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="VIDEOCASSETTE_CAST_IDX"/> - <column name="cast_id" allows-null="true"/> + <column name="videocassette_cast_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -172,7 +172,7 @@ <version strategy="version-number" column="e_version"/> <field name="manager" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="manager_id" allows-null="true"/> + <column name="employee_manager_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="extlibrary.impl.EmployeeImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/package.jdo index 9f49b3869..3a19b22b6 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:14 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:14 CEST 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"> @@ -17,7 +17,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTACTS_PERSONS_IDX"/> - <column name="persons_id" allows-null="true"/> + <column name="contacts_persons_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/package.jdo index 9598de401..c210c5c13 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:07 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:49 CEST 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"> @@ -15,7 +15,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTACTS_PERSONS_IDX"/> - <column name="persons_id" allows-null="true"/> + <column name="contacts_persons_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachTest$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachTest$1/mysql_a_o/package.jdo index 9c44fc27b..f8f3b99e9 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachTest$1/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachTest$1/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:49 CEST 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"> @@ -15,7 +15,7 @@ <field name="code" persistence-modifier="persistent" null-value="exception"/> <field name="testB" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="testb_id" allows-null="false"/> + <column name="testb_testb_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestBImpl"/> </field> @@ -45,7 +45,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="TESTC_TESTB_IDX"/> - <column name="testb_id" allows-null="true"/> + <column name="testc_testb_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachTest$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachTest$1/mysql_s_o/package.jdo index d2c4f6f79..d44a2a4c1 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachTest$1/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.detach.DetachTest$1/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:00 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:47 CEST 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"> @@ -13,7 +13,7 @@ <field name="code" persistence-modifier="persistent" null-value="exception"/> <field name="testB" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="testb_id" allows-null="false"/> + <column name="testb_testb_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestBImpl"/> </field> @@ -39,7 +39,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="TESTC_TESTB_IDX"/> - <column name="testb_id" allows-null="true"/> + <column name="testc_testb_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_a_o/package.jdo index 32a272f91..4741ec453 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:09 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:54 CEST 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"> @@ -28,7 +28,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTGROUP_ACCOUNT_IDX"/> - <column name="account_id" allows-null="true"/> + <column name="accountgroup_account_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -47,7 +47,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTING_ACCOUNTGROUP_IDX"/> - <column name="accountgroup_id" allows-null="true"/> + <column name="accounting_accountgroup_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="vat" persistence-modifier="persistent" delete-action="restrict"> @@ -55,18 +55,18 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTING_VAT_IDX"/> - <column name="vat_id" allows-null="true"/> + <column name="accounting_vat_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="vatAccount" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="vataccount_id" allows-null="true"/> + <column name="balanceaccount_vataccount_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.BalanceAccountImpl"/> </field> <field name="report" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="report_id" allows-null="true"/> + <column name="report_report_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportImpl"/> </field> @@ -75,7 +75,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTING_JOURNALGROUP_IDX"/> - <column name="journalgroup_id" allows-null="true"/> + <column name="accounting_journalgroup_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -106,7 +106,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="JOURNALGROUP_JOURNALGROUPS_IDX"/> - <column name="journalgroups_id" allows-null="true"/> + <column name="journalgroup_journalgroups_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="journalStatements" persistence-modifier="persistent" delete-action="restrict"> @@ -114,7 +114,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="JOURNALGROUP_JOURNALSTATEMENTS_IDX"/> - <column name="journalstatements_id" allows-null="true"/> + <column name="journalgroup_journalstatements_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -132,19 +132,19 @@ <field name="amountESet" persistence-modifier="persistent"/> <field name="debitAccount" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="debitaccount_id" allows-null="false"/> + <column name="account_debitaccount_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl"/> </field> <field name="creditAccount" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="creditaccount_id" allows-null="false"/> + <column name="account_creditaccount_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl"/> </field> <field name="vat" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="vat_id" allows-null="true"/> + <column name="vat_vat_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.VatImpl"/> </field> @@ -167,13 +167,13 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="debitReportGroup" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="debitreportgroup_id" allows-null="false"/> + <column name="reportgroup_debitreportgroup_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportGroupImpl"/> </field> <field name="creditReportGroup" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="creditreportgroup_id" allows-null="false"/> + <column name="reportgroup_creditreportgroup_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportGroupImpl"/> </field> @@ -192,7 +192,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="REPORTGROUP_REPORTGROUP_IDX"/> - <column name="reportgroup_id" allows-null="true"/> + <column name="reportgroup_reportgroup_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="account" persistence-modifier="persistent" delete-action="restrict"> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_s_o/package.jdo index ccc442420..a89fcc108 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:13 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:03 CEST 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"> @@ -24,7 +24,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTGROUP_ACCOUNT_IDX"/> - <column name="account_id" allows-null="true"/> + <column name="accountgroup_account_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -41,7 +41,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTING_ACCOUNTGROUP_IDX"/> - <column name="accountgroup_id" allows-null="true"/> + <column name="accounting_accountgroup_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="vat" persistence-modifier="persistent" delete-action="restrict"> @@ -49,18 +49,18 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTING_VAT_IDX"/> - <column name="vat_id" allows-null="true"/> + <column name="accounting_vat_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="vatAccount" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="vataccount_id" allows-null="true"/> + <column name="balanceaccount_vataccount_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.BalanceAccountImpl"/> </field> <field name="report" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="report_id" allows-null="true"/> + <column name="report_report_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportImpl"/> </field> @@ -69,7 +69,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTING_JOURNALGROUP_IDX"/> - <column name="journalgroup_id" allows-null="true"/> + <column name="accounting_journalgroup_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -96,7 +96,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="JOURNALGROUP_JOURNALGROUPS_IDX"/> - <column name="journalgroups_id" allows-null="true"/> + <column name="journalgroup_journalgroups_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="journalStatements" persistence-modifier="persistent" delete-action="restrict"> @@ -104,7 +104,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="JOURNALGROUP_JOURNALSTATEMENTS_IDX"/> - <column name="journalstatements_id" allows-null="true"/> + <column name="journalgroup_journalstatements_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -120,19 +120,19 @@ <field name="amountESet" persistence-modifier="persistent"/> <field name="debitAccount" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="debitaccount_id" allows-null="false"/> + <column name="account_debitaccount_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl"/> </field> <field name="creditAccount" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="creditaccount_id" allows-null="false"/> + <column name="account_creditaccount_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl"/> </field> <field name="vat" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="vat_id" allows-null="true"/> + <column name="vat_vat_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.VatImpl"/> </field> @@ -151,13 +151,13 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="debitReportGroup" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="debitreportgroup_id" allows-null="false"/> + <column name="reportgroup_debitreportgroup_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportGroupImpl"/> </field> <field name="creditReportGroup" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="creditreportgroup_id" allows-null="false"/> + <column name="reportgroup_creditreportgroup_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportGroupImpl"/> </field> @@ -174,7 +174,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="REPORTGROUP_REPORTGROUP_IDX"/> - <column name="reportgroup_id" allows-null="true"/> + <column name="reportgroup_reportgroup_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="account" persistence-modifier="persistent" delete-action="restrict"> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_a_o/package.jdo index 47e64ca27..ad0f5b528 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:25 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:10 CEST 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"> @@ -19,7 +19,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CATALOGTYPE_SUBCATALOG_IDX"/> - <column name="subcatalog_name" allows-null="true"/> + <column name="catalogtype_subcatalog_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="product" persistence-modifier="persistent" delete-action="restrict"> @@ -27,7 +27,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CATALOGTYPE_PRODUCT_IDX"/> - <column name="product_name" allows-null="true"/> + <column name="catalogtype_product_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -45,7 +45,7 @@ <field name="quantityToESet" persistence-modifier="persistent"/> <field name="supplier" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="supplier_id" allows-null="false"/> + <column name="suppliertype_supplier_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.SupplierTypeImpl"/> </field> @@ -66,12 +66,12 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PRODUCTTYPE_REMARK_IDX"/> - <column name="remark_code" allows-null="true"/> + <column name="producttype_remark_code" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="price" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="price_id" allows-null="false"/> + <column name="pricetype_price_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.PriceTypeImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_s_o/package.jdo index dc097b548..b55d57793 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:28 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:17 CEST 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"> @@ -17,7 +17,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CATALOGTYPE_SUBCATALOG_IDX"/> - <column name="subcatalog_name" allows-null="true"/> + <column name="catalogtype_subcatalog_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="product" persistence-modifier="persistent" delete-action="restrict"> @@ -25,7 +25,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CATALOGTYPE_PRODUCT_IDX"/> - <column name="product_name" allows-null="true"/> + <column name="catalogtype_product_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -41,7 +41,7 @@ <field name="quantityToESet" persistence-modifier="persistent"/> <field name="supplier" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="supplier_id" allows-null="false"/> + <column name="suppliertype_supplier_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.SupplierTypeImpl"/> </field> @@ -60,12 +60,12 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PRODUCTTYPE_REMARK_IDX"/> - <column name="remark_code" allows-null="true"/> + <column name="producttype_remark_code" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="price" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="price_id" allows-null="false"/> + <column name="pricetype_price_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.PriceTypeImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/package.jdo index 0806903c8..716859133 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:05 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:52 CEST 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"> @@ -43,18 +43,18 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PURCHASEORDER_ITEMS_IDX"/> - <column name="order_id" allows-null="true"/> + <column name="item_order_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="billTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="billto_id" allows-null="false"/> + <column name="address_billto_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.AddressImpl"/> </field> <field name="shipTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="shipto_id" allows-null="true"/> + <column name="address_shipto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.AddressImpl"/> </field> @@ -63,13 +63,13 @@ <field name="status" persistence-modifier="persistent" null-value="none" embedded="true"/> <field name="customer" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="customer_id" allows-null="true"/> + <column name="purchaseorder_customer_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.CustomerImpl"/> </field> <field name="previousOrder" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="previousorder_id" allows-null="true"/> + <column name="purchaseorder_previousorder_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.PurchaseOrderImpl"/> </field> @@ -99,7 +99,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="SUPPLIER_CUSTOMERS_IDX"/> - <column name="customers_id" allows-null="true"/> + <column name="supplier_customers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="orders" persistence-modifier="persistent" delete-action="restrict"> @@ -107,7 +107,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="SUPPLIER_ORDERS_IDX"/> - <column name="orders_id" allows-null="true"/> + <column name="supplier_orders_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -125,7 +125,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CUSTOMER_ORDERS_IDX"/> - <column name="customer_id" allows-null="true"/> + <column name="purchaseorder_customer_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/package.jdo index f4695c439..5bb0d7283 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:01 CEST 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"> @@ -37,18 +37,18 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PURCHASEORDER_ITEMS_IDX"/> - <column name="order_id" allows-null="true"/> + <column name="item_order_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="billTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="billto_id" allows-null="false"/> + <column name="address_billto_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.AddressImpl"/> </field> <field name="shipTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="shipto_id" allows-null="true"/> + <column name="address_shipto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.AddressImpl"/> </field> @@ -57,13 +57,13 @@ <field name="status" persistence-modifier="persistent" null-value="none" embedded="true"/> <field name="customer" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="customer_id" allows-null="true"/> + <column name="purchaseorder_customer_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.CustomerImpl"/> </field> <field name="previousOrder" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="previousorder_id" allows-null="true"/> + <column name="purchaseorder_previousorder_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.PurchaseOrderImpl"/> </field> @@ -89,7 +89,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="SUPPLIER_CUSTOMERS_IDX"/> - <column name="customers_id" allows-null="true"/> + <column name="supplier_customers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="orders" persistence-modifier="persistent" delete-action="restrict"> @@ -97,7 +97,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="SUPPLIER_ORDERS_IDX"/> - <column name="orders_id" allows-null="true"/> + <column name="supplier_orders_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -113,7 +113,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CUSTOMER_ORDERS_IDX"/> - <column name="customer_id" allows-null="true"/> + <column name="purchaseorder_customer_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_a_o/package.jdo index 540209eee..156dd2318 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:20 CEST 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"> @@ -21,7 +21,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -42,7 +42,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -50,7 +50,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -70,7 +70,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_s_o/package.jdo index e1530b333..92cbdac9d 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:31 CEST 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"> @@ -19,7 +19,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -38,7 +38,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -64,7 +64,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_a_o/package.jdo index d99f83db9..d50236ff2 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:11 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:57 CEST 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"> @@ -17,7 +17,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACTTYPE_SCENE_IDX"/> - <column name="scene_id" allows-null="true"/> + <column name="acttype_scene_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="pindex" persistence-modifier="persistent" null-value="none"/> @@ -103,13 +103,13 @@ <field name="title" persistence-modifier="persistent" null-value="exception"/> <field name="fm" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="fm_id" allows-null="false"/> + <column name="fmtype_fm_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.play.impl.FmTypeImpl"/> </field> <field name="personae" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="personae_id" allows-null="false"/> + <column name="personaetype_personae_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PersonaeTypeImpl"/> </field> @@ -120,7 +120,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PLAYTYPE_ACT_IDX"/> - <column name="act_id" allows-null="true"/> + <column name="playtype_act_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_s_o/package.jdo index 70e37ac05..2d16d6d63 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:16 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:06 CEST 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"> @@ -15,7 +15,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACTTYPE_SCENE_IDX"/> - <column name="scene_id" allows-null="true"/> + <column name="acttype_scene_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="pindex" persistence-modifier="persistent" null-value="none"/> @@ -93,13 +93,13 @@ <field name="title" persistence-modifier="persistent" null-value="exception"/> <field name="fm" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="fm_id" allows-null="false"/> + <column name="fmtype_fm_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.play.impl.FmTypeImpl"/> </field> <field name="personae" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="personae_id" allows-null="false"/> + <column name="personaetype_personae_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PersonaeTypeImpl"/> </field> @@ -110,7 +110,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PLAYTYPE_ACT_IDX"/> - <column name="act_id" allows-null="true"/> + <column name="playtype_act_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/package.jdo index 8818726a7..9d2713d4c 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:03 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:50 CEST 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"> @@ -17,7 +17,7 @@ <field name="category" persistence-modifier="persistent" null-value="none" embedded="true"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.WriterImpl"/> </field> @@ -36,7 +36,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -44,7 +44,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -62,7 +62,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/package.jdo index 17474588c..ad1541627 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:07 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:59 CEST 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"> @@ -15,7 +15,7 @@ <field name="category" persistence-modifier="persistent" null-value="none" embedded="true"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.WriterImpl"/> </field> @@ -32,7 +32,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -40,7 +40,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -56,7 +56,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/package.jdo index 2c75ad5c1..62dccc1b2 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:37 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:10 CEST 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"> @@ -23,7 +23,7 @@ <field name="d" persistence-modifier="persistent" null-value="exception"/> <field name="myR" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="myr_id" allows-null="true"/> + <column name="r_myr_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.RImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/package.jdo index 06caab8a2..9b6212e4f 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:56 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:32 CEST 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"> @@ -21,7 +21,7 @@ <field name="d" persistence-modifier="persistent" null-value="exception"/> <field name="myR" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="myr_id" allows-null="true"/> + <column name="r_myr_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.RImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/package.jdo index 7c0ebde09..c9405bd23 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:46 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:41 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/package.jdo index b2a405b9c..78c2e0832 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:09 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:25 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/package.jdo index ef713aea7..35d35b462 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:42 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/package.jdo index f0aec4e95..e250371e4 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:11 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:26 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/package.jdo index b0d0a3c66..0e76c1595 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:32 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:35 CEST 2006 --> <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"> @@ -19,7 +19,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.WriterImpl"/> </field> @@ -38,7 +38,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -64,7 +64,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/package.jdo index 8139791ad..4d02863d3 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:27:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:16 CEST 2006 --> <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"> @@ -17,7 +17,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.WriterImpl"/> </field> @@ -34,7 +34,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -42,7 +42,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -58,7 +58,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/package.jdo index b945b04f5..688718e2a 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:34 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:36 CEST 2006 --> <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"> @@ -15,8 +15,8 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PARENT_CHILDREN_IDX"/> - <column name="children_firstname" allows-null="true"/> - <column name="children_lastname" allows-null="true"/> + <column name="parent_children_firstname" allows-null="true"/> + <column name="parent_children_lastname" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/package.jdo index 8c88beaab..291399440 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:27:54 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:18 CEST 2006 --> <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" table="parent" identity-type="application"> @@ -13,8 +13,8 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PARENT_CHILDREN_IDX"/> - <column name="children_firstname" allows-null="true"/> - <column name="children_lastname" allows-null="true"/> + <column name="parent_children_firstname" allows-null="true"/> + <column name="parent_children_lastname" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/package.jdo index 6e79d7975..f9499a981 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:54 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:44 CEST 2006 --> <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"> @@ -23,12 +23,13 @@ </inheritance> <version strategy="version-number" column="e_version"/> <field name="name" persistence-modifier="persistent" null-value="exception"/> - <field name="childItem" persistence-modifier="persistent" table="item_childitem" delete-action="restrict"> + <field name="childItem" persistence-modifier="persistent" delete-action="restrict"> <collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ChildItemImpl" dependent-element="true"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <join/> <order column="ITEM_CHILDITEM_IDX"/> + <column name="item_childitem_id" allows-null="true"/> + <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> </package> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/package.jdo index 23f904157..05ad1d6d4 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:18 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:29 CEST 2006 --> <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"> @@ -19,12 +19,13 @@ <inheritance strategy="new-table"/> <version strategy="version-number" column="e_version"/> <field name="name" persistence-modifier="persistent" null-value="exception"/> - <field name="childItem" persistence-modifier="persistent" table="item_childitem" delete-action="restrict"> + <field name="childItem" persistence-modifier="persistent" delete-action="restrict"> <collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ChildItemImpl" dependent-element="true"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <join/> <order column="ITEM_CHILDITEM_IDX"/> + <column name="item_childitem_id" allows-null="true"/> + <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> </package> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/package.jdo index ab15a844b..10e84f2cb 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:27 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:33 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o/package.jdo index 3b2003441..413061bc2 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:27:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:11 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/package.jdo index 6cbd88aa1..c66830b5b 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:52 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:44 CEST 2006 --> <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"> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/package.jdo index bdf0484af..2396d5253 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:16 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:28 CEST 2006 --> <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"> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/package.jdo index 8cdc2f1be..d994ce076 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:43 CEST 2006 --> <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"> @@ -28,7 +28,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTENTLIST_ADDRESS_IDX"/> - <column name="address_name" allows-null="true"/> + <column name="contentlist_address_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="price" persistence-modifier="persistent" delete-action="restrict"> @@ -36,7 +36,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTENTLIST_PRICE_IDX"/> - <column name="price_name" allows-null="true"/> + <column name="contentlist_price_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/package.jdo index d1ae4b485..54b3d7ecc 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:13 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:27 CEST 2006 --> <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"> @@ -26,7 +26,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTENTLIST_ADDRESS_IDX"/> - <column name="address_name" allows-null="true"/> + <column name="contentlist_address_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="price" persistence-modifier="persistent" delete-action="restrict"> @@ -34,7 +34,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTENTLIST_PRICE_IDX"/> - <column name="price_name" allows-null="true"/> + <column name="contentlist_price_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/package.jdo index e75d651a3..6295997c9 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:38 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:38 CEST 2006 --> <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"> @@ -19,7 +19,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.WriterImpl"/> </field> @@ -38,7 +38,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="false"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="false"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -64,7 +64,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/package.jdo index 88c3662da..5719aab8b 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:27:59 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:21 CEST 2006 --> <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"> @@ -17,7 +17,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.WriterImpl"/> </field> @@ -34,7 +34,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="false"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -42,7 +42,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="false"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -58,7 +58,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/package.jdo index 911aad2af..dddc669ac 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:35 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/package.jdo index c98d5d926..ec4a6dbd6 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:27:47 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:15 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/package.jdo index ffc132494..edcfd0199 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:40 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:39 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/package.jdo index 7a5cfad48..80acef7ca 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:02 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:22 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/package.jdo index 9d5552727..b36541116 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:40 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.DocumentImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="application"> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/package.jdo index 9819fb5b9..d487c4a5f 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:07 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:25 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.DocumentImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="document" identity-type="application"> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_a_o/package.jdo index b723bb4ef..224aa9287 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:29 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:34 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_s_o/package.jdo index 0f65ea966..b3df3c156 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:27:45 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:13 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/package.jdo index a4f0d5b75..bdec1cf01 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:58 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:46 CEST 2006 --> <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"> @@ -25,7 +25,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="itemList" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="itemlist_id" allows-null="true"/> + <column name="item_itemlist_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl"/> </field> @@ -43,14 +43,14 @@ <collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" dependent-element="true"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="containeditem_id" allows-null="true"/> + <column name="itemlist_containeditem_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="item" persistence-modifier="persistent" delete-action="restrict"> <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> - <column name="itemlist_id" allows-null="true"/> + <column name="item_itemlist_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="joinedItem" persistence-modifier="persistent" table="itemlist_item" delete-action="restrict"> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/package.jdo index 2e5925b75..0a2c9bed7 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:31 CEST 2006 --> <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"> @@ -21,7 +21,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="itemList" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="itemlist_id" allows-null="true"/> + <column name="item_itemlist_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl"/> </field> @@ -37,14 +37,14 @@ <collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" dependent-element="true"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="containeditem_id" allows-null="true"/> + <column name="itemlist_containeditem_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="item" persistence-modifier="persistent" delete-action="restrict"> <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> - <column name="itemlist_id" allows-null="true"/> + <column name="item_itemlist_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="joinedItem" persistence-modifier="persistent" table="itemlist_item" delete-action="restrict"> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/package.jdo index 803960f36..16712bb6d 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:56 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:45 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/package.jdo index e80afc963..df2942913 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:21 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:30 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/package.jdo index 8bed428d2..eb2db69be 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:25 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:32 CEST 2006 --> <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"> @@ -25,7 +25,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="itemList" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="itemlist_id" allows-null="true"/> + <column name="item_itemlist_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl"/> </field> @@ -43,14 +43,14 @@ <collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" dependent-element="true"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="containeditem_id" allows-null="true"/> + <column name="itemlist_containeditem_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="item" persistence-modifier="persistent" delete-action="restrict"> <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> - <column name="itemlist_id" allows-null="true"/> + <column name="item_itemlist_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="joinedItem" persistence-modifier="persistent" table="itemlist_item" delete-action="restrict"> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/package.jdo index edd69b194..6b9aa6ea1 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:27:39 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:08 CEST 2006 --> <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"> @@ -21,7 +21,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="itemList" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="itemlist_id" allows-null="true"/> + <column name="item_itemlist_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl"/> </field> @@ -37,14 +37,14 @@ <collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" dependent-element="true"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="containeditem_id" allows-null="true"/> + <column name="itemlist_containeditem_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="item" persistence-modifier="persistent" delete-action="restrict"> <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> - <column name="itemlist_id" allows-null="true"/> + <column name="item_itemlist_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="joinedItem" persistence-modifier="persistent" table="itemlist_item" delete-action="restrict"> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/package.jdo index 5a32e884c..d845d8135 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:37 CEST 2006 --> <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"> @@ -38,7 +38,7 @@ <version strategy="version-number" column="e_version"/> <field name="address" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="address_id" allows-null="true"/> + <column name="address_address_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/package.jdo index 7228b1f98..9a259bf7d 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:27:57 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:20 CEST 2006 --> <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"> @@ -32,7 +32,7 @@ <version strategy="version-number" column="e_version"/> <field name="address" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="address_id" allows-null="true"/> + <column name="address_address_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/package.jdo index f54a6b9c3..80c9c46af 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:40 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/package.jdo index f41aba6a5..be9466afb 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:04 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:24 CEST 2006 --> <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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/package.jdo index aa10928a1..a98af12d3 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:12 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:50 CEST 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"> @@ -17,7 +17,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTACTS_PERSONS_IDX"/> - <column name="persons_id" allows-null="true"/> + <column name="contacts_persons_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="containedPersons" persistence-modifier="persistent" delete-action="restrict"> @@ -25,7 +25,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTACTS_CONTAINEDPERSONS_IDX"/> - <column name="containedpersons_id" allows-null="true"/> + <column name="contacts_containedpersons_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -43,7 +43,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PERSON_CHILDREN_IDX"/> - <column name="children_id" allows-null="true"/> + <column name="person_children_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/package.jdo index 0a179bc74..e72fd7655 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:04 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:48 CEST 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"> @@ -15,7 +15,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTACTS_PERSONS_IDX"/> - <column name="persons_id" allows-null="true"/> + <column name="contacts_persons_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="containedPersons" persistence-modifier="persistent" delete-action="restrict"> @@ -23,7 +23,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTACTS_CONTAINEDPERSONS_IDX"/> - <column name="containedpersons_id" allows-null="true"/> + <column name="contacts_containedpersons_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -39,7 +39,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PERSON_CHILDREN_IDX"/> - <column name="children_id" allows-null="true"/> + <column name="person_children_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/package.jdo index b51a42b39..63e8917a0 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:19 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:15 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/package.jdo index 7c45259e2..16857a410 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:16 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:14 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/package.jdo index 9460e7200..aed935254 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:29 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:24 CEST 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"> @@ -36,25 +36,25 @@ <field name="nameESet" persistence-modifier="persistent"/> <field name="containedonewayrequired" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="containedonewayrequired_id" allows-null="false"/> + <column name="containedchildr_containedonewayrequired_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildRImpl"/> </field> <field name="containedoneWaynotrequired" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="containedonewaynotrequired_id" allows-null="true"/> + <column name="containedchildnr_containedonewaynotrequired_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildNRImpl"/> </field> <field name="notcontainedonewayrequired" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="notcontainedonewayrequired_id" allows-null="false"/> + <column name="notcontainedchildr_notcontainedonewayrequired_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildRImpl"/> </field> <field name="notcontainedonewaynotrequired" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="notcontainedonewaynotrequired_id" allows-null="true"/> + <column name="notcontainedchildnr_notcontainedonewaynotrequired_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/package.jdo index 1b6e571f8..1992bfccd 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:21 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:16 CEST 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"> @@ -30,25 +30,25 @@ <field name="nameESet" persistence-modifier="persistent"/> <field name="containedonewayrequired" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="containedonewayrequired_id" allows-null="false"/> + <column name="containedchildr_containedonewayrequired_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildRImpl"/> </field> <field name="containedoneWaynotrequired" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="containedonewaynotrequired_id" allows-null="true"/> + <column name="containedchildnr_containedonewaynotrequired_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildNRImpl"/> </field> <field name="notcontainedonewayrequired" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="notcontainedonewayrequired_id" allows-null="false"/> + <column name="notcontainedchildr_notcontainedonewayrequired_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildRImpl"/> </field> <field name="notcontainedonewaynotrequired" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="notcontainedonewaynotrequired_id" allows-null="true"/> + <column name="notcontainedchildnr_notcontainedonewaynotrequired_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/package.jdo index 21a19d1d3..12f1e89d5 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:25 CEST 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"> @@ -19,7 +19,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONECR_IDX"/> - <column name="onecr_id" allows-null="true"/> + <column name="main_onecr_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="onecn" persistence-modifier="persistent" delete-action="restrict"> @@ -27,7 +27,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONECN_IDX"/> - <column name="onecn_id" allows-null="true"/> + <column name="main_onecn_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="onenr" persistence-modifier="persistent" delete-action="restrict"> @@ -35,7 +35,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONENR_IDX"/> - <column name="onenr_id" allows-null="true"/> + <column name="main_onenr_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="onenn" persistence-modifier="persistent" delete-action="restrict"> @@ -43,7 +43,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONENN_IDX"/> - <column name="onenn_id" allows-null="true"/> + <column name="main_onenn_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="twocr" persistence-modifier="persistent" delete-action="restrict"> @@ -51,7 +51,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWOCR_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twocr_main_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="twocn" persistence-modifier="persistent" delete-action="restrict"> @@ -59,7 +59,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWOCN_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twocn_main_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="twonr" persistence-modifier="persistent" delete-action="restrict"> @@ -67,7 +67,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWONR_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twonr_main_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="twonn" persistence-modifier="persistent" delete-action="restrict"> @@ -75,7 +75,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWONN_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twonn_main_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -150,7 +150,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="main" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="main_id" allows-null="true"/> + <column name="twonn_main_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.MainImpl"/> </field> @@ -166,7 +166,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="main" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="main_id" allows-null="true"/> + <column name="twonr_main_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.MainImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/package.jdo index 21fe6399d..32c20874d 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:24 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:17 CEST 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"> @@ -17,7 +17,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONECR_IDX"/> - <column name="onecr_id" allows-null="true"/> + <column name="main_onecr_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="onecn" persistence-modifier="persistent" delete-action="restrict"> @@ -25,7 +25,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONECN_IDX"/> - <column name="onecn_id" allows-null="true"/> + <column name="main_onecn_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="onenr" persistence-modifier="persistent" delete-action="restrict"> @@ -33,7 +33,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONENR_IDX"/> - <column name="onenr_id" allows-null="true"/> + <column name="main_onenr_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="onenn" persistence-modifier="persistent" delete-action="restrict"> @@ -41,7 +41,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONENN_IDX"/> - <column name="onenn_id" allows-null="true"/> + <column name="main_onenn_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="twocr" persistence-modifier="persistent" delete-action="restrict"> @@ -49,7 +49,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWOCR_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twocr_main_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="twocn" persistence-modifier="persistent" delete-action="restrict"> @@ -57,7 +57,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWOCN_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twocn_main_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="twonr" persistence-modifier="persistent" delete-action="restrict"> @@ -65,7 +65,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWONR_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twonr_main_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="twonn" persistence-modifier="persistent" delete-action="restrict"> @@ -73,7 +73,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWONN_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twonn_main_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -134,7 +134,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="main" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="main_id" allows-null="true"/> + <column name="twonn_main_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.MainImpl"/> </field> @@ -148,7 +148,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="main" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="main_id" allows-null="true"/> + <column name="twonr_main_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.MainImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/package.jdo index 295d1f75b..46d1f800b 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:33 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:29 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/package.jdo index 6d6757828..49f1bd761 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:27 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:22 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/package.jdo index e658abd4e..63e129b88 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:01 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:48 CEST 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"> @@ -19,7 +19,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CATALOGTYPE_SUBCATALOG_IDX"/> - <column name="subcatalog_name" allows-null="true"/> + <column name="catalogtype_subcatalog_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="product" persistence-modifier="persistent" delete-action="restrict"> @@ -27,7 +27,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CATALOGTYPE_PRODUCT_IDX"/> - <column name="product_name" allows-null="true"/> + <column name="catalogtype_product_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -45,7 +45,7 @@ <field name="quantityToESet" persistence-modifier="persistent"/> <field name="supplier" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="supplier_id" allows-null="false"/> + <column name="suppliertype_supplier_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.SupplierTypeImpl"/> </field> @@ -66,12 +66,12 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PRODUCTTYPE_REMARK_IDX"/> - <column name="remark_code" allows-null="true"/> + <column name="producttype_remark_code" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="price" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="price_id" allows-null="false"/> + <column name="pricetype_price_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.PriceTypeImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/package.jdo index 61b55f83c..037d9c6f9 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:04 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:57 CEST 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"> @@ -17,7 +17,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CATALOGTYPE_SUBCATALOG_IDX"/> - <column name="subcatalog_name" allows-null="true"/> + <column name="catalogtype_subcatalog_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="product" persistence-modifier="persistent" delete-action="restrict"> @@ -25,7 +25,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CATALOGTYPE_PRODUCT_IDX"/> - <column name="product_name" allows-null="true"/> + <column name="catalogtype_product_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -41,7 +41,7 @@ <field name="quantityToESet" persistence-modifier="persistent"/> <field name="supplier" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="supplier_id" allows-null="false"/> + <column name="suppliertype_supplier_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.SupplierTypeImpl"/> </field> @@ -60,12 +60,12 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PRODUCTTYPE_REMARK_IDX"/> - <column name="remark_code" allows-null="true"/> + <column name="producttype_remark_code" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="price" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="price_id" allows-null="false"/> + <column name="pricetype_price_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.PriceTypeImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/package.jdo index c64dcecd1..021f9d1d7 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:07 CEST 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"> @@ -18,7 +18,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="FORUM_MEMBERS_IDX"/> - <column name="members_id" allows-null="true"/> + <column name="forum_members_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="topics" persistence-modifier="persistent" delete-action="restrict"> @@ -26,7 +26,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="FORUM_TOPICS_IDX"/> - <column name="topics_id" allows-null="true"/> + <column name="forum_topics_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -44,7 +44,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MEMBER_POSTS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="post_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="created" persistence-modifier="persistent" delete-action="restrict"> @@ -52,7 +52,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MEMBER_CREATED_IDX"/> - <column name="creator_id" allows-null="true"/> + <column name="topic_creator_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -67,13 +67,13 @@ <field name="comment" persistence-modifier="persistent" null-value="exception"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="post_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.MemberImpl"/> </field> <field name="topic" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="topic_id" allows-null="true"/> + <column name="post_topic_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.TopicImpl"/> </field> @@ -91,7 +91,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="creator" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="creator_id" allows-null="true"/> + <column name="topic_creator_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.MemberImpl"/> </field> @@ -100,7 +100,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="TOPIC_POSTS_IDX"/> - <column name="topic_id" allows-null="true"/> + <column name="post_topic_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/package.jdo index d56fa0413..8aca37463 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:26 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:15 CEST 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"> @@ -16,7 +16,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="FORUM_MEMBERS_IDX"/> - <column name="members_id" allows-null="true"/> + <column name="forum_members_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="topics" persistence-modifier="persistent" delete-action="restrict"> @@ -24,7 +24,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="FORUM_TOPICS_IDX"/> - <column name="topics_id" allows-null="true"/> + <column name="forum_topics_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -40,7 +40,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MEMBER_POSTS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="post_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="created" persistence-modifier="persistent" delete-action="restrict"> @@ -48,7 +48,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MEMBER_CREATED_IDX"/> - <column name="creator_id" allows-null="true"/> + <column name="topic_creator_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -61,13 +61,13 @@ <field name="comment" persistence-modifier="persistent" null-value="exception"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="post_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.MemberImpl"/> </field> <field name="topic" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="topic_id" allows-null="true"/> + <column name="post_topic_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.TopicImpl"/> </field> @@ -83,7 +83,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="creator" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="creator_id" allows-null="true"/> + <column name="topic_creator_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.MemberImpl"/> </field> @@ -92,7 +92,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="TOPIC_POSTS_IDX"/> - <column name="topic_id" allows-null="true"/> + <column name="post_topic_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/package.jdo index 6153bae52..d1a131b22 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:58 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:46 CEST 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"> @@ -16,7 +16,7 @@ <field name="name" persistence-modifier="persistent" null-value="none"/> <field name="base" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="base_id" allows-null="true"/> + <column name="ptype_base_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl"/> </field> @@ -24,7 +24,7 @@ <collection element-type="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl" dependent-element="false"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="base_id" allows-null="true"/> + <column name="ptype_base_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="subNOTypes" persistence-modifier="persistent" table="ptype_ptype" delete-action="restrict"> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/package.jdo index 326b86c75..276f2f56c 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:01 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:55 CEST 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"> @@ -14,7 +14,7 @@ <field name="name" persistence-modifier="persistent" null-value="none"/> <field name="base" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="base_id" allows-null="true"/> + <column name="ptype_base_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl"/> </field> @@ -22,7 +22,7 @@ <collection element-type="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl" dependent-element="false"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="base_id" allows-null="true"/> + <column name="ptype_base_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="subNOTypes" persistence-modifier="persistent" table="ptype_ptype" delete-action="restrict"> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/package.jdo index f724714f3..65146299b 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:36 CEST 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"> @@ -21,7 +21,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -42,7 +42,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -50,7 +50,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -70,7 +70,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/package.jdo index 1235a52cc..d193314d8 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:44 CEST 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"> @@ -19,7 +19,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -38,7 +38,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -64,7 +64,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/package.jdo index 814193dd7..3414f7861 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:37 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:24 CEST 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"> @@ -21,7 +21,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -42,7 +42,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -50,7 +50,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -70,7 +70,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/package.jdo index 6c92774f5..c6dfb83c3 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:40 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:37 CEST 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"> @@ -19,7 +19,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -38,7 +38,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -64,7 +64,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/package.jdo index 02bd82d78..f4f1ce88b 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:29 CEST 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"> @@ -21,7 +21,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -42,7 +42,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -50,7 +50,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -70,7 +70,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/package.jdo index 1dcad56d7..5b5e43931 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:45 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:40 CEST 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"> @@ -19,7 +19,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -38,7 +38,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -64,7 +64,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/package.jdo index b65b9ae70..20c9dd668 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:35 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:22 CEST 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"> @@ -21,7 +21,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -42,7 +42,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -50,7 +50,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -70,7 +70,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/package.jdo index 095fdffd4..371f954c8 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:38 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:35 CEST 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"> @@ -19,7 +19,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -38,7 +38,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -64,7 +64,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/package.jdo index dcbab795a..f91276530 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:41 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:27 CEST 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"> @@ -21,7 +21,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -42,7 +42,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -50,7 +50,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -70,7 +70,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/package.jdo index 1a537e562..ba2fa0273 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:43 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:38 CEST 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"> @@ -19,7 +19,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -38,7 +38,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -64,7 +64,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_a_o/package.jdo index 26c242e9b..7d44d15d5 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:46 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:33 CEST 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"> @@ -21,7 +21,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -42,7 +42,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -50,7 +50,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -70,7 +70,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_s_o/package.jdo index 250746538..6d702ae32 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:42 CEST 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"> @@ -19,7 +19,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -38,7 +38,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -64,7 +64,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/package.jdo index dd2e79f5b..bcf98a8f7 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:14 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:00 CEST 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"> @@ -17,7 +17,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACTTYPE_SCENE_IDX"/> - <column name="scene_id" allows-null="true"/> + <column name="acttype_scene_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="pindex" persistence-modifier="persistent" null-value="none"/> @@ -103,13 +103,13 @@ <field name="title" persistence-modifier="persistent" null-value="exception"/> <field name="fm" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="fm_id" allows-null="false"/> + <column name="fmtype_fm_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.play.impl.FmTypeImpl"/> </field> <field name="personae" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="personae_id" allows-null="false"/> + <column name="personaetype_personae_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PersonaeTypeImpl"/> </field> @@ -120,7 +120,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PLAYTYPE_ACT_IDX"/> - <column name="act_id" allows-null="true"/> + <column name="playtype_act_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/package.jdo index 07879229a..b2d8e54e9 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:19 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:08 CEST 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"> @@ -15,7 +15,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACTTYPE_SCENE_IDX"/> - <column name="scene_id" allows-null="true"/> + <column name="acttype_scene_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="pindex" persistence-modifier="persistent" null-value="none"/> @@ -93,13 +93,13 @@ <field name="title" persistence-modifier="persistent" null-value="exception"/> <field name="fm" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="fm_id" allows-null="false"/> + <column name="fmtype_fm_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.play.impl.FmTypeImpl"/> </field> <field name="personae" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="personae_id" allows-null="false"/> + <column name="personaetype_personae_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PersonaeTypeImpl"/> </field> @@ -110,7 +110,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PLAYTYPE_ACT_IDX"/> - <column name="act_id" allows-null="true"/> + <column name="playtype_act_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/package.jdo index b72f7dabd..b97980b18 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:20 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:05 CEST 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"> @@ -29,13 +29,13 @@ <version strategy="version-number" column="e_version"/> <field name="shipTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="shipto_id" allows-null="true"/> + <column name="usaddress_shipto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.USAddressImpl"/> </field> <field name="billTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="billto_id" allows-null="false"/> + <column name="usaddress_billto_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.USAddressImpl"/> </field> @@ -45,7 +45,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PURCHASEORDER_ITEMS_IDX"/> - <column name="items_id" allows-null="true"/> + <column name="purchaseorder_items_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="orderDate" persistence-modifier="persistent" null-value="none" serialized="true"/> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/package.jdo index cfeb34a17..b1d42977a 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:12 CEST 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"> @@ -25,13 +25,13 @@ <version strategy="version-number" column="e_version"/> <field name="shipTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="shipto_id" allows-null="true"/> + <column name="usaddress_shipto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.USAddressImpl"/> </field> <field name="billTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="billto_id" allows-null="false"/> + <column name="usaddress_billto_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.USAddressImpl"/> </field> @@ -41,7 +41,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PURCHASEORDER_ITEMS_IDX"/> - <column name="items_id" allows-null="true"/> + <column name="purchaseorder_items_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="orderDate" persistence-modifier="persistent" null-value="none" serialized="true"/> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/package.jdo index d74229eb5..73c5e47fd 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:17 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:03 CEST 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"> @@ -17,7 +17,7 @@ <field name="id" persistence-modifier="persistent" primary-key="true"/> <field name="supplier" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="supplier_id" allows-null="false"/> + <column name="suppliertype_supplier_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.product.impl.SupplierTypeImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/package.jdo index 65903ba64..e0be51c53 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:21 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:10 CEST 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"> @@ -15,7 +15,7 @@ <field name="id" persistence-modifier="persistent" primary-key="true"/> <field name="supplier" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="supplier_id" allows-null="false"/> + <column name="suppliertype_supplier_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.product.impl.SupplierTypeImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/package.jdo index 1bb65e5c1..5bead5d21 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:53 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:41 CEST 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"> @@ -33,7 +33,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOKSTYPE_BOOK_IDX"/> - <column name="book_id" allows-null="true"/> + <column name="bookstype_book_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -51,14 +51,14 @@ <field name="price" persistence-modifier="persistent" null-value="exception"/> <field name="authors" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="authors_id" allows-null="false"/> + <column name="authorstype_authors_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.AuthorsTypeImpl"/> </field> <field name="description" persistence-modifier="persistent" null-value="none"/> <field name="promotion" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="promotion_id" allows-null="false"/> + <column name="promotiontype_promotion_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.PromotionTypeImpl"/> </field> @@ -77,7 +77,7 @@ <version strategy="version-number" column="e_version"/> <field name="books" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="books_id" allows-null="false"/> + <column name="bookstype_books_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.BooksTypeImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/package.jdo index c67b5b554..e3ce95f86 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:55 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:50 CEST 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"> @@ -29,7 +29,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOKSTYPE_BOOK_IDX"/> - <column name="book_id" allows-null="true"/> + <column name="bookstype_book_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -45,14 +45,14 @@ <field name="price" persistence-modifier="persistent" null-value="exception"/> <field name="authors" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="authors_id" allows-null="false"/> + <column name="authorstype_authors_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.AuthorsTypeImpl"/> </field> <field name="description" persistence-modifier="persistent" null-value="none"/> <field name="promotion" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="promotion_id" allows-null="false"/> + <column name="promotiontype_promotion_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.PromotionTypeImpl"/> </field> @@ -69,7 +69,7 @@ <version strategy="version-number" column="e_version"/> <field name="books" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="books_id" allows-null="false"/> + <column name="bookstype_books_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.BooksTypeImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/package.jdo index bdceeeadd..d24e4f8fc 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:38 CEST 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"> @@ -15,7 +15,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOW_NODES_IDX"/> - <column name="workflow_id" allows-null="true"/> + <column name="workflownode_workflow_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="edges" persistence-modifier="persistent" delete-action="restrict"> @@ -23,7 +23,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOW_EDGES_IDX"/> - <column name="workflow_id" allows-null="true"/> + <column name="edge_workflow_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="comments" persistence-modifier="persistent" delete-action="restrict"> @@ -31,7 +31,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOW_COMMENTS_IDX"/> - <column name="workflow_id" allows-null="true"/> + <column name="comment_workflow_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOWNODE_OUTPUTS_IDX"/> - <column name="node_id" allows-null="true"/> + <column name="outputport_node_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="inputs" persistence-modifier="persistent" delete-action="restrict"> @@ -54,7 +54,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOWNODE_INPUTS_IDX"/> - <column name="node_id" allows-null="true"/> + <column name="inputport_node_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="isStart" persistence-modifier="persistent" null-value="none"/> @@ -68,13 +68,13 @@ <version strategy="version-number" column="e_version"/> <field name="target" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="target_id" allows-null="true"/> + <column name="edge_target_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.InputPortImpl"/> </field> <field name="source" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="source_id" allows-null="true"/> + <column name="edge_source_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.OutputPortImpl"/> </field> @@ -90,7 +90,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="INPUTPORT_EDGES_IDX"/> - <column name="target_id" allows-null="true"/> + <column name="edge_target_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -105,7 +105,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="OUTPUTPORT_EDGES_IDX"/> - <column name="source_id" allows-null="true"/> + <column name="edge_source_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -124,7 +124,7 @@ <version strategy="version-number" column="e_version"/> <field name="subworkflow" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="subworkflow_id" allows-null="true"/> + <column name="workflow_subworkflow_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/package.jdo index 7e1844347..d8f2960dc 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:52 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:47 CEST 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" table="workflow" identity-type="datastore"> @@ -13,7 +13,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOW_NODES_IDX"/> - <column name="workflow_id" allows-null="true"/> + <column name="workflownode_workflow_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="edges" persistence-modifier="persistent" delete-action="restrict"> @@ -21,7 +21,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOW_EDGES_IDX"/> - <column name="workflow_id" allows-null="true"/> + <column name="edge_workflow_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="comments" persistence-modifier="persistent" delete-action="restrict"> @@ -29,7 +29,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOW_COMMENTS_IDX"/> - <column name="workflow_id" allows-null="true"/> + <column name="comment_workflow_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -42,7 +42,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOWNODE_OUTPUTS_IDX"/> - <column name="node_id" allows-null="true"/> + <column name="outputport_node_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="inputs" persistence-modifier="persistent" delete-action="restrict"> @@ -50,7 +50,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOWNODE_INPUTS_IDX"/> - <column name="node_id" allows-null="true"/> + <column name="inputport_node_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="isStart" persistence-modifier="persistent" null-value="exception"/> @@ -62,13 +62,13 @@ <version strategy="version-number" column="e_version"/> <field name="target" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="target_id" allows-null="true"/> + <column name="edge_target_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.InputPortImpl"/> </field> <field name="source" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="source_id" allows-null="true"/> + <column name="edge_source_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.OutputPortImpl"/> </field> @@ -82,7 +82,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="INPUTPORT_EDGES_IDX"/> - <column name="target_id" allows-null="true"/> + <column name="edge_target_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -95,7 +95,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="OUTPUTPORT_EDGES_IDX"/> - <column name="source_id" allows-null="true"/> + <column name="edge_source_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -110,7 +110,7 @@ <version strategy="version-number" column="e_version"/> <field name="subworkflow" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="subworkflow_id" allows-null="false"/> + <column name="workflow_subworkflow_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_a_o/package.jdo index a918cf94e..59ab8cdae 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:22 CEST 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"> @@ -19,7 +19,7 @@ <field name="lonESet" persistence-modifier="persistent"/> <field name="myB" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="myb_id" allows-null="false"/> + <column name="b_myb_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.BImpl"/> </field> @@ -52,7 +52,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <join> - <column name="multianytype_id" allows-null="true"/> + <column name="testany_multianytype_id" allows-null="true"/> </join> <element> <embedded> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_s_o/package.jdo index fbd731bea..2f15aa919 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:44 CEST 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"> @@ -17,7 +17,7 @@ <field name="lonESet" persistence-modifier="persistent"/> <field name="myB" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="myb_id" allows-null="false"/> + <column name="b_myb_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.BImpl"/> </field> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <join> - <column name="multianytype_id" allows-null="true"/> + <column name="testany_multianytype_id" allows-null="true"/> </join> <element> <embedded> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/package.jdo index aa8476097..f0e285426 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:12 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:47 CEST 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"> @@ -18,7 +18,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOK_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="book_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="keyWords" persistence-modifier="persistent" delete-action="restrict"> @@ -26,7 +26,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOK_KEYWORDS_IDX"/> - <column name="keywords_id" allows-null="true"/> + <column name="book_keywords_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="cityByWriter" persistence-modifier="persistent" delete-action="restrict"> @@ -34,7 +34,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOK_CITYBYWRITER_IDX"/> - <column name="citybywriter_id" allows-null="true"/> + <column name="book_citybywriter_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -56,7 +56,7 @@ <field name="key" persistence-modifier="persistent" null-value="none"/> <field name="value" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="value_id" allows-null="true"/> + <column name="writer_value_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl"/> </field> @@ -79,7 +79,7 @@ <version strategy="version-number" column="e_version"/> <field name="key" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="key_id" allows-null="true"/> + <column name="writer_key_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_s_o/package.jdo index 68b42751f..6a57cace9 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:29 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:12 CEST 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"> @@ -16,7 +16,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOK_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="book_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="keyWords" persistence-modifier="persistent" delete-action="restrict"> @@ -24,7 +24,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOK_KEYWORDS_IDX"/> - <column name="keywords_id" allows-null="true"/> + <column name="book_keywords_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="cityByWriter" persistence-modifier="persistent" delete-action="restrict"> @@ -32,7 +32,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOK_CITYBYWRITER_IDX"/> - <column name="citybywriter_id" allows-null="true"/> + <column name="book_citybywriter_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -50,7 +50,7 @@ <field name="key" persistence-modifier="persistent" null-value="none"/> <field name="value" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="value_id" allows-null="true"/> + <column name="writer_value_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl"/> </field> @@ -69,7 +69,7 @@ <version strategy="version-number" column="e_version"/> <field name="key" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="key_id" allows-null="true"/> + <column name="writer_key_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/package.jdo index ff1ed396d..973ddfb77 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:56 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/package.jdo index cb930bd11..070e5fee9 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:21 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/package.jdo index 6808f7fca..7d5f8de12 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:05 CEST 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"> @@ -27,7 +27,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="firstAddress" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="firstaddress_id" allows-null="false"/> + <column name="firstaddressholder_firstaddress_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl"/> </field> @@ -36,7 +36,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ADDRESSLIST_SECONDADDRESS_IDX"/> - <column name="secondaddress_id" allows-null="true"/> + <column name="addresslist_secondaddress_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -62,7 +62,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="FIRSTADDRESSHOLDER_VALUE_IDX"/> - <column name="value_id" allows-null="true"/> + <column name="firstaddressholder_value_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/package.jdo index 16403fcbb..081780c01 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:51 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:28 CEST 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"> @@ -23,7 +23,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="firstAddress" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="firstaddress_id" allows-null="false"/> + <column name="firstaddressholder_firstaddress_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl"/> </field> @@ -32,7 +32,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ADDRESSLIST_SECONDADDRESS_IDX"/> - <column name="secondaddress_id" allows-null="true"/> + <column name="addresslist_secondaddress_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -54,7 +54,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="FIRSTADDRESSHOLDER_VALUE_IDX"/> - <column name="value_id" allows-null="true"/> + <column name="firstaddressholder_value_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/package.jdo index 8cf280269..bac58ecf4 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:43 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:14 CEST 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"> @@ -50,13 +50,13 @@ <field name="groupName" persistence-modifier="persistent" null-value="exception"/> <field name="shipTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="shipto_id" allows-null="true"/> + <column name="address_shipto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl"/> </field> <field name="billTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="billto_id" allows-null="true"/> + <column name="address_billto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/package.jdo index 882ef6248..3fd20317f 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:01 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:38 CEST 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"> @@ -46,13 +46,13 @@ <field name="groupName" persistence-modifier="persistent" null-value="exception"/> <field name="shipTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="shipto_id" allows-null="true"/> + <column name="address_shipto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl"/> </field> <field name="billTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="billto_id" allows-null="true"/> + <column name="address_billto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/package.jdo index 02d30877b..f57126ee7 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:18 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:52 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/package.jdo index ab155fbdc..1f9245604 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:37 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:17 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListUnionAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListUnionAction/mysql_a_o/package.jdo index 5562dec12..2b19c70d2 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListUnionAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListUnionAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:20 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:54 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListUnionAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListUnionAction/mysql_s_o/package.jdo index 793a8091c..acd054e9b 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListUnionAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListUnionAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:40 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:19 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/package.jdo index 6d3b1cc7a..3a51b9ac9 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:28 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:02 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/package.jdo index 9d978f218..502879d5b 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:26 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/package.jdo index 23c1dec7f..17b80a7a9 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:25 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:58 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/package.jdo index 54eeff9ea..e0e766b48 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:45 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:23 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/package.jdo index a1fbc2efe..04a47b8a5 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:34 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:07 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/package.jdo index b920139ce..53bd1dba5 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:54 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:30 CEST 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" table="member" identity-type="datastore"> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/package.jdo index 2b307b26a..c6fe861c9 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:15 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:49 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/package.jdo index ecf135d5d..e3bd564e3 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:34 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:15 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/package.jdo index c5af68773..6c41ec4ac 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:40 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:12 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/package.jdo index 62233d243..9ad48cc90 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:59 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:35 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/package.jdo index a73c03c2f..1b7a194f2 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:45 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:17 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/package.jdo index ebe5203f0..39afe71b3 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:04 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:40 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/package.jdo index 908bc9c6a..8be917c1f 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:19 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/package.jdo index 78474dddf..821a7b8c9 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:07 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:42 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/package.jdo index 3adfb039b..ad2b8178e 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:33 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:59:01 CEST 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"> @@ -18,7 +18,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ADDRESS_COUNTRY_IDX"/> - <column name="country_id" allows-null="true"/> + <column name="address_country_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -36,7 +36,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CITY_ADDRESS_IDX"/> - <column name="address_id" allows-null="true"/> + <column name="city_address_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -54,7 +54,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PERSON_ADDRESS_IDX"/> - <column name="address_id" allows-null="true"/> + <column name="person_address_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/package.jdo index 3d3b3d6f1..cc3147bbc 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:37 CEST 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"> @@ -16,7 +16,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ADDRESS_COUNTRY_IDX"/> - <column name="country_id" allows-null="true"/> + <column name="address_country_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -32,7 +32,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CITY_ADDRESS_IDX"/> - <column name="address_id" allows-null="true"/> + <column name="city_address_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -48,7 +48,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PERSON_ADDRESS_IDX"/> - <column name="address_id" allows-null="true"/> + <column name="person_address_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/package.jdo index dc975a795..b3df71e81 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:24 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:52 CEST 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"> @@ -15,13 +15,13 @@ <field name="name" persistence-modifier="persistent" primary-key="true"/> <field name="father" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="father_name" allows-null="true"/> + <column name="person_father_name" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl.PersonImpl"/> </field> <field name="mother" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="mother_name" allows-null="true"/> + <column name="person_mother_name" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl.PersonImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/package.jdo index 89da83d60..56e37c415 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:59 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:29 CEST 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"> @@ -13,13 +13,13 @@ <field name="name" persistence-modifier="persistent" primary-key="true"/> <field name="father" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="father_name" allows-null="true"/> + <column name="person_father_name" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl.PersonImpl"/> </field> <field name="mother" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="mother_name" allows-null="true"/> + <column name="person_mother_name" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl.PersonImpl"/> </field> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/package.jdo index d6ceab365..ae72331c4 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:27 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:56 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/package.jdo index 368f61216..b42f4e2a0 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:02 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:32 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/package.jdo index 56bf30680..96182aa6d 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:21 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:49 CEST 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"> @@ -56,7 +56,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="THING_THINGS_IDX"/> - <column name="things_name" allows-null="true"/> + <column name="thing_things_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/package.jdo index 335966951..e52ea52b2 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:56 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:27 CEST 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" table="annotation" identity-type="application"> @@ -44,7 +44,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="THING_THINGS_IDX"/> - <column name="things_name" allows-null="true"/> + <column name="thing_things_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/package.jdo index 6be140f8d..a738bf5aa 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:58 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/package.jdo index c113f43ef..8d296564c 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:05 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:34 CEST 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" table="usaddress" identity-type="datastore"> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.MainAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.MainAction/mysql_a_o/package.jdo index 807dc2305..4ecf2f6b2 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.MainAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.MainAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:18 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:43 CEST 2006 --> <jdo> <package name="main.impl"> <class name="main.impl.ChildObject2Impl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore"> @@ -45,7 +45,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BASEGROUP_COMPONENTS_IDX"/> - <column name="group_id" allows-null="true"/> + <column name="basecomponent_group_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.MainAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.MainAction/mysql_s_o/package.jdo index 4ddc4cf8a..4c9ab74be 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.MainAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.MainAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:53 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:24 CEST 2006 --> <jdo> <package name="main.impl"> <class name="main.impl.ChildObject2Impl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="childobject2" identity-type="datastore"> @@ -37,7 +37,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BASEGROUP_COMPONENTS_IDX"/> - <column name="group_id" allows-null="true"/> + <column name="basecomponent_group_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/package.jdo index 5a796b8b7..8287386dd 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:59:04 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/package.jdo index eec7341eb..3b92ec1d0 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/package.jdo +++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/package.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:15 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:40 CEST 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/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/JPOXTestbed.java b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/JPOXTestbed.java index 519f9af33..24befc45a 100644 --- a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/JPOXTestbed.java +++ b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/JPOXTestbed.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: JPOXTestbed.java,v 1.32 2006/09/29 04:36:51 mtaal Exp $ + * $Id: JPOXTestbed.java,v 1.33 2006/09/29 12:29:45 mtaal Exp $ */ package org.eclipse.emf.teneo.jpox.test; @@ -40,7 +40,7 @@ import org.jpox.enhancer.JPOXEnhancer; * The jpox test bed controls the creation of the store and the generation of the mapping file. * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.32 $ + * @version $Revision: 1.33 $ */ public class JPOXTestbed extends Testbed { @@ -89,7 +89,6 @@ public class JPOXTestbed extends Testbed { } else { propFileName = "/local_test.properties"; } - System.err.println("Property File " + propFileName); Testbed.setTestBed(new JPOXTestbed()); } catch (Exception e) { throw new StoreTestException("Exception while checking directory " + RUN_BASE_DIR, e); |