diff options
author | Martin Taal | 2012-05-18 15:19:37 +0000 |
---|---|---|
committer | Martin Taal | 2012-05-18 15:19:37 +0000 |
commit | b1270299d95d6c529e7adc3935f8ee8f9f271cf9 (patch) | |
tree | c881fde664ba199ceea31844c192c4abcd03d8dd /tests | |
parent | 987450df8e8b22bc23f1f37a8fb4741fbcd3c5e6 (diff) | |
download | org.eclipse.emf.teneo-b1270299d95d6c529e7adc3935f8ee8f9f271cf9.tar.gz org.eclipse.emf.teneo-b1270299d95d6c529e7adc3935f8ee8f9f271cf9.tar.xz org.eclipse.emf.teneo-b1270299d95d6c529e7adc3935f8ee8f9f271cf9.zip |
Work for Teneo 2.0 Hibernate 4.1, removed EclipseLink
Diffstat (limited to 'tests')
22 files changed, 87 insertions, 69 deletions
diff --git a/tests/org.eclipse.emf.teneo.commontest/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.teneo.commontest/META-INF/MANIFEST.MF index 8e8153fe4..6e26fc658 100755 --- a/tests/org.eclipse.emf.teneo.commontest/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.emf.teneo.commontest/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.emf.teneo.commontest -Bundle-Version: 1.1.2.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin Require-Bundle: org.junit, @@ -25,4 +25,4 @@ Export-Package: org.eclipse.emf.teneo.test.issues, org.eclipse.emf.teneo.test.stores Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.apache.commons.logging;version="[1.0.0,2.0.0)" +Import-Package: org.apache.commons.logging;version="[1.0.0,3.0.0)" diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/.classpath b/tests/org.eclipse.emf.teneo.hibernate.test/.classpath index 304e86186..64c5e31b7 100755 --- a/tests/org.eclipse.emf.teneo.hibernate.test/.classpath +++ b/tests/org.eclipse.emf.teneo.hibernate.test/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.teneo.hibernate.test/META-INF/MANIFEST.MF index 5a49b9e74..26895a072 100755 --- a/tests/org.eclipse.emf.teneo.hibernate.test/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.emf.teneo.hibernate.test/META-INF/MANIFEST.MF @@ -5,35 +5,36 @@ Bundle-SymbolicName: org.eclipse.emf.teneo.hibernate.test;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin -Require-Bundle: org.eclipse.emf.teneo.commontest, - org.eclipse.emf.ecore, +Require-Bundle: org.eclipse.emf.teneo.commontest;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)", org.junit, - org.eclipse.emf.teneo.hibernate, - org.eclipse.emf.ecore.xmi, + org.eclipse.emf.teneo.hibernate;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)", org.eclipse.xsd, - org.apache.log4j;bundle-version="1.2.12" -Export-Package: org.eclipse.emf.teneo.hibernate.test;version="1.1.2", - org.eclipse.emf.teneo.hibernate.test.emf.annotations;version="1.1.2", - org.eclipse.emf.teneo.hibernate.test.emf.detach;version="1.1.2", - org.eclipse.emf.teneo.hibernate.test.emf.elist;version="1.1.2", - org.eclipse.emf.teneo.hibernate.test.emf.relation;version="1.1.2", - org.eclipse.emf.teneo.hibernate.test.emf.sample;version="1.1.2", - org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs;version="1.1.2", - org.eclipse.emf.teneo.hibernate.test.issues;version="1.1.2", - org.eclipse.emf.teneo.hibernate.test.stores;version="1.1.2", - org.eclipse.emf.teneo.hibernate.test.stores.adapters;version="1.1.2" + org.apache.log4j;bundle-version="1.2.12", + org.hsqldb;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.emf.teneo.hibernate.test;version="2.0.0", + org.eclipse.emf.teneo.hibernate.test.emf.annotations;version="2.0.0", + org.eclipse.emf.teneo.hibernate.test.emf.detach;version="2.0.0", + org.eclipse.emf.teneo.hibernate.test.emf.elist;version="2.0.0", + org.eclipse.emf.teneo.hibernate.test.emf.relation;version="2.0.0", + org.eclipse.emf.teneo.hibernate.test.emf.sample;version="2.0.0", + org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs;version="2.0.0", + org.eclipse.emf.teneo.hibernate.test.issues;version="2.0.0", + org.eclipse.emf.teneo.hibernate.test.stores;version="2.0.0", + org.eclipse.emf.teneo.hibernate.test.stores.adapters;version="2.0.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.mysql.jdbc;version="[5.1.0,6.0.0)";resolution:=optional, javax.persistence;version="[2.0.0,3.0.0)";resolution:=optional, org.apache.commons.logging;version="[1.0.0,2.0.0)";resolution:=optional, org.dom4j;version="[1.6.0,2.0.0)";resolution:=optional, - org.hibernate;version="[3.6.0,4.0.0)";resolution:=optional, - org.hibernate.cfg;version="[3.6.0,4.0.0)";resolution:=optional, - org.hibernate.collection;version="[3.6.0,4.0.0)";resolution:=optional, - org.hibernate.dialect;version="[3.6.0,4.0.0)";resolution:=optional, - org.hibernate.ejb;version="[3.6.0,4.0.0)";resolution:=optional, - org.hibernate.mapping;version="[3.6.0,4.0.0)";resolution:=optional, - org.hibernate.proxy;version="[3.6.0,4.0.0)";resolution:=optional, - org.hibernate.type;version="[3.6.0,4.0.0)";resolution:=optional, - org.hibernate.usertype;version="[3.6.0,4.0.0)";resolution:=optional, - org.hsqldb;version="[1.8.1,2.0.0)";resolution:=optional + org.hibernate;version="[4.0.0,5.0.0)";resolution:=optional, + org.hibernate.cfg;version="[4.0.0,5.0.0)";resolution:=optional, + org.hibernate.dialect;version="[4.0.0,5.0.0)";resolution:=optional, + org.hibernate.ejb;version="[4.0.0,5.0.0)";resolution:=optional, + org.hibernate.engine.spi;version="[4.0.0,5.0.0)", + org.hibernate.collection.spi;version="[4.0.0,5.0.0)", + org.hibernate.mapping;version="[4.0.0,5.0.0)";resolution:=optional, + org.hibernate.proxy;version="[4.0.0,5.0.0)";resolution:=optional, + org.hibernate.type;version="[4.0.0,5.0.0)";resolution:=optional, + org.hibernate.usertype;version="[4.0.0,5.0.0)";resolution:=optional diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_e_o_hibernate.hbm.xml index ba046466f..3485d4b7d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_e_o_hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_e_o_hibernate.hbm.xml @@ -45,9 +45,16 @@ <map-key type="timestamp"/> <element type="java.lang.String"/> </map> + <map name="photoParts" table="`PHOTOPARTS_MAP`" lazy="true" cascade="all,delete-orphan"> + <key/> + <map-key-many-to-many entity-name="PhotoPart"> + <column not-null="true" unique="false" name="`PARTS_NAME`"/> + </map-key-many-to-many> + <element type="java.lang.String"/> + </map> </class> - <class name="org.eclipse.emf.teneo.samples.emf.jpa2.maps.impl.PhotoBookImpl" entity-name="PhotoBook" abstract="false" lazy="false" table="`PHOTOBOOK`"> - <meta attribute="eclassName" inherit="false">PhotoBook</meta> + <class name="org.eclipse.emf.teneo.samples.emf.jpa2.maps.impl.PhotoPartImpl" entity-name="PhotoPart" abstract="false" lazy="false" table="`PHOTOPART`"> + <meta attribute="eclassName" inherit="false">PhotoPart</meta> <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/maps</meta> <id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler"> <meta attribute="syntheticId" inherit="false">true</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_h_o_hibernate.hbm.xml index 461d68f24..5b2d88c49 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_h_o_hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_h_o_hibernate.hbm.xml @@ -48,16 +48,23 @@ <map-key type="timestamp"/> <element type="java.lang.String"/> </map> + <map name="photoParts" table="`PHOTOPARTS_MAP`" lazy="true" cascade="all,delete-orphan"> + <key/> + <map-key-many-to-many entity-name="PhotoPart"> + <column not-null="true" unique="false" name="`PARTS_NAME`"/> + </map-key-many-to-many> + <element type="java.lang.String"/> + </map> </class> - <class name="org.eclipse.emf.teneo.samples.emf.jpa2.maps.impl.PhotoBookImpl" entity-name="PhotoBook" abstract="false" lazy="false" discriminator-value="PhotoBook" table="`PHOTOBOOK`"> - <meta attribute="eclassName" inherit="false">PhotoBook</meta> + <class name="org.eclipse.emf.teneo.samples.emf.jpa2.maps.impl.PhotoPartImpl" entity-name="PhotoPart" abstract="false" lazy="false" discriminator-value="PhotoPart" table="`PHOTOPART`"> + <meta attribute="eclassName" inherit="false">PhotoPart</meta> <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/maps</meta> <id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler"> <meta attribute="syntheticId" inherit="false">true</meta> <generator class="native"/> </id> <discriminator type="string"> - <column name="`DTYPE`" index="PHOTOBOOKDTYPE" length="255" not-null="true"/> + <column name="`DTYPE`" index="PHOTOPARTDTYPE" length="255" not-null="true"/> </discriminator> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion" inherit="false">true</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_e_o_hibernate.hbm.xml index 50804a0b3..3485d4b7d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_e_o_hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_e_o_hibernate.hbm.xml @@ -45,10 +45,8 @@ <map-key type="timestamp"/> <element type="java.lang.String"/> </map> - <map name="photoParts" lazy="true" cascade="all,delete-orphan"> - <key update="true"> - <column name="`IMAGES_PHOTOPARTS_E_ID`" unique="false"/> - </key> + <map name="photoParts" table="`PHOTOPARTS_MAP`" lazy="true" cascade="all,delete-orphan"> + <key/> <map-key-many-to-many entity-name="PhotoPart"> <column not-null="true" unique="false" name="`PARTS_NAME`"/> </map-key-many-to-many> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_h_o_hibernate.hbm.xml index 477d7216e..5b2d88c49 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_h_o_hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_h_o_hibernate.hbm.xml @@ -48,10 +48,8 @@ <map-key type="timestamp"/> <element type="java.lang.String"/> </map> - <map name="photoParts" lazy="true" cascade="all,delete-orphan"> - <key update="true"> - <column name="`IMAGES_PHOTOPARTS_E_ID`" unique="false"/> - </key> + <map name="photoParts" table="`PHOTOPARTS_MAP`" lazy="true" cascade="all,delete-orphan"> + <key/> <map-key-many-to-many entity-name="PhotoPart"> <column not-null="true" unique="false" name="`PARTS_NAME`"/> </map-key-many-to-many> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/ExtraLazySetAction.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/ExtraLazySetAction.java index d9d877b59..2e19145c2 100755 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/ExtraLazySetAction.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/ExtraLazySetAction.java @@ -25,7 +25,7 @@ import org.eclipse.emf.teneo.hibernate.LazyCollectionUtils; import org.eclipse.emf.teneo.mapping.elist.PersistableEList; import org.eclipse.emf.teneo.samples.emf.annotations.set.ItemList; import org.eclipse.emf.teneo.test.stores.TestStore; -import org.hibernate.collection.PersistentCollection; +import org.hibernate.collection.spi.PersistentCollection; /** * Tests the Set collection in extra lazy mode. diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/SetAction.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/SetAction.java index e3df6c7d1..3d4255c84 100755 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/SetAction.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/SetAction.java @@ -26,7 +26,7 @@ import org.eclipse.emf.teneo.samples.emf.annotations.set.SetFactory; import org.eclipse.emf.teneo.samples.emf.annotations.set.SetPackage; import org.eclipse.emf.teneo.test.AbstractTestAction; import org.eclipse.emf.teneo.test.stores.TestStore; -import org.hibernate.collection.PersistentCollection; +import org.hibernate.collection.spi.PersistentCollection; /** * Test 1n relation (contained and non-contained) using sets. diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/elist/FeatureMapAction.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/elist/FeatureMapAction.java index f9398a65a..a39919107 100755 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/elist/FeatureMapAction.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/elist/FeatureMapAction.java @@ -17,8 +17,8 @@ import java.util.Properties; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.FeatureMap; -import org.eclipse.emf.ecore.util.FeatureMapUtil; import org.eclipse.emf.ecore.util.FeatureMap.Entry; +import org.eclipse.emf.ecore.util.FeatureMapUtil; import org.eclipse.emf.teneo.PersistenceOptions; import org.eclipse.emf.teneo.hibernate.LazyCollectionUtils; import org.eclipse.emf.teneo.mapping.elist.PersistableDelegateList; @@ -34,7 +34,7 @@ import org.eclipse.emf.teneo.test.StoreTestException; import org.eclipse.emf.teneo.test.stores.TestStore; import org.eclipse.emf.teneo.type.PersistentStoreAdapter; import org.eclipse.emf.teneo.util.StoreUtil; -import org.hibernate.collection.PersistentCollection; +import org.hibernate.collection.spi.PersistentCollection; /** * Tests the feature map example Tests: - Creating Feature maps with simple types, containment and non-containment diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryEAVAction.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryEAVAction.java index ec86bd381..a7b213669 100755 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryEAVAction.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryEAVAction.java @@ -32,7 +32,7 @@ import org.eclipse.emf.teneo.samples.emf.sample.library.LibraryPackage; import org.eclipse.emf.teneo.samples.emf.sample.library.Writer; import org.eclipse.emf.teneo.test.AbstractTestAction; import org.eclipse.emf.teneo.test.stores.TestStore; -import org.hibernate.collection.PersistentCollection; +import org.hibernate.collection.spi.PersistentCollection; /** * Tests the library example of emf/xsd using eav. diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryEAVExtraLazyAction.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryEAVExtraLazyAction.java index c4c717ea5..46c9d3d74 100755 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryEAVExtraLazyAction.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryEAVExtraLazyAction.java @@ -30,7 +30,7 @@ import org.eclipse.emf.teneo.samples.emf.sample.library.LibraryPackage; import org.eclipse.emf.teneo.samples.emf.sample.library.Writer; import org.eclipse.emf.teneo.test.AbstractTestAction; import org.eclipse.emf.teneo.test.stores.TestStore; -import org.hibernate.collection.PersistentCollection; +import org.hibernate.collection.spi.PersistentCollection; /** * Tests the library example of emf/xsd using eav and extra lazy. diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryExtraLazyAction.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryExtraLazyAction.java index ba36abc21..823ec19c5 100755 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryExtraLazyAction.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryExtraLazyAction.java @@ -30,7 +30,7 @@ import org.eclipse.emf.teneo.samples.emf.sample.library.LibraryPackage; import org.eclipse.emf.teneo.samples.emf.sample.library.Writer; import org.eclipse.emf.teneo.test.AbstractTestAction; import org.eclipse.emf.teneo.test.stores.TestStore; -import org.hibernate.collection.PersistentCollection; +import org.hibernate.collection.spi.PersistentCollection; /** * Tests the extra lazy behavior of collections. diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryExtraLazyMoreAction.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryExtraLazyMoreAction.java index 88c3e9ed1..e62b75eed 100755 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryExtraLazyMoreAction.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryExtraLazyMoreAction.java @@ -28,7 +28,7 @@ import org.eclipse.emf.teneo.samples.emf.sample.library.LibraryPackage; import org.eclipse.emf.teneo.samples.emf.sample.library.Writer; import org.eclipse.emf.teneo.test.AbstractTestAction; import org.eclipse.emf.teneo.test.stores.TestStore; -import org.hibernate.collection.PersistentCollection; +import org.hibernate.collection.spi.PersistentCollection; /** * Tests the extra lazy behavior of collections. Tests move, delete, etc. diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryTest.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryTest.java index f62c0b29e..d7cac89d9 100755 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryTest.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryTest.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Properties; import org.eclipse.emf.teneo.PersistenceOptions; -import org.eclipse.emf.teneo.classloader.StoreClassLoadException; import org.eclipse.emf.teneo.hibernate.HbUtil; import org.eclipse.emf.teneo.hibernate.LazyCollectionUtils; import org.eclipse.emf.teneo.hibernate.test.stores.HibernateTestStore; @@ -38,7 +37,7 @@ import org.eclipse.emf.teneo.test.AbstractActionTest; import org.eclipse.emf.teneo.test.StoreTestException; import org.eclipse.emf.teneo.test.emf.sample.LibraryAction; import org.eclipse.emf.teneo.test.stores.TestStore; -import org.hibernate.collection.PersistentCollection; +import org.hibernate.collection.spi.PersistentCollection; /** * Tests the library example of emf/xsd. diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/TestLazyUtilsAction.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/TestLazyUtilsAction.java index 009c179f2..eec4e6ce2 100755 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/TestLazyUtilsAction.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/TestLazyUtilsAction.java @@ -29,7 +29,7 @@ import org.eclipse.emf.teneo.samples.emf.sample.library.LibraryPackage; import org.eclipse.emf.teneo.samples.emf.sample.library.Writer; import org.eclipse.emf.teneo.test.AbstractTestAction; import org.eclipse.emf.teneo.test.stores.TestStore; -import org.hibernate.collection.PersistentCollection; +import org.hibernate.collection.spi.PersistentCollection; /** * Tests the LazyUtils class. diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/schemaconstructs/EMapAction.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/schemaconstructs/EMapAction.java index 31668373f..71e2fc272 100755 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/schemaconstructs/EMapAction.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/schemaconstructs/EMapAction.java @@ -39,7 +39,7 @@ import org.eclipse.emf.teneo.test.StoreTestException; import org.eclipse.emf.teneo.test.stores.TestStore; import org.eclipse.emf.teneo.type.PersistentStoreAdapter; import org.eclipse.emf.teneo.util.StoreUtil; -import org.hibernate.collection.PersistentCollection; +import org.hibernate.collection.spi.PersistentCollection; /** * Tests support for emaps. diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/schemaconstructs/EMapAsListExtraLazyAction.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/schemaconstructs/EMapAsListExtraLazyAction.java index b8278ec21..33db928b3 100755 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/schemaconstructs/EMapAsListExtraLazyAction.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/schemaconstructs/EMapAsListExtraLazyAction.java @@ -27,7 +27,7 @@ import org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Book; import org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.EmapFactory; import org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Writer; import org.eclipse.emf.teneo.test.stores.TestStore; -import org.hibernate.collection.PersistentCollection; +import org.hibernate.collection.spi.PersistentCollection; /** * Tests support for emaps with extra lazy. diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/CertificateType.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/CertificateType.java index 10bd8e525..5be125826 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/CertificateType.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/CertificateType.java @@ -7,8 +7,10 @@ import java.sql.SQLException; import java.sql.Types; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.hibernate.Hibernate; import org.hibernate.HibernateException; +import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.type.IntegerType; +import org.hibernate.type.StringType; import org.hibernate.usertype.UserType; /** @@ -48,19 +50,21 @@ public class CertificateType implements UserType { return true; } - public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws HibernateException, SQLException { - String name = (String) Hibernate.STRING.nullSafeGet(rs, names[0]); - Integer length = Hibernate.INTEGER.nullSafeGet(rs, names[1]); + public Object nullSafeGet(ResultSet rs, String[] names, + SessionImplementor session, Object owner) + throws HibernateException, SQLException { + String name = StringType.INSTANCE.nullSafeGet(rs, names[0], session); + Integer length = IntegerType.INSTANCE.nullSafeGet(rs, names[1], session); final Certificate certificate = UsertypeFactory.eINSTANCE.createCertificate(); certificate.setLength(length.intValue()); certificate.setName(name); return certificate; } - public void nullSafeSet(PreparedStatement st, Object value, int index) throws HibernateException, SQLException { + public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor sessionImplementor) throws HibernateException, SQLException { Certificate certificate = (Certificate) value; - Hibernate.STRING.nullSafeSet(st, certificate.getName(), index); - Hibernate.INTEGER.nullSafeSet(st, certificate.getLength(), index + 1); + StringType.INSTANCE.nullSafeSet(st, certificate.getName(), index, sessionImplementor); + IntegerType.INSTANCE.nullSafeSet(st, certificate.getLength(), index + 1, sessionImplementor); } public Object replace(Object original, Object target, Object owner) throws HibernateException { diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/NameType.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/NameType.java index 711c67124..72655cedd 100755 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/NameType.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/NameType.java @@ -8,6 +8,8 @@ import java.sql.Types; import org.hibernate.Hibernate; import org.hibernate.HibernateException; +import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.type.StringType; import org.hibernate.usertype.UserType; /** @@ -47,16 +49,18 @@ public class NameType implements UserType { return true; } - public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws HibernateException, SQLException { - String first = (String) Hibernate.STRING.nullSafeGet(rs, names[0]); - String last = (String) Hibernate.STRING.nullSafeGet(rs, names[1]); + public Object nullSafeGet(ResultSet rs, String[] names, + SessionImplementor session, Object owner) + throws HibernateException, SQLException { + String first = StringType.INSTANCE.nullSafeGet(rs, names[0], session); + String last = StringType.INSTANCE.nullSafeGet(rs, names[1], session); return new Name(first, last); } - public void nullSafeSet(PreparedStatement st, Object value, int index) throws HibernateException, SQLException { + public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor sessionImplementor) throws HibernateException, SQLException { Name name = (Name) value; - Hibernate.STRING.nullSafeSet(st, name.getFirst(), index); - Hibernate.STRING.nullSafeSet(st, name.getLast(), index + 1); + StringType.INSTANCE.nullSafeSet(st, name.getFirst(), index, sessionImplementor); + StringType.INSTANCE.nullSafeSet(st, name.getLast(), index + 1, sessionImplementor); } public Object replace(Object original, Object target, Object owner) throws HibernateException { diff --git a/tests/org.eclipse.emf.teneo.samples/.classpath b/tests/org.eclipse.emf.teneo.samples/.classpath index 304e86186..64c5e31b7 100755 --- a/tests/org.eclipse.emf.teneo.samples/.classpath +++ b/tests/org.eclipse.emf.teneo.samples/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/tests/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF index f902fa9ce..8b29bafb1 100755 --- a/tests/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.emf.teneo.samples;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Localization: plugin -Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.5.0", +Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.7.0", org.eclipse.emf.ecore.xmi, org.eclipse.core.runtime, org.eclipse.core.resources;visibility:=reexport, |