diff options
| author | mtaal | 2006-10-27 16:25:36 +0000 |
|---|---|---|
| committer | mtaal | 2006-10-27 16:25:36 +0000 |
| commit | 934a19592e358749fc5b81fb4d88917b84908f47 (patch) | |
| tree | 2ba0e4fae089967523fe63dbfc2bd04ea1abb1d5 | |
| parent | 7bd849018868a56a4a4a58d2351b857354a67025 (diff) | |
| download | org.eclipse.emf.teneo-934a19592e358749fc5b81fb4d88917b84908f47.tar.gz org.eclipse.emf.teneo-934a19592e358749fc5b81fb4d88917b84908f47.tar.xz org.eclipse.emf.teneo-934a19592e358749fc5b81fb4d88917b84908f47.zip | |
Update to 0.7.5 I200610261350
20 files changed, 168 insertions, 49 deletions
diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/download/persistence-mapping-hibernate.xsd b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/download/persistence-mapping-hibernate.xsd index 30581e017..9f9d357e9 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/download/persistence-mapping-hibernate.xsd +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/download/persistence-mapping-hibernate.xsd @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated by Teneo on Wed Sep 06 23:05:39 CEST 2006 --> -<xsd:schema targetNamespace="http://www.eclipse.org/emft/teneo/hibernate/persistence" elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.eclipse.org/emft/teneo/hibernate/persistence"> +<!-- Generated by Teneo on Fri Oct 20 15:18:46 CEST 2006 --> +<xsd:schema targetNamespace="http://www.eclipse.org/emft/teneo" elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.eclipse.org/emft/teneo"> <xsd:element name="persistence-mapping" type="PersistenceMapping"/> <xsd:complexType name="PersistenceMapping"> <xsd:sequence minOccurs="1" maxOccurs="unbounded"> @@ -26,6 +26,7 @@ </xsd:element> <xsd:element name="transient" type="Transient" minOccurs="0"/> <xsd:element name="eclass" type="EClass"/> + <xsd:element name="edatatype" type="EDataType"/> </xsd:choice> <xsd:attribute name="namespace-uri" type="xsd:anyURI" use="required"/> </xsd:complexType> @@ -44,7 +45,7 @@ <xsd:element name="discriminator-column" type="DiscriminatorColumn" minOccurs="0"/> <xsd:element name="discriminator-value" type="xsd:string" minOccurs="0"/> <xsd:element name="embeddable" type="Embeddable" minOccurs="0"/> - <xsd:element name="entity" type="Entity" minOccurs="0"/> + <xsd:element name="cache" type="Cache" minOccurs="0"/> <xsd:element name="id-class" type="xsd:string" minOccurs="0"/> <xsd:element name="inheritance" type="InheritanceType" minOccurs="0"/> <xsd:element name="mapped-superclass" type="MappedSuperclass" minOccurs="0"/> @@ -87,7 +88,7 @@ </xsd:annotation> </xsd:element> <xsd:element name="id-bag" type="IdBag" minOccurs="0"/> - <xsd:element name="map-key" type="Column" minOccurs="0"/> + <xsd:element name="map-key" type="xsd:string" minOccurs="0"/> <xsd:element name="type" type="Type" minOccurs="0"/> <xsd:element name="where" type="xsd:string" minOccurs="0"/> <xsd:element name="id" type="Id" minOccurs="0"/> @@ -117,6 +118,7 @@ <xsd:element name="column" type="Column" minOccurs="0"/> <xsd:element name="embedded" type="Embedded" minOccurs="0"/> <xsd:element name="embedded-id" type="EmbeddedId" minOccurs="0"/> + <xsd:element name="cache" type="Cache" minOccurs="0"/> <xsd:element name="cascade" type="CascadeType" minOccurs="0"/> <xsd:element name="collection-of-elements" type="CollectionOfElements" minOccurs="0"/> <xsd:element name="columns" type="Column" minOccurs="0" maxOccurs="unbounded"> @@ -125,7 +127,7 @@ </xsd:annotation> </xsd:element> <xsd:element name="id-bag" type="IdBag" minOccurs="0"/> - <xsd:element name="map-key" type="Column" minOccurs="0"/> + <xsd:element name="map-key" type="xsd:string" minOccurs="0"/> <xsd:element name="where" type="xsd:string" minOccurs="0"/> <xsd:element name="join-column" type="JoinColumn" minOccurs="0" maxOccurs="unbounded"> <xsd:annotation> @@ -156,36 +158,75 @@ <xsd:appinfo source="teneo/internal/EStructuralFeatureName">attributeOverrides</xsd:appinfo> </xsd:annotation> </xsd:element> + <xsd:element name="attribute-override" type="AttributeOverride" minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:appinfo source="teneo/internal/EStructuralFeatureName">attributeOverrides</xsd:appinfo> + </xsd:annotation> + </xsd:element> <xsd:element name="basic" type="Basic" minOccurs="0"/> <xsd:element name="column" type="Column" minOccurs="0"/> + <xsd:element name="column" type="Column" minOccurs="0"/> + <xsd:element name="embedded" type="Embedded" minOccurs="0"/> + <xsd:element name="embedded-id" type="EmbeddedId" minOccurs="0"/> <xsd:element name="enumerated" type="EnumType" minOccurs="0"/> <xsd:element name="generated-value" type="GeneratedValue" minOccurs="0"/> + <xsd:element name="cache" type="Cache" minOccurs="0"/> <xsd:element name="cascade" type="CascadeType" minOccurs="0"/> + <xsd:element name="cascade" type="CascadeType" minOccurs="0"/> + <xsd:element name="collection-of-elements" type="CollectionOfElements" minOccurs="0"/> <xsd:element name="collection-of-elements" type="CollectionOfElements" minOccurs="0"/> <xsd:element name="columns" type="Column" minOccurs="0" maxOccurs="unbounded"> <xsd:annotation> <xsd:appinfo source="teneo/internal/EStructuralFeatureName">hbColumns</xsd:appinfo> </xsd:annotation> </xsd:element> + <xsd:element name="columns" type="Column" minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:appinfo source="teneo/internal/EStructuralFeatureName">hbColumns</xsd:appinfo> + </xsd:annotation> + </xsd:element> <xsd:element name="id-bag" type="IdBag" minOccurs="0"/> - <xsd:element name="map-key" type="Column" minOccurs="0"/> + <xsd:element name="id-bag" type="IdBag" minOccurs="0"/> + <xsd:element name="map-key" type="xsd:string" minOccurs="0"/> + <xsd:element name="map-key" type="xsd:string" minOccurs="0"/> <xsd:element name="type" type="Type" minOccurs="0"/> <xsd:element name="where" type="xsd:string" minOccurs="0"/> + <xsd:element name="where" type="xsd:string" minOccurs="0"/> <xsd:element name="id" type="Id" minOccurs="0"/> <xsd:element name="join-column" type="JoinColumn" minOccurs="0" maxOccurs="unbounded"> <xsd:annotation> <xsd:appinfo source="teneo/internal/EStructuralFeatureName">joinColumns</xsd:appinfo> </xsd:annotation> </xsd:element> + <xsd:element name="join-column" type="JoinColumn" minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:appinfo source="teneo/internal/EStructuralFeatureName">joinColumns</xsd:appinfo> + </xsd:annotation> + </xsd:element> + <xsd:element name="join-table" type="JoinTable" minOccurs="0"/> <xsd:element name="join-table" type="JoinTable" minOccurs="0"/> <xsd:element name="lob" type="Lob" minOccurs="0"/> + <xsd:element name="many-to-many" type="ManyToMany" minOccurs="0"/> + <xsd:element name="many-to-one" type="ManyToOne" minOccurs="0"/> + <xsd:element name="one-to-many" type="OneToMany" minOccurs="0"/> <xsd:element name="one-to-many" type="OneToMany" minOccurs="0"/> + <xsd:element name="one-to-one" type="OneToOne" minOccurs="0"/> + <xsd:element name="order-by" type="xsd:string" minOccurs="0"/> + <xsd:element name="primary-key-join-column" type="PrimaryKeyJoinColumn" minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:appinfo source="teneo/internal/EStructuralFeatureName">primaryKeyJoinColumns</xsd:appinfo> + </xsd:annotation> + </xsd:element> + <xsd:element name="sequence-generator" type="SequenceGenerator" minOccurs="0"/> <xsd:element name="sequence-generator" type="SequenceGenerator" minOccurs="0"/> <xsd:element name="table-generator" type="TableGenerator" minOccurs="0"/> + <xsd:element name="table-generator" type="TableGenerator" minOccurs="0"/> <xsd:element name="temporal" type="TemporalType" minOccurs="0"/> <xsd:element name="transient" type="Transient" minOccurs="0"/> + <xsd:element name="transient" type="Transient" minOccurs="0"/> <xsd:element name="version" type="Version" minOccurs="0"/> </xsd:choice> + <xsd:attribute name="name" type="xsd:token" use="required"/> </xsd:complexType> <xsd:complexType name="EDataType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> @@ -206,7 +247,7 @@ </xsd:annotation> </xsd:element> <xsd:element name="id-bag" type="IdBag" minOccurs="0"/> - <xsd:element name="map-key" type="Column" minOccurs="0"/> + <xsd:element name="map-key" type="xsd:string" minOccurs="0"/> <xsd:element name="type" type="Type" minOccurs="0"/> <xsd:element name="where" type="xsd:string" minOccurs="0"/> <xsd:element name="id" type="Id" minOccurs="0"/> @@ -226,6 +267,20 @@ </xsd:choice> <xsd:attribute name="name" type="xsd:token" use="required"/> </xsd:complexType> +<xsd:complexType name="Cache"> + <xsd:attribute name="include" type="xsd:string" use="optional"/> + <xsd:attribute name="region" type="xsd:string" use="optional"/> + <xsd:attribute name="usage" type="CacheConcurrencyStrategy" use="optional"/> +</xsd:complexType> +<xsd:simpleType name="CacheConcurrencyStrategy"> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="NONE"/> + <xsd:enumeration value="READ_ONLY"/> + <xsd:enumeration value="NONSTRICT_READ_WRITE"/> + <xsd:enumeration value="READ_WRITE"/> + <xsd:enumeration value="TRANSACTIONAL"/> + </xsd:restriction> +</xsd:simpleType> <xsd:complexType name="CollectionOfElements"> <xsd:attribute name="fetch" type="FetchType" use="optional"/> <xsd:attribute name="target-element" type="xsd:string" use="optional"/> @@ -370,7 +425,7 @@ <xsd:appinfo source="teneo/internal/EStructuralFeatureName">joinColumns</xsd:appinfo> </xsd:annotation> </xsd:element> - <xsd:element name="unique-constraint" type="UniqueConstraint" minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="unique-constraint" type="xsd:string" minOccurs="0" maxOccurs="unbounded"> <xsd:annotation> <xsd:appinfo source="teneo/internal/EStructuralFeatureName">uniqueConstraints</xsd:appinfo> </xsd:annotation> @@ -434,7 +489,7 @@ <xsd:appinfo source="teneo/internal/EStructuralFeatureName">pkJoinColumns</xsd:appinfo> </xsd:annotation> </xsd:element> - <xsd:element name="unique-constraint" type="UniqueConstraint" minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="unique-constraint" type="xsd:string" minOccurs="0" maxOccurs="unbounded"> <xsd:annotation> <xsd:appinfo source="teneo/internal/EStructuralFeatureName">uniqueConstraints</xsd:appinfo> </xsd:annotation> @@ -452,7 +507,7 @@ </xsd:complexType> <xsd:complexType name="Table"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="unique-constraint" type="UniqueConstraint" minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="unique-constraint" type="xsd:string" minOccurs="0" maxOccurs="unbounded"> <xsd:annotation> <xsd:appinfo source="teneo/internal/EStructuralFeatureName">uniqueConstraints</xsd:appinfo> </xsd:annotation> @@ -464,7 +519,7 @@ </xsd:complexType> <xsd:complexType name="TableGenerator"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="unique-constraint" type="UniqueConstraint" minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="unique-constraint" type="xsd:string" minOccurs="0" maxOccurs="unbounded"> <xsd:annotation> <xsd:appinfo source="teneo/internal/EStructuralFeatureName">uniqueConstraints</xsd:appinfo> </xsd:annotation> diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/ejb3_features.html b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/ejb3_features.html index c95bb1566..bbbd6b364 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/ejb3_features.html +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/ejb3_features.html @@ -407,6 +407,8 @@ <ul> +<li>Cache</li> + <li>Columns</li> <li>GenericGenerator</li> @@ -421,12 +423,12 @@ </div> -<a name="N100D4"></a><a name="Annotation+notes"></a> +<a name="N100D7"></a><a name="Annotation+notes"></a> <div class="h3"> <h3>Annotation notes</h3> -<a name="N100DA"></a><a name="edatatype"></a> +<a name="N100DD"></a><a name="edatatype"></a> <div class="h4"> <h4>Annotations on EDataType</h4> <p>Every JPA annotation which is relevant for a non-reference type java member can also be specified on an EDataType. @@ -436,7 +438,7 @@ and the EDataType have the same annotation then the annotation on the EAttribute is used.</p> </div> -<a name="N100E3"></a><a name="transient"></a> +<a name="N100E6"></a><a name="transient"></a> <div class="h4"> <h4>Transient on EClass</h4> <p>The Transient annotation can also be used on an EClass. This prevents an EClass from being mapped and be persisted.</p> @@ -445,7 +447,7 @@ </div> -<a name="N100F0"></a><a name="Unique+annotation+added+to+OneToMany+to+force+a+join+table+for+1%3An+relations"></a> +<a name="N100F3"></a><a name="Unique+annotation+added+to+OneToMany+to+force+a+join+table+for+1%3An+relations"></a> <div class="h4"> <h4>Unique annotation added to OneToMany to force a join table for 1:n relations</h4> <p>In a relational database 1:n relations are often modeled by adding a foreign-key (to the @@ -467,7 +469,7 @@ </div> -<a name="N10104"></a><a name="indexed"></a> +<a name="N10107"></a><a name="indexed"></a> <div class="h4"> <h4>Indexed Annotation</h4> <p>The http://annotation.elver.org/Indexed annotation can be used to signal to Elver that a certain association does @@ -477,7 +479,7 @@ </div> -<a name="N10111"></a><a name="EmbeddedID+annotation"></a> +<a name="N10114"></a><a name="EmbeddedID+annotation"></a> <div class="h4"> <h4>EmbeddedID annotation</h4> <p>EmbeddedID lets you use an embedded class as an entity's composite primary key.</p> @@ -489,7 +491,7 @@ </div> -<a name="N10122"></a><a name="lob_notes"></a> +<a name="N10125"></a><a name="lob_notes"></a> <div class="h4"> <h4>Lob annotation</h4> <p> diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/ejb3_format.html b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/ejb3_format.html index babd98ed7..1e3167759 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/ejb3_format.html +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/ejb3_format.html @@ -263,8 +263,13 @@ with a TYPE target can be used for EMF EClasses, annotations with METHOD and FIELD targets can be used for EStructuralFeatures. <em>Note:</em> JPA annotations relevant for a non-reference type java member can also be set on an EDataType (see <a href="ejb3_features.html#edatatype">here</a> for more information).</p> + +<p> +<em>Note: </em> when specifying enumerated values then the constant value of the enumeration should be used without the annotation class name. + For example the annotation: @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) + should (in Teneo) be written as: @Cache(usage = NONSTRICT_READ_WRITE) (without quotes)</p> -<a name="N1001D"></a><a name="target"></a> +<a name="N10022"></a><a name="target"></a> <div class="h3"> <h3>JPA Annotations in EAnnotations using the java annotation syntax</h3> @@ -283,7 +288,7 @@ </div> -<a name="N10037"></a><a name="xml"></a> +<a name="N1003C"></a><a name="xml"></a> <div class="h3"> <h3>JPA Annotations in XML</h3> @@ -301,7 +306,7 @@ </div> -<a name="N1004B"></a><a name="simplenokeyvalye"></a> +<a name="N10050"></a><a name="simplenokeyvalye"></a> <div class="h3"> <h3>Simple Annotation Example</h3> @@ -328,7 +333,7 @@ </div> -<a name="N10063"></a><a name="simple"></a> +<a name="N10068"></a><a name="simple"></a> <div class="h3"> <h3>Annotation with key-value</h3> @@ -358,7 +363,7 @@ </div> -<a name="N1007E"></a><a name="multi"></a> +<a name="N10083"></a><a name="multi"></a> <div class="h3"> <h3>Complex Annotation with multi-level structure</h3> diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/index.html b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/index.html index 1759207cb..ee659ff62 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/index.html +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/index.html @@ -289,7 +289,7 @@ </p> <p> -<strong>Current version (Teneo): 0.7.5 BETA for Eclipse 3.2/EMF 2.2/Hibernate3.2rc4 and jdk 1.4 and later, +<strong>Current version (Teneo): 0.7.5 BETA for Eclipse 3.2/EMF 2.2/Hibernate3.2 and jdk 1.4 and later, <a href="status.html">Status</a>, <a href="features.html">Features</a>, <a href="changelog.html">Changelog</a></strong> </p> diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/options.html b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/options.html index 838786eb1..10926263f 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/options.html +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/options.html @@ -252,6 +252,11 @@ no other eattribute has a version annotation. If set to false then the version property is not added automatically.</li> <li> +<strong>PersistenceOptions.DEFAULT_CACHE_STRATEGY</strong>: this option allows you to set second level caching at a global level. + If set to a value other than NONE then all EClasses and collection EFeatures will have caching set. + The value is one of NONE, READ_ONLY, NONSTRICT_READ_WRITE, READ_WRITE, TRANSACTIONAL.</li> + +<li> <strong>PersistenceOptions.DISABLE_ECONTAINER_MAPPING</strong>: this option (boolean) controls if the container relations are mapped explicitly in the database, see also <a href="hibernate_relations.html#Storing+container+relation">here</a>.</li> @@ -273,6 +278,13 @@ for one-to-many non-contained associations.</li> <li> +<strong>PersistenceOptions.JOIN_TABLE_NAMING_STRATEGY</strong>: string option which + can have two values: ejb3 (=default) or unique. In ejb3 a join table name is the concatenation of the two entity names with an underscore (_) separator. + The unique value will create a join table with the name of the refering entity name and estructural feature name, + e.g. Writer_books in the Library example. + </li> + +<li> <strong>PersistenceOptions.MAXIMUM_SQL_NAME_LENGTH</strong>: can be used to control the column and table name length. This is especially relevant in case the default annotation process creates foreign key columns or your property names are too long. Foreign key column names are created by concatenating the name of the (e)class and the propertyname. The resulting name can be to long for certain databases. diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/resource_utility.xml b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/resource_utility.xml index 0742d7d9b..d9f2531d5 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/resource_utility.xml +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/resource_utility.xml @@ -6,7 +6,7 @@ http://www.eclipse.org/legal/epl-v10.html --><!-- @author <a href="mtaal@elver.org">Martin Taal</a> - @version $Revision: 1.2 $ $Date: 2006/10/15 08:39:22 $ + @version $Revision: 1.3 $ $Date: 2006/10/27 16:25:36 $ --><!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "document-v13.dtd"> <document> 	<header> diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/samples/Dynamic.java b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/samples/Dynamic.java index 320aef9a2..7dd07f40b 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/samples/Dynamic.java +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/samples/Dynamic.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: Dynamic.java,v 1.3 2006/10/15 08:39:23 mtaal Exp $ + * $Id: Dynamic.java,v 1.4 2006/10/27 16:25:38 mtaal Exp $ */ package hbtutorial; @@ -41,7 +41,7 @@ import org.hibernate.Transaction; * Dynamic Tutorial * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public class Dynamic { diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/samples/QuickStart.java b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/samples/QuickStart.java index e3fe69ad6..949f661cf 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/samples/QuickStart.java +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/samples/QuickStart.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: QuickStart.java,v 1.3 2006/10/15 08:39:23 mtaal Exp $ + * $Id: QuickStart.java,v 1.4 2006/10/27 16:25:38 mtaal Exp $ */ package hbtutorial; @@ -33,7 +33,7 @@ import org.hibernate.Transaction; * Quick Start Tutorial * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public class QuickStart { diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/samples/Tutorial1.java b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/samples/Tutorial1.java index 9a98b8bf6..14359be71 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/samples/Tutorial1.java +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/samples/Tutorial1.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: Tutorial1.java,v 1.3 2006/10/15 08:39:23 mtaal Exp $ + * $Id: Tutorial1.java,v 1.4 2006/10/27 16:25:38 mtaal Exp $ */ package hbtutorial; @@ -43,7 +43,7 @@ import org.hibernate.SessionFactory; * Quick Start Tutorial * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public class Tutorial1 { diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/testcases.html b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/testcases.html index a7780fca0..eb509687b 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/testcases.html +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/testcases.html @@ -422,7 +422,7 @@ </p> <p>Test cases are run using the following environment: Eclipse 3.2/EMF 2.2, jdk 1.4.2, Hibernate 3.1.3. - Mysql 4.1.14 and SQL Server 2000 and 2005.</p> + Mysql 4.1.14 and SQL Server.</p> <a name="N10018"></a><a name="download"></a> <div class="h3"> diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/troubleshooting.html b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/troubleshooting.html index 8cd88f33b..6bd8d1d70 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/troubleshooting.html +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/troubleshooting.html @@ -300,6 +300,9 @@ <li> <a href="#Teneo+does+not+see+my+changes+in+the+ecore+model">Teneo does not see my changes in the ecore model</a> </li> +<li> +<a href="#JoinTable+name+clash">JoinTable name clash</a> +</li> </ul> <br> @@ -620,6 +623,15 @@ at org.eclipse.ui.part.MultiPageEditorPart.createPartControl(MultiPageEditorPart file the model code needs to be regenerated.</p> </div> + +<a name="N10158"></a><a name="JoinTable+name+clash"></a> +<div class="h3"> +<h3>JoinTable name clash</h3> + +<p>If you have two EReferences between two EClasses then it is possible that you will get a jointable name clash. To + prevent this set the PersistenceOptions.JOIN_TABLE_NAMING_STRATEGY to unique (see <a href="options.html">here</a>).</p> + +</div> </div> </div> diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/tutorialtwo/tutorial2_1.html b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/tutorialtwo/tutorial2_1.html index bbc078c25..7a48b0b69 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/tutorialtwo/tutorial2_1.html +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/tutorialtwo/tutorial2_1.html @@ -304,16 +304,26 @@ public void start(BundleContext context) throws Exception <li>The above source code uses the database library. This database has to exist (but can be empty).</li> +<li>The name of the datastore is chosen on purpose. The extension of the resource name (library in this case) + is used to find the datastore, so therefore here the name library is chosen.</li> + <li> -<strong>The name of the datastore is chosen on purpose. The extension of the resource name (library in this case) - is used to find the datastore, so therefore here the name library is chosen.</strong> +<em>If you get this exception then you did not set the Eclipse-BuddyPolicy in the plugin containing the Hibernate libraries + (see <a href="../installation.html#Hibernate+Libraries">here</a>)</em>: + <pre class="code"> +org.hibernate.MappingException: Could not determine type for: + org.eclipse.emf.teneo.hibernate.mapping.econtainer.EContainerUserType, for columns: [org.hibernate.mapping.Column(econtainer_class), org.hibernate.mapping.Column(e_container)] +at org.hibernate.mapping.SimpleValue.getType(SimpleValue.java:266) +at org.hibernate.mapping.SimpleValue.isValid(SimpleValue.java:253) +at org.hibernate.mapping.Property.isValid(Property.java:185) + </pre> </li> </ul> </div> -<a name="N1003C"></a><a name="Resource+Factory+setting"></a> +<a name="N10047"></a><a name="Resource+Factory+setting"></a> <div class="h3"> <h3>Resource Factory setting</h3> @@ -329,7 +339,7 @@ public void start(BundleContext context) throws Exception </div> -<a name="N1004D"></a><a name="Create+valid+EMF+Objects"></a> +<a name="N10058"></a><a name="Create+valid+EMF+Objects"></a> <div class="h3"> <h3>Create valid EMF Objects</h3> diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/index.html b/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/index.html index 9399157a0..ca02c224f 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/index.html +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/index.html @@ -286,7 +286,7 @@ </p> <p> -<strong>Current version (Teneo): 0.7.5 BETA for Eclipse 3.2/EMF 2.2/JPOX 1.1.2 and jdk 1.4 and later, +<strong>Current version (Teneo): 0.7.5 BETA for Eclipse 3.2/EMF 2.2/JPOX 1.1.3 and jdk 1.4 and later, <a href="status.html">Status</a>, <a href="features.html">Features</a>, <a href="changelog.html">Change Log</a></strong> </p> diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/jpoxdatastore.html b/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/jpoxdatastore.html index 5ef4afacc..791dd3eae 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/jpoxdatastore.html +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/jpoxdatastore.html @@ -334,11 +334,11 @@ <ul> -<li> +<li> <strong>PersistenceOptions.UPDATE_SCHEMA</strong>: if set to "false" then the database schema is not updated when initializing a JpoxDataStore. This improves startup times. Default is "true".</li> -<li> +<li> <strong>PersistenceOptions.FETCH_CONTAINMENT_EAGERLY</strong>: if set to "true" will set the fetch strategy of all containment references to EAGER. This means that containment relations are completely read in memory. Default is "false".</li> @@ -346,6 +346,16 @@ <strong>PersistenceOptions.PERSISTENCE_XML</strong>: the location of the xml annotations file. The location should be a resource path.</li> +<li> +<strong>PersistenceOptions.JOIN_TABLE_NAMING_STRATEGY</strong>: string option which + can have two values: ejb3 or unique. In ejb3 a join table name is the concatenation of the two entity names with an underscore (_) separator. + The unique value will create a join table with the name of the refering entity name and estructural feature name, + e.g. Writer_books in the Library example.</li> + +<li> +<strong>PersistenceOptions.JOIN_TABLE_FOR_NON_CONTAINED_ASSOCIATIONS</strong>: boolean, if set to true then always a join table is created + for one-to-many non-contained associations.</li> + </ul> </div> diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/troubleshooting.html b/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/troubleshooting.html index 8042d5d84..641bf9c4c 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/troubleshooting.html +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/troubleshooting.html @@ -279,6 +279,9 @@ <a href="#Update+manager+does+not+find+the+upgrade+of+the+EMF+-+JDO+plugin">Update manager does not find the upgrade of the EMF - JDO plugin</a> </li> <li> +<a href="#JoinTable+name+clash">JoinTable name clash</a> +</li> +<li> <a href="#Editor+does+not+start%2C+the+error+log+gives+a+sql+error+%27Missing+column....%27">Editor does not start, the error log gives a sql error 'Missing column....'</a> </li> <li> @@ -524,7 +527,17 @@ at org.eclipse.ui.internal.PluginAction.runWithEvent(PluginAction.java:246) </div> -<a name="N10117"></a><a name="Editor+does+not+start%2C+the+error+log+gives+a+sql+error+%27Missing+column....%27"></a> +<a name="N10117"></a><a name="JoinTable+name+clash"></a> +<div class="h3"> +<h3>JoinTable name clash</h3> + +<p>If you have two EReferences between two EClasses then it is possible that you will get a jointable name clash. To + prevent this set the PersistenceOptions.JOIN_TABLE_NAMING_STRATEGY to unique. This is only possible if + you programmatically create the jdo mapping file through the JpoxHelper class.</p> + +</div> + +<a name="N10120"></a><a name="Editor+does+not+start%2C+the+error+log+gives+a+sql+error+%27Missing+column....%27"></a> <div class="h3"> <h3>Editor does not start, the error log gives a sql error 'Missing column....'</h3> @@ -533,7 +546,7 @@ at org.eclipse.ui.internal.PluginAction.runWithEvent(PluginAction.java:246) </div> -<a name="N10124"></a><a name="Editor+does+not+start%2C+ClassNotFoundException+on+the+Editor+Plugin%2C+org.jpox.exceptions.ClassNotResolvedException"></a> +<a name="N1012D"></a><a name="Editor+does+not+start%2C+ClassNotFoundException+on+the+Editor+Plugin%2C+org.jpox.exceptions.ClassNotResolvedException"></a> <div class="h3"> <h3>Editor does not start, ClassNotFoundException on the Editor Plugin, org.jpox.exceptions.ClassNotResolvedException</h3> @@ -544,7 +557,7 @@ at org.eclipse.ui.internal.PluginAction.runWithEvent(PluginAction.java:246) </div> -<a name="N1012D"></a><a name="Editor+does+not+start%2C+AssertionFailedException"></a> +<a name="N10136"></a><a name="Editor+does+not+start%2C+AssertionFailedException"></a> <div class="h3"> <h3>Editor does not start, AssertionFailedException</h3> @@ -564,7 +577,7 @@ at org.eclipse.ui.part.MultiPageEditorPart.createPartControl(MultiPageEditorPart </div> -<a name="N1013D"></a><a name="Teneo+does+not+see+my+changes+in+the+ecore+model"></a> +<a name="N10146"></a><a name="Teneo+does+not+see+my+changes+in+the+ecore+model"></a> <div class="h3"> <h3>Teneo does not see my changes in the ecore model</h3> diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/tutorial1/Tutorial1.java b/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/tutorial1/Tutorial1.java index cbe617fea..4ede49f4a 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/tutorial1/Tutorial1.java +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/tutorial1/Tutorial1.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: Tutorial1.java,v 1.3 2006/10/15 08:39:22 mtaal Exp $ + * $Id: Tutorial1.java,v 1.4 2006/10/27 16:25:38 mtaal Exp $ */ package jpoxtutorial; @@ -50,7 +50,7 @@ import org.jpox.PMFConfiguration; * Tutorial * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public class Tutorial1 { diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/skin/inst.css b/doc/org.eclipse.emf.teneo.doc/tutorials/skin/inst.css index 6a0535bef..2e2c1225b 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/skin/inst.css +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/skin/inst.css @@ -1,4 +1,4 @@ -/* $Id: inst.css,v 1.2 2006/10/15 08:39:22 mtaal Exp $ +/* $Id: inst.css,v 1.3 2006/10/27 16:25:36 mtaal Exp $ This file contains rules that extend or override the more basic formatting defined in tigris.css. Edit it to customize the look of applications using tigris.css (instances). You are responsible for maintaining your own set of (optional) deltas from tigris.css defaults; this file is intended as an example. diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/skin/ns4_only.css b/doc/org.eclipse.emf.teneo.doc/tutorials/skin/ns4_only.css index 38191835b..62c5dd147 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/skin/ns4_only.css +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/skin/ns4_only.css @@ -1,4 +1,4 @@ -/* $Id: ns4_only.css,v 1.2 2006/10/15 08:39:22 mtaal Exp $ +/* $Id: ns4_only.css,v 1.3 2006/10/27 16:25:36 mtaal Exp $ simple rules suitable for Netscape 4.x only; richer rules are in tigris.css. see <http://style.tigris.org/> */ diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/skin/print.css b/doc/org.eclipse.emf.teneo.doc/tutorials/skin/print.css index d67adae5c..2d84d1fee 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/skin/print.css +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/skin/print.css @@ -1,4 +1,4 @@ -/* $Id: print.css,v 1.2 2006/10/15 08:39:22 mtaal Exp $ */ +/* $Id: print.css,v 1.3 2006/10/27 16:25:36 mtaal Exp $ */ #banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks { display: none; diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/skin/tigris.css b/doc/org.eclipse.emf.teneo.doc/tutorials/skin/tigris.css index 41c591f34..35cc535cd 100644 --- a/doc/org.eclipse.emf.teneo.doc/tutorials/skin/tigris.css +++ b/doc/org.eclipse.emf.teneo.doc/tutorials/skin/tigris.css @@ -1,4 +1,4 @@ -/* $Id: tigris.css,v 1.2 2006/10/15 08:39:22 mtaal Exp $ +/* $Id: tigris.css,v 1.3 2006/10/27 16:25:36 mtaal Exp $ This file defines basic default formatting for HTML conforming to Tigris application style. To extend or override these rules for your instance, edit inst.css instead of this file. */ |