See update in 0_7_maintenance releasebuild_200702120438

17 files changed, 100 insertions, 29 deletions

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 5ae486a0f..45f650583 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
@@ -282,6 +282,12 @@
 <li>
 <a href="#lob_notes">Lob annotation</a>
 </li>
+<li>
+<a href="#EMF+ID+Attribute">EMF ID Attribute</a>
+</li>
+<li>
+<a href="#Extra+CASCADE+type%3A+NONE">Extra CASCADE type: NONE</a>
+</li>
 </ul>
 </li>
 </ul>
@@ -530,6 +536,22 @@
 &lt;/xsd:element&gt;
 				</pre>
 </div>
+						
+<a name="N1013F"></a><a name="EMF+ID+Attribute"></a>
+<div class="h4">
+<h4>EMF ID Attribute</h4>
+<p>When an eattribute has its ID property set to true and there is no @Id annotated eattribute in the 
+			eclass then the ID eattribute is used. This default behavior can be changed using the option:
+			<a href="options.html">ID_FEATURE_AS_PRIMARY_KEY</a>.</p>
+</div>
+			
+<a name="N1014C"></a><a name="Extra+CASCADE+type%3A+NONE"></a>
+<div class="h4">
+<h4>Extra CASCADE type: NONE</h4>
+<p>Teneo will automatically set the cascade annotation when no cascade annotation has been set on an 
+			assocation. To also support no-cascading behavior the additional CascadeType NONE is supported by
+			Teneo.</p>
+</div>
 			
 		
 </div>
diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/features.html b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/features.html
index 5b604507b..0d57ccbf9 100644
--- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/features.html
+++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/features.html
@@ -287,7 +287,7 @@
 				
 <li>Feature maps</li>
 				
-<li>EMap</li>
+<li>EMap (only eager loading)</li>
 				
 <li>Notifications and adapters (limited testing done)</li>
 				
diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/gmftutorial/teneo.mindmap b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/gmftutorial/teneo.mindmap
index fa8b0e3ab..f5ef36515 100644
--- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/gmftutorial/teneo.mindmap
+++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/gmftutorial/teneo.mindmap
@@ -7,7 +7,7 @@
 #
 
 # @author <a href="mtaal@elver.org">Martin Taal</a>
-# @version $Revision: 1.5 $ $Date: 2007/02/05 20:12:06 $
+# @version $Revision: 1.6 $ $Date: 2007/02/11 21:56:14 $
 
 # name: the name under which this information is used to register a EMFDataStore/Session Factory. Must be 
 # 		unique. IMPORTANT: this should be the same name as used in the calls to HibernateHelper
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 e66e09a8e..125ff1bd6 100644
--- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/index.html
+++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/index.html
@@ -251,7 +251,7 @@
 <div class="app" id="projecthome">
 <ul class="minitoc">
 <li>
-<a href="#Elver+Persistency+has+moved+to+Eclipse.org+as+Teneo+within+EMFT">Elver Persistency has moved to Eclipse.org as Teneo within EMFT</a>
+<a href="#Elver+Persistency+is+part+of+Eclipse.org+as+Teneo+within+EMFT">Elver Persistency is part of Eclipse.org as Teneo within EMFT</a>
 </li>
 <li>
 <a href="#EMF+Persistency+Solution+using+Hibernate">EMF Persistency Solution using Hibernate</a>
@@ -264,13 +264,13 @@
 </li>
 </ul>
 		
-<a name="N1000D"></a><a name="Elver+Persistency+has+moved+to+Eclipse.org+as+Teneo+within+EMFT"></a>
+<a name="N1000D"></a><a name="Elver+Persistency+is+part+of+Eclipse.org+as+Teneo+within+EMFT"></a>
 <div class="h3">
-<h3>Elver Persistency has moved to Eclipse.org as Teneo within EMFT</h3>
+<h3>Elver Persistency is part of Eclipse.org as Teneo within EMFT</h3>
 			
 			
 <p>
-<strong>Elver persistency has moved to eclipse.org as the Teneo project within EMFT:</strong>
+<strong>Elver persistency is part of eclipse.org as the Teneo project within EMFT:</strong>
 </p>
 			
 <ul>
@@ -301,7 +301,7 @@
 				</p>
 			
 <p>
-<strong>Current version (Teneo): 0.7.5 BETA for Eclipse 3.2/EMF 2.2/Hibernate3.2 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, 0.8.0 BETA for Eclipse 3.3/EMF 2.3/Hibernate 3.2 and jdk 1.5,
 			<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 cb4ad282a..ce480f04f 100644
--- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/options.html
+++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/options.html
@@ -291,6 +291,11 @@
 		type. Default the id column name is e_id, however not all databases support _ in the name.</li>
 		
 <li>
+<strong>ID_FEATURE_AS_PRIMARY_KEY</strong>: as a default eattributes with ID=true will be denoted as the primary key
+		of the eclass. If this feature (default is true) is set to false then this default behavior is disabled.
+		</li>
+		
+<li>
 <strong>PersistenceOptions.INHERITANCE_MAPPING</strong>: the default inheritance mapping strategy to use, this can be
 		JOINED or SINGLE_TABLE, see <a href="inheritance.html">here</a> for more information. Default is SINGLE_TABLE.</li>
 		
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 1094d864c..aa30360f6 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.10 $ $Date: 2007/02/05 20:12:02 $
+	@version $Revision: 1.11 $ $Date: 2007/02/11 21:56:13 $
 --><!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "document-v13.dtd">
 <document> 
 &#9;<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 df1862330..a14741e54 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.11 2007/02/05 20:12:02 mtaal Exp $
+ * $Id: Dynamic.java,v 1.12 2007/02/11 21:56:14 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.11 $
+ * @version $Revision: 1.12 $
 */
 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 e7b52995b..495520dd7 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.11 2007/02/05 20:12:02 mtaal Exp $
+ * $Id: QuickStart.java,v 1.12 2007/02/11 21:56:14 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.11 $
+ * @version $Revision: 1.12 $
 */
 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 880115cd4..531880782 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.11 2007/02/05 20:12:02 mtaal Exp $
+ * $Id: Tutorial1.java,v 1.12 2007/02/11 21:56:14 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.11 $
+ * @version $Revision: 1.12 $
  */
 public class Tutorial1 {
 
diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/index.html b/doc/org.eclipse.emf.teneo.doc/tutorials/index.html
index 8160cfd8e..bec4c298d 100644
--- a/doc/org.eclipse.emf.teneo.doc/tutorials/index.html
+++ b/doc/org.eclipse.emf.teneo.doc/tutorials/index.html
@@ -128,7 +128,7 @@
 <div class="app" id="projecthome">
 <ul class="minitoc">
 <li>
-<a href="#Elver+Persistency+has+moved+to+Eclipse.org+as+Teneo+within+EMFT">Elver Persistency has moved to Eclipse.org as Teneo within EMFT</a>
+<a href="#Elver+Persistency+is+part+of+Eclipse.org+as+Teneo+within+EMFT">Elver Persistency is part of Eclipse.org as Teneo within EMFT</a>
 </li>
 <li>
 <a href="#Introduction">Introduction</a>
@@ -136,15 +136,18 @@
 <li>
 <a href="#EMF+Persistency">EMF Persistency</a>
 </li>
+<li>
+<a href="#Support+for+EMF+2.2+%28release+0.7.5%29+and+EMF+2.3+%28release+0.8.0%29">Support for EMF 2.2 (release 0.7.5) and EMF 2.3 (release 0.8.0)</a>
+</li>
 </ul>
 		
-<a name="N1000D"></a><a name="Elver+Persistency+has+moved+to+Eclipse.org+as+Teneo+within+EMFT"></a>
+<a name="N1000D"></a><a name="Elver+Persistency+is+part+of+Eclipse.org+as+Teneo+within+EMFT"></a>
 <div class="h3">
-<h3>Elver Persistency has moved to Eclipse.org as Teneo within EMFT</h3>
+<h3>Elver Persistency is part of Eclipse.org as Teneo within EMFT</h3>
 			
 			
 <p>
-<strong>Elver persistency has moved to eclipse.org as the Teneo project within EMFT:</strong>
+<strong>Elver persistency is part of eclipse.org as the Teneo project within EMFT:</strong>
 </p>
 			
 <ul>
@@ -199,6 +202,25 @@
 				</p>
 		
 </div>
+		
+<a name="N10050"></a><a name="Support+for+EMF+2.2+%28release+0.7.5%29+and+EMF+2.3+%28release+0.8.0%29"></a>
+<div class="h3">
+<h3>Support for EMF 2.2 (release 0.7.5) and EMF 2.3 (release 0.8.0)</h3>
+		
+<p>Teneo now supports both EMF 2.2 and EMF 2.3. EMF 2.3 is the next release of EMF with support for java jdk 1.5 generics. Teneo supports
+		both EMF versions as follows:</p>
+		
+<ul>
+		
+<li>EMF 2.2: for this EMF version the Teneo release numbered 0.7.5 should be used. This Teneo version is distributed as a Maintenance 
+		release (release number starts with M).</li>
+		
+<li>EMF 2.3: for this EMF version the Teneo release numbered 0.8.0 should be used. This Teneo version is distributed as an Integration 
+		release (release number starts with I).</li>
+		
+</ul>
+		
+</div>
 	
 </div>
 </div>
diff --git a/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/ejb3_features.html b/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/ejb3_features.html
index 164e56024..a21ff62c3 100644
--- a/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/ejb3_features.html
+++ b/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/ejb3_features.html
@@ -243,6 +243,12 @@
 <li>
 <a href="#edatatype">Annotations on EDataType</a>
 </li>
+<li>
+<a href="#EMF+ID+Attribute">EMF ID Attribute</a>
+</li>
+<li>
+<a href="#Extra+CASCADE+type%3A+NONE">Extra CASCADE type: NONE</a>
+</li>
 </ul>
 </li>
 </ul>
@@ -374,6 +380,22 @@
 			each EAttribute which uses this EDataType. The annotations on EAttribute level take precedence so if both the EAttribute 
 			and the EDataType have the same annotation then the annotation on the EAttribute is used.</p>
 </div>
+					
+<a name="N100B5"></a><a name="EMF+ID+Attribute"></a>
+<div class="h4">
+<h4>EMF ID Attribute</h4>
+<p>When an eattribute has its ID property set to true and there is no @Id annotated eattribute in the 
+			eclass then the ID eattribute is used. This default behavior can be changed using the option:
+			ID_FEATURE_AS_PRIMARY_KEY.</p>
+</div>
+			
+<a name="N100BE"></a><a name="Extra+CASCADE+type%3A+NONE"></a>
+<div class="h4">
+<h4>Extra CASCADE type: NONE</h4>
+<p>Teneo will automatically set the cascade annotation when no cascade annotation has been set on an 
+			assocation. To also support no-cascading behavior the additional CascadeType NONE is supported by
+			Teneo.</p>
+</div>
 		
 </div>
 	
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 467dd7857..0d782af98 100644
--- a/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/index.html
+++ b/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/index.html
@@ -236,7 +236,7 @@
 <div class="app" id="projecthome">
 <ul class="minitoc">
 <li>
-<a href="#Elver+Persistency+has+moved+to+Eclipse.org+as+Teneo+within+EMFT">Elver Persistency has moved to Eclipse.org as Teneo within EMFT</a>
+<a href="#Elver+Persistency+is+part+of+Eclipse.org+as+Teneo+within+EMFT">Elver Persistency is part of Eclipse.org as Teneo within EMFT</a>
 </li>
 <li>
 <a href="#EMF+Persistency+Solution+using+JDO%2FJPOX">EMF Persistency Solution using JDO/JPOX</a>
@@ -249,13 +249,13 @@
 </li>
 </ul>
 		
-<a name="N1000D"></a><a name="Elver+Persistency+has+moved+to+Eclipse.org+as+Teneo+within+EMFT"></a>
+<a name="N1000D"></a><a name="Elver+Persistency+is+part+of+Eclipse.org+as+Teneo+within+EMFT"></a>
 <div class="h3">
-<h3>Elver Persistency has moved to Eclipse.org as Teneo within EMFT</h3>
+<h3>Elver Persistency is part of Eclipse.org as Teneo within EMFT</h3>
 			
 			
 <p>
-<strong>Elver persistency has moved to eclipse.org as the Teneo project within EMFT:</strong>
+<strong>Elver persistency is part of eclipse.org as the Teneo project within EMFT:</strong>
 </p>
 			
 <ul>
@@ -286,7 +286,7 @@
 				</p>
 			
 <p>
-<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,
+<strong>Current versions (Teneo): 0.7.5 BETA for Eclipse 3.2/EMF 2.2/JPOX 1.1.3 and jdk 1.4, 0.8.0 BETA for Eclipse 3.3/EMF 2.3/JPOX 1.1.3 and jdk 1.5,
 			<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/tutorial1/Tutorial1.java b/doc/org.eclipse.emf.teneo.doc/tutorials/jpox/tutorial1/Tutorial1.java
index 2d0f70d79..352edb1e7 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.11 2007/02/05 20:12:02 mtaal Exp $
+ * $Id: Tutorial1.java,v 1.12 2007/02/11 21:56:14 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.11 $
+ * @version $Revision: 1.12 $
  */
 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 abd3a8132..734cab4af 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.9 2007/02/05 20:12:02 mtaal Exp $
+/* $Id: inst.css,v 1.10 2007/02/11 21:56:13 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 018d265ed..046cc319f 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.9 2007/02/05 20:12:02 mtaal Exp $
+/* $Id: ns4_only.css,v 1.10 2007/02/11 21:56:13 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 95d3100eb..8b0d8bd59 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.9 2007/02/05 20:12:02 mtaal Exp $ */
+/* $Id: print.css,v 1.10 2007/02/11 21:56:13 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 095b4ea5f..e1bee2686 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.9 2007/02/05 20:12:01 mtaal Exp $
+/* $Id: tigris.css,v 1.10 2007/02/11 21:56:13 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. */