Removed unnecessary system.err.println
Resolved error in JpoxDataStore
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/extlibrary.ExtLibraryAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/extlibrary.ExtLibraryAction/mysql_a_o_package.jdo
index a5f4f52..d0685c5 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/extlibrary.ExtLibraryAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:30 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:28 CEST 2007 -->
 <jdo>
 	<package name="extlibrary.impl">
 		<class name="extlibrary.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/extlibrary.ExtLibraryAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/extlibrary.ExtLibraryAction/mysql_s_o_package.jdo
index a0688c0..c5a74a1 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/extlibrary.ExtLibraryAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:43:55 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:35:51 CEST 2007 -->
 <jdo>
 	<package name="extlibrary.impl">
 		<class name="extlibrary.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_a_o_package.jdo
index f3853b8..365a0d9 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:45:00 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:48 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_s_o_package.jdo
index 799ef84..ddd19e9 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:16 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:15 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_a_o_package.jdo
index a2cfe4f..2e6ebe5 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:45:10 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:58 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_s_o_package.jdo
index cbf4a5b..86905a5 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:26 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:24 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_a_o_package.jdo
index e03b0c8..092371f 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:58 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:47 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_s_o_package.jdo
index e7a7b25..107a432 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:15 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:14 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/mysql_a_o_package.jdo
index 94990f3..fe05cea 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/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 Fri Mar 30 21:44:32 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:29 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/mysql_s_o_package.jdo
index c90bb73..852230b 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/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 Fri Mar 30 21:43:56 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:35:53 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_a_o_package.jdo
index bc3a396..e9ef9fa 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:34 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:30 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_s_o_package.jdo
index 2848be6..8107e7e 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:43:57 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:35:54 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_a_o_package.jdo
index e041bf8..375cfdf 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:45:02 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:50 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_s_o_package.jdo
index 5caec51..9785b0b 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:18 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:17 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_a_o_package.jdo
index ade4aa9..b3fb621 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:29 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:26 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_s_o_package.jdo
index 1354829..dfa818f 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:43:53 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:35:44 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o_package.jdo
index 89c389d..b060c13 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:51 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:46 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o_package.jdo
index b210636..3dfa752 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:13 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:13 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o_package.jdo
index 1d12b09..258849f 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:45:08 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:56 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o_package.jdo
index e1e6158..e107d36 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:24 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:22 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o_package.jdo
index 7e1f5ad..a439bc1 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:50 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:44 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o_package.jdo
index c0feebf..80d74e2 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:12 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:06 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o_package.jdo
index 4e08408..05911f0 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:45 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:41 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o_package.jdo
index e05598e..007355d 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:08 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:02 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o_package.jdo
index 1d40fbd..310eaa4 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:37 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:34 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o_package.jdo
index 8d4a581..b0feb36 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:00 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:35:57 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o_package.jdo
index 372cd10..ac9c3e4 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:42 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:36 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o_package.jdo
index f728994..908084f 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:04 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:35:59 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o_package.jdo
index deedae0..d215849 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:35 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:32 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o_package.jdo
index f00b3d3..488cd66 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:43:59 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:35:55 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o_package.jdo
index b7c8f64..9027cdc 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:39 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:35 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o_package.jdo
index e068f79..5a510c2 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:01 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:35:58 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_a_o_package.jdo
index 3adf556..d5d3b4e 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:44 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:39 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_s_o_package.jdo
index 3e65c22..0c386d6 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:06 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:00 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o_package.jdo
index df6ade8..f1c8ba7 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:45:03 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:52 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o_package.jdo
index 8e313fb..cff2445 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:19 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:18 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o_package.jdo
index 27c5ac0..da97a25 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:45:07 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:55 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o_package.jdo
index f211cf6..ba46f7e 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:23 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:21 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o_package.jdo
index 14af2e1..ea482ca 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:45:05 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:54 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o_package.jdo
index 5862280..d7edad8 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:21 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:20 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.RentalResourceReferenceAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.RentalResourceReferenceAction/mysql_a_o_package.jdo
index 5a01612..7c74e73 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.RentalResourceReferenceAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.RentalResourceReferenceAction/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 Fri Mar 30 21:44:27 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:25 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.rental.impl">
 		<class name="org.eclipse.emf.teneo.rental.impl.RentalBicycleImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.RentalResourceReferenceAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.RentalResourceReferenceAction/mysql_s_o_package.jdo
index c5e06b1..7087c89 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.RentalResourceReferenceAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.RentalResourceReferenceAction/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 Fri Mar 30 21:43:52 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:35:38 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.rental.impl">
 		<class name="org.eclipse.emf.teneo.rental.impl.RentalBicycleImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="rentalbicycle" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o_package.jdo
index b325faa..e2728da 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:49 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:43 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o_package.jdo
index be3a6ba..1b43004 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:10 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:04 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o_package.jdo
index dd23317..04707b3 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:47 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:42 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o_package.jdo
index 6c0a28d..7293281 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/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 Fri Mar 30 21:44:09 CEST 2007 -->
+<!--	Generated by Teneo on Mon Apr 23 04:36:03 CEST 2007 -->
 <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">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/stores/JPOXTestStore.java b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/stores/JPOXTestStore.java
index 1cd5713..401969f 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/stores/JPOXTestStore.java
+++ b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/stores/JPOXTestStore.java
@@ -1,17 +1,9 @@
 /**
- * <copyright>
- *
- * Copyright (c) 2005, 2006, 2007 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: JPOXTestStore.java,v 1.16 2007/03/28 13:58:07 mtaal Exp $
+ * <copyright> Copyright (c) 2005, 2006, 2007 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:
+ * JPOXTestStore.java,v 1.16 2007/03/28 13:58:07 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.jpox.test.stores;
@@ -62,7 +54,7 @@
  * The jpox test store encapsulates the datastore actions to a jpox store.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
  */
 public class JPOXTestStore extends AbstractTestStore {
 	/** The logger */
@@ -87,22 +79,22 @@
 	private boolean donotDrop = false;
 
 	/** The jdo classloader */
-	private JDOClassLoaderResolver clr = new JDOClassLoaderResolver();
+	private final JDOClassLoaderResolver clr = new JDOClassLoaderResolver();
 
 	/** The epackages */
-	private EPackage[] epackages;
+	private final EPackage[] epackages;
 
 	/** The properties */
-	private Properties props;
+	private final Properties props;
 
 	/** The inheritance type */
-	private InheritanceType inheritanceType;
+	private final InheritanceType inheritanceType;
 
 	/**
 	 * Constructor for emf test cases
 	 */
-	public JPOXTestStore(TestDatabaseAdapter adapter, EPackage[] epackages, String jdoLocation, Properties props,
-			InheritanceType inheritanceType) {
+	public JPOXTestStore(TestDatabaseAdapter adapter, EPackage[] epackages, String jdoLocation,
+			Properties props, InheritanceType inheritanceType) {
 		super(adapter);
 		this.epackages = epackages;
 		this.props = props;
@@ -119,13 +111,17 @@
 		Properties properties = new Properties();
 		properties.putAll(props);
 
-		properties.setProperty(PMFConfiguration.JDO_DATASTORE_DRIVERNAME_PROPERTY, adapter.getDbDriver());
+		properties.setProperty(PMFConfiguration.JDO_DATASTORE_DRIVERNAME_PROPERTY, adapter
+			.getDbDriver());
 		properties.setProperty(PMFConfiguration.JDO_DATASTORE_URL_PROPERTY, adapter.getDbUrl());
-		properties.setProperty(PMFConfiguration.JDO_DATASTORE_USERNAME_PROPERTY, adapter.getDbUser());
-		properties.setProperty(PMFConfiguration.JDO_DATASTORE_PASSWORD_PROPERTY, adapter.getDbPwd());
+		properties.setProperty(PMFConfiguration.JDO_DATASTORE_USERNAME_PROPERTY, adapter
+			.getDbUser());
+		properties
+			.setProperty(PMFConfiguration.JDO_DATASTORE_PASSWORD_PROPERTY, adapter.getDbPwd());
 		properties.setProperty(PMFConfiguration.IDENTIFIER_CASE_PROPERTY, "LowerCase");
-		
-		// properties.setProperty(PMFConfiguration.JDO_MAPPING_CATALOG_PROPERTY, adapter.getDbName());
+
+		// properties.setProperty(PMFConfiguration.JDO_MAPPING_CATALOG_PROPERTY,
+		// adapter.getDbName());
 
 		if (inheritanceType.getValue() == InheritanceType.JOINED) {
 			properties.setProperty(PMFConfiguration.DEFAULT_INHERITANCE_STRATEGY_PROPERTY, "JPOX");
@@ -137,33 +133,39 @@
 			log.debug("Copying " + jdoLocation + " to classpath");
 			EPackage epack = epackages[0];
 			final File sourceFile = new File(jdoLocation);
-			final File pluginsDir = sourceFile.getParentFile().getParentFile().getParentFile().getParentFile();
+			final File pluginsDir =
+					sourceFile.getParentFile().getParentFile().getParentFile().getParentFile();
 			final File pluginDir = Utils.getPluginDir(pluginsDir, "org.eclipse.emf.teneo.samples");
-			String packagePath = "bin" + File.separator + epack.getClass().getName().replace('.', File.separatorChar)
-					+ ".class";
+			String packagePath =
+					"bin" + File.separator
+							+ epack.getClass().getName().replace('.', File.separatorChar)
+							+ ".class";
 			File packageFile = new File(pluginDir, packagePath);
 			File packageDirectory = packageFile.getParentFile();
 			if (!packageDirectory.exists()) {
-				packagePath = epack.getClass().getName().replace('.', File.separatorChar) + ".class";
+				packagePath =
+						epack.getClass().getName().replace('.', File.separatorChar) + ".class";
 				packageFile = new File(pluginDir, packagePath);
 				packageDirectory = packageFile.getParentFile();
 			}
 
-			
 			final File dest;
-			if (properties.getProperty(AbstractTestStore.STORE_MAPPING_FILE_ONE_DIRECTORY_HIGHER) != null &&
-					properties.getProperty(AbstractTestStore.STORE_MAPPING_FILE_ONE_DIRECTORY_HIGHER).compareToIgnoreCase("true") == 0) {
+			if (properties.getProperty(AbstractTestStore.STORE_MAPPING_FILE_ONE_DIRECTORY_HIGHER) != null
+					&& properties.getProperty(
+						AbstractTestStore.STORE_MAPPING_FILE_ONE_DIRECTORY_HIGHER)
+						.compareToIgnoreCase("true") == 0) {
 				dest = new File(packageDirectory.getParentFile().getParentFile(), "package.jdo");
 			} else {
 				dest = new File(packageDirectory.getParentFile(), "package.jdo");
 			}
-			
+
 			if (!dest.exists()) {
 				dest.mkdirs();
 			}
 			final File destination = new File(dest.getAbsolutePath());
 			if (destination.exists()) {
-				log.warn("Overwriting existing package.jdo file in location " + destination.getAbsolutePath());
+				log.warn("Overwriting existing package.jdo file in location "
+						+ destination.getAbsolutePath());
 				destination.delete();
 			}
 			destination.createNewFile();
@@ -233,8 +235,7 @@
 
 	/** Rollback transaction */
 	public void rollbackTransaction() {
-		if (tx.isActive())
-			tx.rollback();
+		if (tx.isActive()) tx.rollback();
 		refresh();
 	}
 
@@ -261,10 +262,12 @@
 	/** Query for a class using a field and value pair */
 	public List query(Class clazz, String field, String value, int checkCount) {
 		final Class interf = replaceClass(clazz);
-		return query("SELECT FROM " + interf.getName() + " WHERE " + field + "==\"" + value + "\"", checkCount);
+		return query("SELECT FROM " + interf.getName() + " WHERE " + field + "==\"" + value + "\"",
+			checkCount);
 	}
 
 	/** Queries for an object */
+	@Override
 	public List query(Object query) {
 		return query(query, -1);
 	}
@@ -276,7 +279,8 @@
 		final List result = (List) qry.execute();
 
 		if (checkCount > 0) {
-			TestCase.assertTrue("Expected " + checkCount + " object(s) for this query but there are " + result.size()
+			TestCase.assertTrue("Expected " + checkCount
+					+ " object(s) for this query but there are " + result.size()
 					+ " object(s) for the query " + qryStr, result.size() == checkCount);
 		}
 		return result;
@@ -296,18 +300,17 @@
 		} catch (Exception e) {
 			TestCase.assertTrue("The objects of class: " + clazz.getName()
 					+ " was not deleted while this should be possible", !shouldSucceed);
-			if (tx.isActive())
-				rollbackTransaction();
+			if (tx.isActive()) rollbackTransaction();
 		}
 	}
 
 	/** Return an object of a certain class, there should only be one in the databases */
+	@Override
 	public Object getObject(Class clazz) {
 		List l = getObjects(clazz); // replace class is called in getObjects
-		TestCase
-				.assertTrue("There are " + l.size()
-						+ " object(s) of this class in the datastore, 1 was expected, class: " + clazz.getName(), l
-						.size() == 1);
+		TestCase.assertTrue("There are " + l.size()
+				+ " object(s) of this class in the datastore, 1 was expected, class: "
+				+ clazz.getName(), l.size() == 1);
 		return l.get(0);
 	}
 
@@ -322,6 +325,7 @@
 	}
 
 	/** Test the amount of objects of a certain class in the db */
+	@Override
 	public void checkNumber(Class clazz, int count) {
 		final Class interf = replaceClass(clazz);
 		Extent e = pm.getExtent(interf, true);
@@ -329,7 +333,8 @@
 
 		Collection c = (Collection) q.execute();
 		TestCase.assertTrue("Expected " + count + " object(s) but there are " + c.size()
-				+ " object(s) of this class in the datastore: " + clazz.getName(), c.size() == count);
+				+ " object(s) of this class in the datastore: " + clazz.getName(),
+			c.size() == count);
 		q.closeAll();
 	}
 
@@ -339,20 +344,25 @@
 	}
 
 	/** Is called just before the test */
+	@Override
 	public void setUp() {
 
 	}
 
 	/** Can be used to disabled dropping of the store, convenience for testing */
+	@Override
 	public void disableDrop() {
 		donotDrop = true;
 	}
 
 	/**
-	 * Is called just after the test, the dropStore parameter can be used to prevent dropping the database when an error
+	 * Is called just after the test, the dropStore parameter can be used to prevent dropping the
+	 * database when an error
 	 */
+	@Override
 	public void doTearDown() {
-		// AssertUtil.assertTrue("Transaction is still active at end of test", !pm.currentTransaction().isActive());
+		// AssertUtil.assertTrue("Transaction is still active at end of test",
+		// !pm.currentTransaction().isActive());
 
 		if (pm.currentTransaction().isActive()) {
 			pm.currentTransaction().rollback();
@@ -377,6 +387,7 @@
 	}
 
 	/** Base method to get a resource belonging to the pmf of this test case */
+	@Override
 	public Resource getResource() {
 		return getResource(null);
 	}
@@ -388,7 +399,8 @@
 
 	/** Base method to get a resource belonging to the pmf of this test case */
 	public Resource getResource(String extraParam) {
-		String uriStr = "jpox://?" + JPOXResource.DS_NAME_PARAM + "=" + getDatabaseAdapter().getDbName();
+		String uriStr =
+				"jpox://?" + JPOXResource.DS_NAME_PARAM + "=" + getDatabaseAdapter().getDbName();
 
 		if (extraParam != null) {
 			uriStr += "&" + extraParam;
@@ -402,10 +414,8 @@
 
 	/** Replaces a passed EMF Interface by its concrete class */
 	private Class replaceClass(Class interfaze) {
-		if (!interfaze.isInterface())
-			return interfaze;
-		if (!EObject.class.isAssignableFrom(interfaze))
-			return interfaze;
+		if (!interfaze.isInterface()) return interfaze;
+		if (!EObject.class.isAssignableFrom(interfaze)) return interfaze;
 
 		return JpoxHelper.INSTANCE.getInstanceClass(interfaze);
 	}
@@ -413,15 +423,16 @@
 	/** Gets the referedto list */
 	public Object[] getCrossReferencers(EObject obj, boolean container) {
 		if (container) {
-			return new EObject[] { ((JpoxDataStore) emfDataStore).getContainer(pm, obj) };
+			return new EObject[] { (emfDataStore).getContainer(pm, obj) };
 		} else {
-			return ((JpoxDataStore) emfDataStore).getCrossReferencers(pm, obj);
+			return (emfDataStore).getCrossReferencers(pm, obj);
 		}
 	}
 
 	/** Gets the container list */
+	@Override
 	public boolean setContainer(EObject obj) {
-		return ((JpoxDataStore) emfDataStore).setContainer(pm, obj);
+		return (emfDataStore).setContainer(pm, obj);
 	}
 
 	/** Refreshes the object from the datastore */
@@ -431,8 +442,9 @@
 
 	/** Check inheritance strategy */
 	public boolean isInheritanceStrategy(Class<?> clazz, InheritanceType strategy) {
-		final AbstractClassMetaData cmd = ((PersistenceManagerFactoryImpl) pmf).getPMFContext().getMetaDataManager()
-				.getMetaDataForClass(clazz, clr);
+		final AbstractClassMetaData cmd =
+				((PersistenceManagerFactoryImpl) pmf).getPMFContext().getMetaDataManager()
+					.getMetaDataForClass(clazz, clr);
 		if (strategy.equals(InheritanceType.SINGLE_TABLE_LITERAL)) {
 			return cmd.getInheritanceMetaData().getStrategyValue() == InheritanceStrategy.SUPERCLASS_TABLE;
 		}
@@ -460,12 +472,13 @@
 	public InheritanceType getInheritanceType() {
 		return inheritanceType;
 	}
-	
-	/** Is this a jpox test store */ 
+
+	/** Is this a jpox test store */
+	@Override
 	public boolean isJPOXTestStore() {
 		return true;
 	}
-	
+
 	/** Set the xmlcalendar date */
 	public Object getDate(Date date) {
 		return date;