[218257]

[218241]
[218242]

12 files changed, 81 insertions, 39 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 170cc8406..44fe254db 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.20 $ $Date: 2008/02/03 22:35:07 $
+# @version $Revision: 1.21 $ $Date: 2008/02/11 10:01:07 $
 
 # 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/hbdatastore.html b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/hbdatastore.html
index e471df02d..eed5ff9c6 100644
--- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/hbdatastore.html
+++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/hbdatastore.html
@@ -286,6 +286,9 @@
 <a href="#entitydatastore">HbEntityDataStore, support for Hibernate EntityManager</a>
 </li>
 <li>
+<a href="#spring">Spring configuration and the HbSessionDataStore/HbEntityDataStore</a>
+</li>
+<li>
 <a href="#options">Runtime Options</a>
 </li>
 <li>
@@ -361,7 +364,44 @@
 		
 </div>			
 		
-<a name="N1005C"></a><a name="options"></a>
+<a name="N1005C"></a><a name="spring"></a>
+<div class="h3">
+<h3>Spring configuration and the HbSessionDataStore/HbEntityDataStore</h3>
+			
+			
+<p>It is possible to use the HbSessionDataStore and HbEntityDataStore as a sessionFactory or entityManagerFactory for Spring. 
+			The HbSessionDataStore implements the SessionFactory and the HbEntityDataStore implements the EntityManagerFactory interface.</p>
+			
+<p>To configure the datastore through Spring and let Spring use it as a sessionFactory/entityManagerFactory, follow these guidelines:</p>
+			
+<p>Define a bean declaration in your applicationContext.xml with id set to "sessionFactory" or "entityManagerFactory" and the 
+			class attribute set to resp. the HbSessionDataStore or HbEntityDataStore classname. The properties of the datastore have 
+			to be set as follows</p>
+			
+<ul>
+			
+<li>name: set the name property of the datastore.</li>
+			
+<li>persistenceProperties: set the persistenceProperties using standard Spring methods for setting properties.</li>
+			
+<li>hibernateProperties: set the hibernateProperties using standard Spring methods for setting properties.
+			The hibernateProperties also define the datasource or jdbc parameters, so a separate persistence.xml is not required (and not used).</li>
+			
+<li>ePackageClasses: set the epackage class names through the ePackageClasses property on the HbSessionDataStore/HbEntityDataStore.
+			The ePackageClasses property is a list of strings, with each string containing the classname of the EPackage Impl class, for 
+			example: org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryPackageImpl.
+			</li>
+			
+</ul>
+			
+<p>
+<strong>This Spring configuration is not tested using a separate testcase, let us know if the above description needs to be corrected.</strong>
+</p>
+		
+</div>
+		
+		
+<a name="N1007F"></a><a name="options"></a>
 <div class="h3">
 <h3>Runtime Options</h3>
 			
@@ -373,7 +413,7 @@
 		
 </div>
 		
-<a name="N10070"></a><a name="Getting+the+Hibernate+Mapping+XML"></a>
+<a name="N10093"></a><a name="Getting+the+Hibernate+Mapping+XML"></a>
 <div class="h3">
 <h3>Getting the Hibernate Mapping XML</h3>
 			
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 6359272c1..92cba61d5 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.25 $ $Date: 2008/02/03 22:35:07 $
+	@version $Revision: 1.26 $ $Date: 2008/02/11 10:01:07 $
 --><!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 274c2a7d6..4d39147a2 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.26 2008/02/03 22:35:07 mtaal Exp $
+ * $Id: Dynamic.java,v 1.27 2008/02/11 10:01:07 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.26 $
+ * @version $Revision: 1.27 $
 */
 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 15dea886d..d0c2e5cec 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.26 2008/02/03 22:35:07 mtaal Exp $
+ * $Id: QuickStart.java,v 1.27 2008/02/11 10:01:07 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.26 $
+ * @version $Revision: 1.27 $
 */
 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 c9e553954..be991618d 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.26 2008/02/03 22:35:07 mtaal Exp $
+ * $Id: Tutorial1.java,v 1.27 2008/02/11 10:01:07 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.26 $
+ * @version $Revision: 1.27 $
  */
 public class Tutorial1 {
 
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 c11a5cf8f..aa0b43c3c 100644
--- a/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/troubleshooting.html
+++ b/doc/org.eclipse.emf.teneo.doc/tutorials/hibernate/troubleshooting.html
@@ -372,7 +372,9 @@
 			
 <p>The runtime layer uses commons-logging for logging. <a href="samples/log4j.properties">Here</a> 
 				you can find an example log4j.properties file. This file should be placed directly in
-				the src directory of your EMF Model project.</p>
+				the src directory of your EMF Model project. <em>Note: also check if Eclipse copies the file to your bin/build directory. For a plugin
+				project this can be specified in the build.properties.</em>
+</p>
 			
 <p>The example <a href="samples/log4j.properties">log4j.properties</a> also contains log4j settings
 				for Hibernate.</p>
@@ -384,7 +386,7 @@
 		
 </div>
 		
-<a name="N10041"></a><a name="ormapper"></a>
+<a name="N10043"></a><a name="ormapper"></a>
 <div class="h3">
 <h3>Troubleshooting the automatic in-memory mapping</h3>
 			
@@ -394,7 +396,7 @@
 		
 </div>
 		
-<a name="N1004B"></a><a name="manualormapper"></a>
+<a name="N1004D"></a><a name="manualormapper"></a>
 <div class="h3">
 <h3>Troubleshooting the OR Mapper Menu Option</h3>
 			
@@ -412,7 +414,7 @@
 		
 </div>
 		
-<a name="N10061"></a><a name="resourceplanning"></a>
+<a name="N10063"></a><a name="resourceplanning"></a>
 <div class="h3">
 <h3>Troubleshooting the Resource Utilities</h3>
 			
@@ -428,7 +430,7 @@
 		
 </div>
 		
-<a name="N10071"></a><a name="More+debug+information+from+Eclipse"></a>
+<a name="N10073"></a><a name="More+debug+information+from+Eclipse"></a>
 <div class="h3">
 <h3>More debug information from Eclipse</h3>
 			
@@ -444,7 +446,7 @@ org.eclipse.osgi.framework.debug.Debug.DEBUG_GENERAL = true;
 		
 </div>
 		
-<a name="N10081"></a><a name="Cut+and+Paste+does+not+work+in+the+Editor"></a>
+<a name="N10083"></a><a name="Cut+and+Paste+does+not+work+in+the+Editor"></a>
 <div class="h3">
 <h3>Cut and Paste does not work in the Editor</h3>
 		
@@ -453,7 +455,7 @@ org.eclipse.osgi.framework.debug.Debug.DEBUG_GENERAL = true;
 		
 </div>
 		
-<a name="N1008D"></a><a name="Client-server+scenario%3A+when+saving+on+the+server+always+new+objects+are+created+or+I+get+a+duplicate+key+exception"></a>
+<a name="N1008F"></a><a name="Client-server+scenario%3A+when+saving+on+the+server+always+new+objects+are+created+or+I+get+a+duplicate+key+exception"></a>
 <div class="h3">
 <h3>Client-server scenario: when saving on the server always new objects are created or I get a duplicate key exception</h3>
 		
@@ -463,7 +465,7 @@ org.eclipse.osgi.framework.debug.Debug.DEBUG_GENERAL = true;
 		
 </div>
 			
-<a name="N1009A"></a><a name="Column+name+e_version+not+supported+by+database"></a>
+<a name="N1009C"></a><a name="Column+name+e_version+not+supported+by+database"></a>
 <div class="h3">
 <h3>Column name e_version not supported by database</h3>
 			
@@ -473,7 +475,7 @@ org.eclipse.osgi.framework.debug.Debug.DEBUG_GENERAL = true;
 			
 </div>
 			
-<a name="N100A7"></a><a name="Column+names+too+long"></a>
+<a name="N100A9"></a><a name="Column+names+too+long"></a>
 <div class="h3">
 <h3>Column names too long</h3>
 			
@@ -483,7 +485,7 @@ org.eclipse.osgi.framework.debug.Debug.DEBUG_GENERAL = true;
 			
 </div>
 			
-<a name="N100B4"></a><a name="org.hibernate.DuplicateMappingException%3A+Duplicate+class%2Fentitymapping"></a>
+<a name="N100B6"></a><a name="org.hibernate.DuplicateMappingException%3A+Duplicate+class%2Fentitymapping"></a>
 <div class="h3">
 <h3>org.hibernate.DuplicateMappingException: Duplicate class/entitymapping</h3>
 			
@@ -494,7 +496,7 @@ org.eclipse.osgi.framework.debug.Debug.DEBUG_GENERAL = true;
 			
 </div>
 			
-<a name="N100C1"></a><a name="Created+new+model+through+new+model+wizard%3A+diagnostic+error"></a>
+<a name="N100C3"></a><a name="Created+new+model+through+new+model+wizard%3A+diagnostic+error"></a>
 <div class="h3">
 <h3>Created new model through new model wizard: diagnostic error</h3>
 			
@@ -512,7 +514,7 @@ org.eclipse.osgi.framework.debug.Debug.DEBUG_GENERAL = true;
 			
 </div>
 			
-<a name="N100CD"></a><a name="java.lang.NoClassDefFoundError+when+starting%2Finitializing+runtime+layer"></a>
+<a name="N100CF"></a><a name="java.lang.NoClassDefFoundError+when+starting%2Finitializing+runtime+layer"></a>
 <div class="h3">
 <h3>java.lang.NoClassDefFoundError when starting/initializing runtime layer</h3>
 				
@@ -531,7 +533,7 @@ org.eclipse.osgi.framework.debug.Debug.DEBUG_GENERAL = true;
 			
 </div>
 			
-<a name="N100E0"></a><a name="No+class+def+found%3A+org.hibernate.proxy.ProxyFactory"></a>
+<a name="N100E2"></a><a name="No+class+def+found%3A+org.hibernate.proxy.ProxyFactory"></a>
 <div class="h3">
 <h3>No class def found: org.hibernate.proxy.ProxyFactory</h3>
 			
@@ -543,7 +545,7 @@ org.eclipse.osgi.framework.debug.Debug.DEBUG_GENERAL = true;
 			
 </div>
 			
-<a name="N100E9"></a><a name="Could+not+determine+type+for%3A+org.eclipse.emf.common.util.AbstractEnumerator%2C+for+columns%3A+%5Borg.hibernate.mapping.Column%28enu%29%5D"></a>
+<a name="N100EB"></a><a name="Could+not+determine+type+for%3A+org.eclipse.emf.common.util.AbstractEnumerator%2C+for+columns%3A+%5Borg.hibernate.mapping.Column%28enu%29%5D"></a>
 <div class="h3">
 <h3>Could not determine type for: org.eclipse.emf.common.util.AbstractEnumerator, for columns: [org.hibernate.mapping.Column(enu)]</h3>
 			
@@ -565,7 +567,7 @@ org.eclipse.osgi.framework.debug.Debug.DEBUG_GENERAL = true;
 			
 </div>
 			
-<a name="N100F8"></a><a name="The+resource+is+empty+in+the+generated+editor"></a>
+<a name="N100FA"></a><a name="The+resource+is+empty+in+the+generated+editor"></a>
 <div class="h3">
 <h3>The resource is empty in the generated editor</h3>
 				
@@ -574,7 +576,7 @@ org.eclipse.osgi.framework.debug.Debug.DEBUG_GENERAL = true;
 			
 </div>
 			
-<a name="N10106"></a><a name="Update+manager+does+not+find+the+upgrade+of+the+EMF+Hibernate+plugin"></a>
+<a name="N10108"></a><a name="Update+manager+does+not+find+the+upgrade+of+the+EMF+Hibernate+plugin"></a>
 <div class="h3">
 <h3>Update manager does not find the upgrade of the EMF Hibernate plugin</h3>
 			
@@ -582,7 +584,7 @@ org.eclipse.osgi.framework.debug.Debug.DEBUG_GENERAL = true;
 			
 </div>
 			
-<a name="N1010F"></a><a name="Editor+does+not+start%2C++the+error+log+gives+a+sql+error+%27Missing+column....%27"></a>
+<a name="N10111"></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>
 			
@@ -593,7 +595,7 @@ org.eclipse.osgi.framework.debug.Debug.DEBUG_GENERAL = true;
 			
 </div>
 			
-<a name="N1011C"></a><a name="Editor+does+not+start%2C+ClassNotFoundException+on+the+Editor+Plugin"></a>
+<a name="N1011E"></a><a name="Editor+does+not+start%2C+ClassNotFoundException+on+the+Editor+Plugin"></a>
 <div class="h3">
 <h3>Editor does not start, ClassNotFoundException on the Editor Plugin</h3>
 			
@@ -604,7 +606,7 @@ org.eclipse.osgi.framework.debug.Debug.DEBUG_GENERAL = true;
 			
 </div>
 			
-<a name="N10125"></a><a name="Editor+does+not+start%2C+AssertionFailedException"></a>
+<a name="N10127"></a><a name="Editor+does+not+start%2C+AssertionFailedException"></a>
 <div class="h3">
 <h3>Editor does not start, AssertionFailedException</h3>
 			
@@ -624,7 +626,7 @@ at org.eclipse.ui.part.MultiPageEditorPart.createPartControl(MultiPageEditorPart
 			
 </div>
 			
-<a name="N10134"></a><a name="Validation+exception+on+enumerate+properties+when+saving+the+editor+content"></a>
+<a name="N10136"></a><a name="Validation+exception+on+enumerate+properties+when+saving+the+editor+content"></a>
 <div class="h3">
 <h3>Validation exception on enumerate properties when saving the editor content</h3>
 				
@@ -641,7 +643,7 @@ at org.eclipse.ui.part.MultiPageEditorPart.createPartControl(MultiPageEditorPart
 			
 </div>
 			
-<a name="N10148"></a><a name="Stacktraces+when+starting+Eclipse+with+already+open+EMF+editor"></a>
+<a name="N1014A"></a><a name="Stacktraces+when+starting+Eclipse+with+already+open+EMF+editor"></a>
 <div class="h3">
 <h3>Stacktraces when starting Eclipse with already open EMF editor</h3>
 				
@@ -656,7 +658,7 @@ at org.eclipse.ui.part.MultiPageEditorPart.createPartControl(MultiPageEditorPart
 			
 </div>
 			
-<a name="N10157"></a><a name="Teneo+does+not+see+my+changes+in+the+ecore+model"></a>
+<a name="N10159"></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>
 				
@@ -667,7 +669,7 @@ at org.eclipse.ui.part.MultiPageEditorPart.createPartControl(MultiPageEditorPart
 			
 </div>
 			
-<a name="N10160"></a><a name="JoinTable+name+clash"></a>
+<a name="N10162"></a><a name="JoinTable+name+clash"></a>
 <div class="h3">
 <h3>JoinTable name clash</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 1a5778b9e..468aaed1a 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.27 2008/02/03 22:35:07 mtaal Exp $
+ * $Id: Tutorial1.java,v 1.28 2008/02/11 10:01:07 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.27 $
+ * @version $Revision: 1.28 $
  */
 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 8cfc24b4c..04b9333d2 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.24 2008/02/03 22:35:07 mtaal Exp $
+/* $Id: inst.css,v 1.25 2008/02/11 10:01:06 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 f73766c63..08f7d0c2e 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.24 2008/02/03 22:35:07 mtaal Exp $
+/* $Id: ns4_only.css,v 1.25 2008/02/11 10:01:06 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 bc8dce29b..3d6377c50 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.24 2008/02/03 22:35:07 mtaal Exp $ */
+/* $Id: print.css,v 1.25 2008/02/11 10:01:06 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 49ea31fb2..cee66c2bf 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.24 2008/02/03 22:35:07 mtaal Exp $
+/* $Id: tigris.css,v 1.25 2008/02/11 10:01:06 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. */