Updated docsbuild_200702071144

12 files changed, 38 insertions, 18 deletions

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 b707050c3..fa8b0e3ab 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.4 $ $Date: 2007/02/01 14:17:49 $
+# @version $Revision: 1.5 $ $Date: 2007/02/05 20:12:06 $
 
 # 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/hibernate_details.html b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/hibernate_details.html
index 2913aba7c..4f372f77c 100644
--- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/hibernate_details.html
+++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/hibernate_details.html
@@ -278,6 +278,9 @@
 <a href="#Client-Server+scenario%3A+requires+explicitly+modelled+id+and+version+properties">Client-Server scenario: requires explicitly modelled id and version properties</a>
 </li>
 <li>
+<a href="#Default+ID+Feature+Name">Default ID Feature Name</a>
+</li>
+<li>
 <a href="#Synthetic+ID+and+Version+properties">Synthetic ID and Version properties</a>
 </li>
 <li>
@@ -424,7 +427,19 @@
 		
 </div>
 		
-<a name="N10093"></a><a name="Synthetic+ID+and+Version+properties"></a>
+<a name="N10093"></a><a name="Default+ID+Feature+Name"></a>
+<div class="h3">
+<h3>Default ID Feature Name</h3>
+		
+<p>When Teneo searches for the id-feature of an eclass it searches for an efeature with the @id annotation. If no efeature with such an annotation
+		can be found Teneo will search for a feature with the name specified in the PersistenceOptions.DEFAULT_ID_FEATURE_NAME option 
+		(see persistence options <a href="options.html">here</a>). A possible use to set this option to "id" and add a feature with 
+		the name "id" to each eclass. This "id" feature is then automatically used as the persistence identifier by Teneo.
+		</p>
+		
+</div>
+		
+<a name="N100A0"></a><a name="Synthetic+ID+and+Version+properties"></a>
 <div class="h3">
 <h3>Synthetic ID and Version properties</h3>
 			
@@ -440,7 +455,7 @@
 		
 </div>
 		
-<a name="N100A3"></a><a name="cutpaste"></a>
+<a name="N100B0"></a><a name="cutpaste"></a>
 <div class="h3">
 <h3>Move an EObject between EContainers or support cut and paste in the EMF editor</h3>
 			
@@ -474,7 +489,7 @@
 		
 </div>
 		
-<a name="N100C4"></a><a name="Validation"></a>
+<a name="N100D1"></a><a name="Validation"></a>
 <div class="h3">
 <h3>Validation</h3>
 			
@@ -510,7 +525,7 @@ public class MyValidator extends EObjectValidator
 		
 </div>
 		
-<a name="N100D8"></a><a name="Default+cacheprovider+is+org.hibernate.cache.HashtableCacheProvider"></a>
+<a name="N100E5"></a><a name="Default+cacheprovider+is+org.hibernate.cache.HashtableCacheProvider"></a>
 <div class="h3">
 <h3>Default cacheprovider is org.hibernate.cache.HashtableCacheProvider</h3>
 			
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 67a519b64..cb4ad282a 100644
--- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/options.html
+++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/options.html
@@ -269,6 +269,11 @@
 		The value is one of NONE, READ_ONLY, NONSTRICT_READ_WRITE, READ_WRITE, TRANSACTIONAL.</li>
 		
 <li>
+<strong>PersistenceOptions.DEFAULT_ID_FEATURE_NAME</strong>: with this option it is possible to let Teneo automatically identify the id-property. 
+		All efeatures with this name are used as persistence id. The default value is e_id (same as for the default id column name). To ensure that no efeature is 
+		by accident considered as the id-feature this should be set to an empty string.</li>
+		
+<li>
 <strong>PersistenceOptions.DEFAULT_TEMPORAL_VALUE</strong>: this option controls the default mapping to use for temporal (e.g. java.util.Date) properties.
 		The default is TIMESTAMP, other allowed values are DATE, TIME.</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 e21eee4cd..1094d864c 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.9 $ $Date: 2007/02/01 14:17:47 $
+	@version $Revision: 1.10 $ $Date: 2007/02/05 20:12:02 $
 --><!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 28ef769c8..df1862330 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.10 2007/02/01 14:17:48 mtaal Exp $
+ * $Id: Dynamic.java,v 1.11 2007/02/05 20:12:02 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.10 $
+ * @version $Revision: 1.11 $
 */
 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 121c98bdb..e7b52995b 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.10 2007/02/01 14:17:48 mtaal Exp $
+ * $Id: QuickStart.java,v 1.11 2007/02/05 20:12:02 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.10 $
+ * @version $Revision: 1.11 $
 */
 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 1e6cb753c..880115cd4 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.10 2007/02/01 14:17:48 mtaal Exp $
+ * $Id: Tutorial1.java,v 1.11 2007/02/05 20:12:02 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.10 $
+ * @version $Revision: 1.11 $
  */
 public class Tutorial1 {
 
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 a49c9b6a8..2d0f70d79 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.10 2007/02/01 14:17:48 mtaal Exp $
+ * $Id: Tutorial1.java,v 1.11 2007/02/05 20:12:02 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.10 $
+ * @version $Revision: 1.11 $
  */
 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 35549b0ab..abd3a8132 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.8 2007/02/01 14:17:42 mtaal Exp $
+/* $Id: inst.css,v 1.9 2007/02/05 20:12:02 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 1e305f527..018d265ed 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.8 2007/02/01 14:17:41 mtaal Exp $
+/* $Id: ns4_only.css,v 1.9 2007/02/05 20:12:02 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 20c8e54a6..95d3100eb 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.8 2007/02/01 14:17:41 mtaal Exp $ */
+/* $Id: print.css,v 1.9 2007/02/05 20:12:02 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 60068398e..095b4ea5f 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.8 2007/02/01 14:17:41 mtaal Exp $
+/* $Id: tigris.css,v 1.9 2007/02/05 20:12:01 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. */