Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2013-04-01 08:06:19 -0400
committerMartin Taal2013-04-01 08:06:19 -0400
commit778f7d6395b132b70448babbbb1898e89ba3a33b (patch)
tree97daad48e435f0000ce938de3b7df5dea4420001
parent0c96040de3c3f55446c38927f06bfac279bbc472 (diff)
downloadorg.eclipse.emf.teneo-778f7d6395b132b70448babbbb1898e89ba3a33b.tar.gz
org.eclipse.emf.teneo-778f7d6395b132b70448babbbb1898e89ba3a33b.tar.xz
org.eclipse.emf.teneo-778f7d6395b132b70448babbbb1898e89ba3a33b.zip
Fixes issue [402321]
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbannotation.genmodel2
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbmodel.ecore2
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java26
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedETypeElement.java28
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelPackage.java85
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java63
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java36
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelPackageImpl.java37
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java9
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListEAVAction_hsqldb_h_o_hibernate.hbm.xml375
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyEAVAction_hsqldb_h_o_hibernate.hbm.xml375
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimpleTypeEAVAction_hsqldb_h_o_hibernate.hbm.xml337
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_e_o_hibernate.hbm.xml2
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_h_o_hibernate.hbm.xml2
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore15
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.genmodel8
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd6
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java3
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleType.java3
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleTypeObject.java3
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpleTypeImpl.java28
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpleTypeObjectImpl.java2
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java39
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesAdapterFactory.java2
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesSwitch.java36
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesValidator.java37
26 files changed, 280 insertions, 1281 deletions
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbannotation.genmodel b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbannotation.genmodel
index 65d13b64c..6a85aa45d 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbannotation.genmodel
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbannotation.genmodel
@@ -190,6 +190,7 @@
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedETypeElement/Filter"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedETypeElement/mapKeyManyToMany"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedETypeElement/formula"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedETypeElement/hbFetch"/>
</genClasses>
<genClasses ecoreClass="hbmodel.ecore#//HbAnnotatedEAttribute">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEAttribute/hbType"/>
@@ -223,7 +224,6 @@
</genClasses>
<genClasses ecoreClass="hbmodel.ecore#//HbAnnotatedEReference">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEReference/hbCache"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEReference/hbFetch"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEReference/hbOnDelete"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEReference/naturalId"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEReference/immutable"/>
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbmodel.ecore b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbmodel.ecore
index c803b83b7..4842494f2 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbmodel.ecore
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbmodel.ecore
@@ -31,6 +31,7 @@
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="formula" eType="ecore:EClass hbannotation.ecore#//Formula"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="hbFetch" eType="ecore:EClass hbannotation.ecore#//Fetch"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="HbAnnotatedEAttribute" eSuperTypes="../../org.eclipse.emf.teneo.annotations/model/pamodel.ecore#//PAnnotatedEAttribute #//HbAnnotatedETypeElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="hbType" eType="ecore:EClass hbannotation.ecore#//Type"
@@ -83,7 +84,6 @@
<eClassifiers xsi:type="ecore:EClass" name="HbAnnotatedEReference" eSuperTypes="../../org.eclipse.emf.teneo.annotations/model/pamodel.ecore#//PAnnotatedEReference #//HbAnnotatedETypeElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="hbCache" eType="ecore:EClass hbannotation.ecore#//Cache"
containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="hbFetch" eType="ecore:EClass hbannotation.ecore#//Fetch"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="hbOnDelete" eType="ecore:EClass hbannotation.ecore#//OnDelete"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="naturalId" eType="ecore:EClass hbannotation.ecore#//NaturalId"
containment="true"/>
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
index 5d9ca50e4..d555d9ca6 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
@@ -26,7 +26,6 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
* The following features are supported:
* <ul>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbCache <em>Hb Cache</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbFetch <em>Hb Fetch</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbOnDelete <em>Hb On Delete</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNaturalId <em>Natural Id</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getImmutable <em>Immutable</em>}</li>
@@ -70,31 +69,6 @@ public interface HbAnnotatedEReference extends PAnnotatedEReference, HbAnnotated
void setHbCache(Cache value);
/**
- * Returns the value of the '<em><b>Hb Fetch</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Hb Fetch</em>' containment reference isn't clear, there really
- * should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Hb Fetch</em>' reference.
- * @see #setHbFetch(Fetch)
- * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEReference_HbFetch()
- * @model
- * @generated
- */
- Fetch getHbFetch();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbFetch <em>Hb Fetch</em>}' reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Hb Fetch</em>' reference.
- * @see #getHbFetch()
- * @generated
- */
- void setHbFetch(Fetch value);
-
- /**
* Returns the value of the '<em><b>Hb On Delete</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedETypeElement.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedETypeElement.java
index f549feff5..4ccaaba75 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedETypeElement.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedETypeElement.java
@@ -11,6 +11,7 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
import org.eclipse.emf.teneo.annotations.pannotation.Column;
import org.eclipse.emf.teneo.hibernate.hbannotation.Cascade;
import org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements;
+import org.eclipse.emf.teneo.hibernate.hbannotation.Fetch;
import org.eclipse.emf.teneo.hibernate.hbannotation.Filter;
import org.eclipse.emf.teneo.hibernate.hbannotation.Formula;
import org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey;
@@ -36,6 +37,7 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFilter <em>Filter</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getMapKeyManyToMany <em>Map Key Many To Many</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFormula <em>Formula</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbFetch <em>Hb Fetch</em>}</li>
* </ul>
* </p>
*
@@ -287,4 +289,30 @@ public interface HbAnnotatedETypeElement extends PAnnotatedEStructuralFeature,
*/
void setFormula(Formula value);
+ /**
+ * Returns the value of the '<em><b>Hb Fetch</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Hb Fetch</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Hb Fetch</em>' reference.
+ * @see #setHbFetch(Fetch)
+ * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedETypeElement_HbFetch()
+ * @model
+ * @generated
+ */
+ Fetch getHbFetch();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbFetch <em>Hb Fetch</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Hb Fetch</em>' reference.
+ * @see #getHbFetch()
+ * @generated
+ */
+ void setHbFetch(Fetch value);
+
} // HbAnnotatedETypeElement
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelPackage.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelPackage.java
index d19f5c8ae..f2f45729c 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelPackage.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelPackage.java
@@ -325,13 +325,22 @@ public interface HbmodelPackage extends EPackage {
int HB_ANNOTATED_ETYPE_ELEMENT__FORMULA = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 9;
/**
+ * The feature id for the '<em><b>Hb Fetch</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int HB_ANNOTATED_ETYPE_ELEMENT__HB_FETCH = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 10;
+
+ /**
* The number of structural features of the ' <em>Hb Annotated EType Element</em>' class. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
* @ordered
*/
- int HB_ANNOTATED_ETYPE_ELEMENT_FEATURE_COUNT = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 10;
+ int HB_ANNOTATED_ETYPE_ELEMENT_FEATURE_COUNT = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 11;
/**
* The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl <em>Hb Annotated EAttribute</em>}' class.
@@ -667,13 +676,22 @@ public interface HbmodelPackage extends EPackage {
int HB_ANNOTATED_EATTRIBUTE__FORMULA = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 9;
/**
+ * The feature id for the '<em><b>Hb Fetch</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int HB_ANNOTATED_EATTRIBUTE__HB_FETCH = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 10;
+
+ /**
* The feature id for the '<em><b>Hb Type</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int HB_ANNOTATED_EATTRIBUTE__HB_TYPE = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 10;
+ int HB_ANNOTATED_EATTRIBUTE__HB_TYPE = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 11;
/**
* The feature id for the '<em><b>Generated</b></em>' containment reference.
@@ -682,7 +700,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EATTRIBUTE__GENERATED = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 11;
+ int HB_ANNOTATED_EATTRIBUTE__GENERATED = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 12;
/**
* The feature id for the '<em><b>Natural Id</b></em>' containment reference.
@@ -691,7 +709,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EATTRIBUTE__NATURAL_ID = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 12;
+ int HB_ANNOTATED_EATTRIBUTE__NATURAL_ID = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 13;
/**
* The feature id for the '<em><b>Any</b></em>' reference.
@@ -700,7 +718,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EATTRIBUTE__ANY = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 13;
+ int HB_ANNOTATED_EATTRIBUTE__ANY = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 14;
/**
* The feature id for the '<em><b>Any Meta Def</b></em>' reference.
@@ -709,7 +727,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 14;
+ int HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 15;
/**
* The number of structural features of the '<em>Hb Annotated EAttribute</em>' class. <!--
@@ -718,7 +736,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EATTRIBUTE_FEATURE_COUNT = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 15;
+ int HB_ANNOTATED_EATTRIBUTE_FEATURE_COUNT = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 16;
/**
* The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl <em>Hb Annotated EClass</em>}' class.
@@ -1680,22 +1698,22 @@ public interface HbmodelPackage extends EPackage {
int HB_ANNOTATED_EREFERENCE__FORMULA = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 9;
/**
- * The feature id for the '<em><b>Hb Cache</b></em>' containment reference.
- * <!-- begin-user-doc
- * --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Hb Fetch</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
* @generated
* @ordered
*/
- int HB_ANNOTATED_EREFERENCE__HB_CACHE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 10;
+ int HB_ANNOTATED_EREFERENCE__HB_FETCH = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 10;
/**
- * The feature id for the '<em><b>Hb Fetch</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * The feature id for the '<em><b>Hb Cache</b></em>' containment reference.
+ * <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
* @generated
* @ordered
*/
- int HB_ANNOTATED_EREFERENCE__HB_FETCH = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 11;
+ int HB_ANNOTATED_EREFERENCE__HB_CACHE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 11;
/**
* The feature id for the '<em><b>Hb On Delete</b></em>' reference.
@@ -2077,6 +2095,17 @@ public interface HbmodelPackage extends EPackage {
EReference getHbAnnotatedETypeElement_Formula();
/**
+ * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbFetch <em>Hb Fetch</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Hb Fetch</em>'.
+ * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbFetch()
+ * @see #getHbAnnotatedETypeElement()
+ * @generated
+ */
+ EReference getHbAnnotatedETypeElement_HbFetch();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute <em>Hb Annotated EAttribute</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for class '<em>Hb Annotated EAttribute</em>'.
@@ -2362,16 +2391,6 @@ public interface HbmodelPackage extends EPackage {
EReference getHbAnnotatedEReference_HbCache();
/**
- * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbFetch <em>Hb Fetch</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Hb Fetch</em>'.
- * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbFetch()
- * @see #getHbAnnotatedEReference()
- * @generated
- */
- EReference getHbAnnotatedEReference_HbFetch();
-
- /**
* Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbOnDelete <em>Hb On Delete</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the reference '<em>Hb On Delete</em>'.
@@ -2624,6 +2643,14 @@ public interface HbmodelPackage extends EPackage {
EReference HB_ANNOTATED_ETYPE_ELEMENT__FORMULA = eINSTANCE.getHbAnnotatedETypeElement_Formula();
/**
+ * The meta object literal for the '<em><b>Hb Fetch</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_FETCH = eINSTANCE.getHbAnnotatedETypeElement_HbFetch();
+
+ /**
* The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl <em>Hb Annotated EAttribute</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl
@@ -2851,14 +2878,6 @@ public interface HbmodelPackage extends EPackage {
EReference HB_ANNOTATED_EREFERENCE__HB_CACHE = eINSTANCE.getHbAnnotatedEReference_HbCache();
/**
- * The meta object literal for the '<em><b>Hb Fetch</b></em>' reference feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- EReference HB_ANNOTATED_EREFERENCE__HB_FETCH = eINSTANCE.getHbAnnotatedEReference_HbFetch();
-
- /**
* The meta object literal for the '<em><b>Hb On Delete</b></em>' reference feature. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java
index c269e890f..802dcf704 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Any;
import org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef;
import org.eclipse.emf.teneo.hibernate.hbannotation.Cascade;
import org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements;
+import org.eclipse.emf.teneo.hibernate.hbannotation.Fetch;
import org.eclipse.emf.teneo.hibernate.hbannotation.Filter;
import org.eclipse.emf.teneo.hibernate.hbannotation.Formula;
import org.eclipse.emf.teneo.hibernate.hbannotation.Generated;
@@ -54,6 +55,7 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage;
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getFilter <em>Filter</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getMapKeyManyToMany <em>Map Key Many To Many</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getFormula <em>Formula</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbFetch <em>Hb Fetch</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbType <em>Hb Type</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getGenerated <em>Generated</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getNaturalId <em>Natural Id</em>}</li>
@@ -163,6 +165,16 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
protected Formula formula;
/**
+ * The cached value of the '{@link #getHbFetch() <em>Hb Fetch</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getHbFetch()
+ * @generated
+ * @ordered
+ */
+ protected Fetch hbFetch;
+
+ /**
* The cached value of the '{@link #getHbType() <em>Hb Type</em>}' containment reference. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
@@ -562,6 +574,44 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
}
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Fetch getHbFetch() {
+ if (hbFetch != null && hbFetch.eIsProxy()) {
+ InternalEObject oldHbFetch = (InternalEObject)hbFetch;
+ hbFetch = (Fetch)eResolveProxy(oldHbFetch);
+ if (hbFetch != oldHbFetch) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_FETCH, oldHbFetch, hbFetch));
+ }
+ }
+ return hbFetch;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Fetch basicGetHbFetch() {
+ return hbFetch;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setHbFetch(Fetch newHbFetch) {
+ Fetch oldHbFetch = hbFetch;
+ hbFetch = newHbFetch;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_FETCH, oldHbFetch, hbFetch));
+ }
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@@ -812,6 +862,9 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA:
if (resolve) return getFormula();
return basicGetFormula();
+ case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_FETCH:
+ if (resolve) return getHbFetch();
+ return basicGetHbFetch();
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
return getHbType();
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED:
@@ -868,6 +921,9 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA:
setFormula((Formula)newValue);
return;
+ case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_FETCH:
+ setHbFetch((Fetch)newValue);
+ return;
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
setHbType((Type)newValue);
return;
@@ -924,6 +980,9 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA:
setFormula((Formula)null);
return;
+ case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_FETCH:
+ setHbFetch((Fetch)null);
+ return;
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
setHbType((Type)null);
return;
@@ -970,6 +1029,8 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
return mapKeyManyToMany != null;
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA:
return formula != null;
+ case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_FETCH:
+ return hbFetch != null;
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
return hbType != null;
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED:
@@ -1007,6 +1068,7 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FILTER;
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY;
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA;
+ case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_FETCH: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_FETCH;
default: return -1;
}
}
@@ -1036,6 +1098,7 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FILTER: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER;
case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY;
case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA;
+ case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_FETCH: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_FETCH;
default: return -1;
}
}
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
index 2fe1cb567..818b62d0e 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
@@ -59,8 +59,8 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage;
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getFilter <em>Filter</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getMapKeyManyToMany <em>Map Key Many To Many</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getFormula <em>Formula</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbCache <em>Hb Cache</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbFetch <em>Hb Fetch</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbCache <em>Hb Cache</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbOnDelete <em>Hb On Delete</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getNaturalId <em>Natural Id</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getImmutable <em>Immutable</em>}</li>
@@ -173,24 +173,24 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
protected Formula formula;
/**
- * The cached value of the '{@link #getHbCache() <em>Hb Cache</em>}' containment reference. <!--
+ * The cached value of the '{@link #getHbFetch() <em>Hb Fetch</em>}' reference. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
- * @see #getHbCache()
+ * @see #getHbFetch()
* @generated
* @ordered
*/
- protected Cache hbCache;
+ protected Fetch hbFetch;
/**
- * The cached value of the '{@link #getHbFetch() <em>Hb Fetch</em>}' reference. <!--
+ * The cached value of the '{@link #getHbCache() <em>Hb Cache</em>}' containment reference. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
- * @see #getHbFetch()
+ * @see #getHbCache()
* @generated
* @ordered
*/
- protected Fetch hbFetch;
+ protected Cache hbCache;
/**
* The cached value of the '{@link #getHbOnDelete() <em>Hb On Delete</em>}' reference. <!--
@@ -1061,11 +1061,11 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA:
if (resolve) return getFormula();
return basicGetFormula();
- case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
- return getHbCache();
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
if (resolve) return getHbFetch();
return basicGetHbFetch();
+ case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
+ return getHbCache();
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE:
if (resolve) return getHbOnDelete();
return basicGetHbOnDelete();
@@ -1130,12 +1130,12 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA:
setFormula((Formula)newValue);
return;
- case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
- setHbCache((Cache)newValue);
- return;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
setHbFetch((Fetch)newValue);
return;
+ case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
+ setHbCache((Cache)newValue);
+ return;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE:
setHbOnDelete((OnDelete)newValue);
return;
@@ -1201,12 +1201,12 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA:
setFormula((Formula)null);
return;
- case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
- setHbCache((Cache)null);
- return;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
setHbFetch((Fetch)null);
return;
+ case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
+ setHbCache((Cache)null);
+ return;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE:
setHbOnDelete((OnDelete)null);
return;
@@ -1262,10 +1262,10 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
return mapKeyManyToMany != null;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA:
return formula != null;
- case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
- return hbCache != null;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
return hbFetch != null;
+ case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
+ return hbCache != null;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE:
return hbOnDelete != null;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID:
@@ -1309,6 +1309,7 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FILTER;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA;
+ case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_FETCH;
default: return -1;
}
}
@@ -1338,6 +1339,7 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FILTER: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER;
case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY;
case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA;
+ case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_FETCH: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH;
default: return -1;
}
}
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelPackageImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelPackageImpl.java
index 27219c6a8..ae12b3643 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelPackageImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelPackageImpl.java
@@ -227,6 +227,15 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
}
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getHbAnnotatedETypeElement_HbFetch() {
+ return (EReference)hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(10);
+ }
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@@ -462,16 +471,8 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
- public EReference getHbAnnotatedEReference_HbFetch() {
- return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
public EReference getHbAnnotatedEReference_HbOnDelete() {
- return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(2);
+ return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(1);
}
/**
@@ -479,7 +480,7 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
* @generated
*/
public EReference getHbAnnotatedEReference_NaturalId() {
- return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(3);
+ return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(2);
}
/**
@@ -487,7 +488,7 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
* @generated
*/
public EReference getHbAnnotatedEReference_Immutable() {
- return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(4);
+ return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(3);
}
/**
@@ -495,7 +496,7 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
* @generated
*/
public EReference getHbAnnotatedEReference_NotFound() {
- return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(5);
+ return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(4);
}
/**
@@ -503,7 +504,7 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
* @generated
*/
public EReference getHbAnnotatedEReference_HbType() {
- return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(6);
+ return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(5);
}
/**
@@ -511,7 +512,7 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
* @generated
*/
public EReference getHbAnnotatedEReference_BatchSize() {
- return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(7);
+ return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(6);
}
/**
@@ -519,7 +520,7 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
* @generated
*/
public EReference getHbAnnotatedEReference_Any() {
- return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(8);
+ return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(7);
}
/**
@@ -527,7 +528,7 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
* @generated
*/
public EReference getHbAnnotatedEReference_AnyMetaDef() {
- return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(9);
+ return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(8);
}
/**
@@ -622,6 +623,7 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__FILTER);
createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY);
createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__FORMULA);
+ createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__HB_FETCH);
hbAnnotatedEAttributeEClass = createEClass(HB_ANNOTATED_EATTRIBUTE);
createEReference(hbAnnotatedEAttributeEClass, HB_ANNOTATED_EATTRIBUTE__HB_TYPE);
@@ -656,7 +658,6 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
hbAnnotatedEReferenceEClass = createEClass(HB_ANNOTATED_EREFERENCE);
createEReference(hbAnnotatedEReferenceEClass, HB_ANNOTATED_EREFERENCE__HB_CACHE);
- createEReference(hbAnnotatedEReferenceEClass, HB_ANNOTATED_EREFERENCE__HB_FETCH);
createEReference(hbAnnotatedEReferenceEClass, HB_ANNOTATED_EREFERENCE__HB_ON_DELETE);
createEReference(hbAnnotatedEReferenceEClass, HB_ANNOTATED_EREFERENCE__NATURAL_ID);
createEReference(hbAnnotatedEReferenceEClass, HB_ANNOTATED_EREFERENCE__IMMUTABLE);
@@ -730,6 +731,7 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
initEReference(getHbAnnotatedETypeElement_Filter(), theHbannotationPackage.getFilter(), null, "Filter", null, 0, -1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getHbAnnotatedETypeElement_MapKeyManyToMany(), theHbannotationPackage.getMapKeyManyToMany(), null, "mapKeyManyToMany", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getHbAnnotatedETypeElement_Formula(), theHbannotationPackage.getFormula(), null, "formula", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getHbAnnotatedETypeElement_HbFetch(), theHbannotationPackage.getFetch(), null, "hbFetch", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(hbAnnotatedEAttributeEClass, HbAnnotatedEAttribute.class, "HbAnnotatedEAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getHbAnnotatedEAttribute_HbType(), theHbannotationPackage.getType(), null, "hbType", null, 0, 1, HbAnnotatedEAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -764,7 +766,6 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
initEClass(hbAnnotatedEReferenceEClass, HbAnnotatedEReference.class, "HbAnnotatedEReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getHbAnnotatedEReference_HbCache(), theHbannotationPackage.getCache(), null, "hbCache", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getHbAnnotatedEReference_HbFetch(), theHbannotationPackage.getFetch(), null, "hbFetch", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getHbAnnotatedEReference_HbOnDelete(), theHbannotationPackage.getOnDelete(), null, "hbOnDelete", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getHbAnnotatedEReference_NaturalId(), theHbannotationPackage.getNaturalId(), null, "naturalId", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getHbAnnotatedEReference_Immutable(), theHbannotationPackage.getImmutable(), null, "immutable", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java
index f83d4b58f..11b1adfbb 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java
@@ -641,12 +641,9 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
collectionIdElement.addElement("generator").addAttribute("class", generator);
}
- if (hbFeature instanceof HbAnnotatedEReference) {
- final HbAnnotatedEReference hae = (HbAnnotatedEReference) hbFeature;
- if (hae.getHbFetch() != null) {
- collectionElement
- .addAttribute("fetch", hae.getHbFetch().getValue().getName().toLowerCase());
- }
+ if (hbFeature.getHbFetch() != null) {
+ collectionElement.addAttribute("fetch", hbFeature.getHbFetch().getValue().getName()
+ .toLowerCase());
}
if (hasOrderBy) {
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListEAVAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListEAVAction_hsqldb_h_o_hibernate.hbm.xml
index c1bf069eb..280a618fc 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListEAVAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListEAVAction_hsqldb_h_o_hibernate.hbm.xml
@@ -13,379 +13,4 @@
<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="WriterToStringMapEntry"/>
<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditCommitInfoImpl" entity-name="TeneoAuditCommitInfo" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TeneoAuditCommitInfo"/>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="BookAuditing" abstract="false" lazy="false" discriminator-value="BookAuditing" table="`BOOKAUDITING`">
- <meta attribute="eclassName" inherit="false">BookAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="BOOKAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="BOOKAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TITLE`"/>
- </property>
- <list name="writers" lazy="true" cascade="all,delete-orphan">
- <key foreign-key="BOOKAUDITING_WRITERS_KEY" update="true">
- <column name="`BOOKAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`BOOKAUDITING_WRITERS_IDX`"/>
- <one-to-many entity-name="StringToWriterMapEntryAuditing"/>
- </list>
- <list name="keyWords" lazy="true" cascade="all,delete-orphan">
- <key foreign-key="BOOKAUDITING_KEYWORDS_KEY" update="true">
- <column name="`BOOKAUDITING_KEYWORDS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`BOOKAUDITING_KEYWORDS_IDX`"/>
- <one-to-many entity-name="StringToStringMapEntryAuditing"/>
- </list>
- <list name="cityByWriter" lazy="true" cascade="all,delete-orphan">
- <key foreign-key="BOOKAUDITING_CITYBYWRITER_KEY" update="true">
- <column name="`BOOKAUDITING_CITYBYWRITER_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`BOOKAUDITING_CITYBYWRITER_IDX`"/>
- <one-to-many entity-name="WriterToStringMapEntryAuditing"/>
- </list>
- <list name="categoryByDate" lazy="true" cascade="all,delete-orphan">
- <key foreign-key="BOOKAUDITING_CATEGORYBYDATE_KEY" update="true">
- <column name="`BOOKAUDITING_CATEGORYBYDATE_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`BOOKAUDITING_CATEGORYBYDATE_IDX`"/>
- <one-to-many entity-name="DateToCategoryMapEntryAuditing"/>
- </list>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToWriterMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToWriterMapEntryAuditing" table="`STRINGTOWRITERMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">StringToWriterMapEntryAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="STRINGTOWRITERMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOWRITERMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToStringMapEntryAuditing" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">StringToStringMapEntryAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="STRINGTOSTRINGMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="WriterToStringMapEntryAuditing" table="`WRITERTOSTRINGMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">WriterToStringMapEntryAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="WRITERTOSTRINGMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DateToCategoryMapEntryAuditing" abstract="false" lazy="false" discriminator-value="DateToCategoryMapEntryAuditing" table="`DATETOCATEGORYMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">DateToCategoryMapEntryAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="DATETOCATEGORYMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DATETOCATEGORYMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`VALUE`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
- <param name="eclassifier">Category</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
- </type>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterAuditing" abstract="false" lazy="false" discriminator-value="WriterAuditing" table="`WRITERAUDITING`">
- <meta attribute="eclassName" inherit="false">WriterAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="WRITERAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- </class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyEAVAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyEAVAction_hsqldb_h_o_hibernate.hbm.xml
index ea9bb59a6..280a618fc 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyEAVAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyEAVAction_hsqldb_h_o_hibernate.hbm.xml
@@ -13,379 +13,4 @@
<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="WriterToStringMapEntry"/>
<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditCommitInfoImpl" entity-name="TeneoAuditCommitInfo" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TeneoAuditCommitInfo"/>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="BookAuditing" abstract="false" lazy="false" discriminator-value="BookAuditing" table="`BOOKAUDITING`">
- <meta attribute="eclassName" inherit="false">BookAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="BOOKAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="BOOKAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TITLE`"/>
- </property>
- <list name="writers" inverse="true" lazy="extra" cascade="all,delete-orphan">
- <key foreign-key="BOOKAUDITING_WRITERS_KEY" update="true">
- <column name="`BOOKAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`BOOKAUDITING_WRITERS_IDX`"/>
- <one-to-many entity-name="StringToWriterMapEntryAuditing"/>
- </list>
- <list name="keyWords" inverse="true" lazy="extra" cascade="all,delete-orphan">
- <key foreign-key="BOOKAUDITING_KEYWORDS_KEY" update="true">
- <column name="`BOOKAUDITING_KEYWORDS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`BOOKAUDITING_KEYWORDS_IDX`"/>
- <one-to-many entity-name="StringToStringMapEntryAuditing"/>
- </list>
- <list name="cityByWriter" inverse="true" lazy="extra" cascade="all,delete-orphan">
- <key foreign-key="BOOKAUDITING_CITYBYWRITER_KEY" update="true">
- <column name="`BOOKAUDITING_CITYBYWRITER_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`BOOKAUDITING_CITYBYWRITER_IDX`"/>
- <one-to-many entity-name="WriterToStringMapEntryAuditing"/>
- </list>
- <list name="categoryByDate" inverse="true" lazy="extra" cascade="all,delete-orphan">
- <key foreign-key="BOOKAUDITING_CATEGORYBYDATE_KEY" update="true">
- <column name="`BOOKAUDITING_CATEGORYBYDATE_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`BOOKAUDITING_CATEGORYBYDATE_IDX`"/>
- <one-to-many entity-name="DateToCategoryMapEntryAuditing"/>
- </list>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToWriterMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToWriterMapEntryAuditing" table="`STRINGTOWRITERMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">StringToWriterMapEntryAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="STRINGTOWRITERMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOWRITERMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToStringMapEntryAuditing" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">StringToStringMapEntryAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="STRINGTOSTRINGMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="WriterToStringMapEntryAuditing" table="`WRITERTOSTRINGMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">WriterToStringMapEntryAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="WRITERTOSTRINGMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DateToCategoryMapEntryAuditing" abstract="false" lazy="false" discriminator-value="DateToCategoryMapEntryAuditing" table="`DATETOCATEGORYMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">DateToCategoryMapEntryAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="DATETOCATEGORYMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DATETOCATEGORYMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`VALUE`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
- <param name="eclassifier">Category</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
- </type>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterAuditing" abstract="false" lazy="false" discriminator-value="WriterAuditing" table="`WRITERAUDITING`">
- <meta attribute="eclassName" inherit="false">WriterAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="WRITERAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- </class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimpleTypeEAVAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimpleTypeEAVAction_hsqldb_h_o_hibernate.hbm.xml
index 2a441ade1..44c1870f6 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimpleTypeEAVAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimpleTypeEAVAction_hsqldb_h_o_hibernate.hbm.xml
@@ -14,341 +14,4 @@
<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeImpl" entity-name="SimpleType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleType"/>
<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeObjectImpl" entity-name="SimpleTypeObject" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleTypeObject"/>
<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditCommitInfoImpl" entity-name="TeneoAuditCommitInfo" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TeneoAuditCommitInfo"/>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SimpleListAuditing" abstract="false" lazy="false" discriminator-value="SimpleListAuditing" table="`SIMPLELISTAUDITING`">
- <meta attribute="eclassName" inherit="false">SimpleListAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypesAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="SIMPLELISTAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SIMPLELISTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CODE`"/>
- </property>
- <list name="boo" table="`SIMPLELISTAUDITING_BOOAUDITING`" lazy="true" cascade="all">
- <key foreign-key="SIMPLELISTAUDITING_BOO_KEY" update="true">
- <column name="`SIMPLELISTAUDITING_BOO_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`SIMPLELISTAUDITING_BOO_IDX`"/>
- <element type="boolean"/>
- </list>
- <list name="byt" table="`SIMPLELISTAUDITING_BYTAUDITING`" lazy="true" cascade="all">
- <key foreign-key="SIMPLELISTAUDITING_BYT_KEY" update="true">
- <column name="`SIMPLELISTAUDITING_BYT_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`SIMPLELISTAUDITING_BYT_IDX`"/>
- <element type="java.lang.Byte"/>
- </list>
- <list name="doubl" table="`SIMPLELISTAUDITING_DOUBLAUDITING`" lazy="true" cascade="all">
- <key foreign-key="SIMPLELISTAUDITING_DOUBL_KEY" update="true">
- <column name="`SIMPLELISTAUDITING_DOUBL_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`SIMPLELISTAUDITING_DOUBL_IDX`"/>
- <element type="java.lang.Double"/>
- </list>
- <list name="floa" table="`SIMPLELISTAUDITING_FLOAAUDITING`" lazy="true" cascade="all">
- <key foreign-key="SIMPLELISTAUDITING_FLOA_KEY" update="true">
- <column name="`SIMPLELISTAUDITING_FLOA_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`SIMPLELISTAUDITING_FLOA_IDX`"/>
- <element type="java.lang.Float"/>
- </list>
- <list name="inte" table="`SIMPLELISTAUDITING_INTEAUDITING`" lazy="true" cascade="all">
- <key foreign-key="SIMPLELISTAUDITING_INTE_KEY" update="true">
- <column name="`SIMPLELISTAUDITING_INTE_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`SIMPLELISTAUDITING_INTE_IDX`"/>
- <element type="java.lang.Integer"/>
- </list>
- <list name="long" table="`SIMPLELISTAUDITING_LONGAUDITING`" lazy="true" cascade="all">
- <key foreign-key="SIMPLELISTAUDITING_LONG_KEY" update="true">
- <column name="`SIMPLELISTAUDITING_LONG_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`SIMPLELISTAUDITING_LONG_IDX`"/>
- <element type="java.lang.Long"/>
- </list>
- <list name="shor" table="`SIMPLELISTAUDITING_SHORAUDITING`" lazy="true" cascade="all">
- <key foreign-key="SIMPLELISTAUDITING_SHOR_KEY" update="true">
- <column name="`SIMPLELISTAUDITING_SHOR_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`SIMPLELISTAUDITING_SHOR_IDX`"/>
- <element type="short"/>
- </list>
- <list name="enu" table="`SIMPLELISTAUDITING_ENUAUDITING`" lazy="true" cascade="all">
- <key foreign-key="SIMPLELISTAUDITING_ENU_KEY" update="true">
- <column name="`SIMPLELISTAUDITING_ENU_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`SIMPLELISTAUDITING_ENU_IDX`"/>
- <element>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
- <param name="eclassifier">SimpleEnum</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
- </type>
- </element>
- </list>
- <list name="dat" table="`SIMPLELISTAUDITING_DATAUDITING`" lazy="true" cascade="all">
- <key foreign-key="SIMPLELISTAUDITING_DAT_KEY" update="true">
- <column name="`SIMPLELISTAUDITING_DAT_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`SIMPLELISTAUDITING_DAT_IDX`"/>
- <element type="timestamp"/>
- </list>
- <list name="limitedstring" table="`SIMPLELISTAUDITING_LIMITEDSTRINGAUDITING`" lazy="true" cascade="all">
- <key foreign-key="SIMPLELISTAUDITING_LIMITEDSTRING_KEY" update="true">
- <column name="`SIMPLELISTAUDITING_LIMITEDSTRING_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`SIMPLELISTAUDITING_LIMITEDSTRING_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- <list name="stri" table="`SIMPLELISTAUDITING_STRIAUDITING`" lazy="true" cascade="all">
- <key foreign-key="SIMPLELISTAUDITING_STRI_KEY" update="true">
- <column name="`SIMPLELISTAUDITING_STRI_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`SIMPLELISTAUDITING_STRI_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- <array name="intArray" table="`SIMPLELISTAUDITING_INTARRAYAUDITING`" cascade="all">
- <key foreign-key="SIMPLELISTAUDITING_INTARRAY_KEY" update="true">
- <column name="`SIMPLELISTAUDITING_INTARRAY_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`SIMPLELISTAUDITING_INTARRAY_IDX`"/>
- <element type="int"/>
- </array>
- <array name="doubleArray" table="`SIMPLELISTAUDITING_DOUBLEARRAYAUDITING`" cascade="all">
- <key foreign-key="SIMPLELISTAUDITING_DOUBLEARRAY_KEY" update="true">
- <column name="`SIMPLELISTAUDITING_DOUBLEARRAY_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`SIMPLELISTAUDITING_DOUBLEARRAY_IDX`"/>
- <element type="double"/>
- </array>
- <property name="stringArray" lazy="false" insert="true" update="true" not-null="false" unique="false" type="simpletypes.StringArray">
- <column not-null="false" unique="false" name="`STRINGARRAY`"/>
- </property>
- <array name="byteArray" table="`SIMPLELISTAUDITING_BYTEARRAYAUDITING`" cascade="all">
- <key foreign-key="SIMPLELISTAUDITING_BYTEARRAY_KEY" update="true">
- <column name="`SIMPLELISTAUDITING_BYTEARRAY_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`SIMPLELISTAUDITING_BYTEARRAY_IDX`"/>
- <element type="byte"/>
- </array>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SimpleTypeAuditing" abstract="false" lazy="false" discriminator-value="SimpleTypeAuditing" table="`SIMPLETYPEAUDITING`">
- <meta attribute="eclassName" inherit="false">SimpleTypeAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypesAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="SIMPLETYPEAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SIMPLETYPEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CODE`"/>
- </property>
- <property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
- <column not-null="false" unique="false" name="`BOO`"/>
- </property>
- <property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
- <column not-null="false" unique="false" name="`BYT`"/>
- </property>
- <property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
- <column not-null="false" unique="false" name="`DOUBL`"/>
- </property>
- <property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
- <column not-null="false" unique="false" name="`FLOAT`"/>
- </property>
- <property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`INTE`"/>
- </property>
- <property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`LON`"/>
- </property>
- <property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="short">
- <column not-null="false" unique="false" name="`SHOR`"/>
- </property>
- <property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`ENU`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
- <param name="eclassifier">SimpleEnum</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
- </type>
- </property>
- <property name="dat" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
- <column not-null="false" unique="false" name="`DAT`"/>
- </property>
- <property name="limitedstring" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`LIMITEDSTRING`" length="10"/>
- </property>
- <property name="limitedDecimal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
- <column not-null="false" unique="false" name="`LIMITEDDECIMAL`" precision="4" scale="1"/>
- </property>
- <property name="extraLimitedString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`EXTRALIMITEDSTRING`" length="5"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SimpleTypeObjectAuditing" abstract="false" lazy="false" discriminator-value="SimpleTypeObjectAuditing" table="`SIMPLETYPEOBJECTAUDITING`">
- <meta attribute="eclassName" inherit="false">SimpleTypeObjectAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypesAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="SIMPLETYPEOBJECTAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SIMPLETYPEOBJECTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CODE`"/>
- </property>
- <property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
- <column not-null="false" unique="false" name="`BOO`"/>
- </property>
- <property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Byte">
- <column not-null="false" unique="false" name="`BYT`"/>
- </property>
- <property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Double">
- <column not-null="false" unique="false" name="`DOUBL`"/>
- </property>
- <property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Float">
- <column not-null="false" unique="false" name="`FLOAT`"/>
- </property>
- <property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Integer">
- <column not-null="false" unique="false" name="`INTE`"/>
- </property>
- <property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Long">
- <column not-null="false" unique="false" name="`LON`"/>
- </property>
- <property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Short">
- <column not-null="false" unique="false" name="`SHOR`"/>
- </property>
- <property name="dat" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
- <column not-null="false" unique="false" name="`DAT`"/>
- </property>
- </class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_e_o_hibernate.hbm.xml
index 6d79a2cf2..63013ddca 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_e_o_hibernate.hbm.xml
@@ -51,7 +51,7 @@
<list-index column="`SIMPLELIST_FLOA_IDX`"/>
<element type="java.lang.Float"/>
</list>
- <list name="inte" table="`SIMPLELIST_INTE`" lazy="true" cascade="all">
+ <list name="inte" fetch="subselect" table="`SIMPLELIST_INTE`" lazy="true" cascade="all">
<key foreign-key="SIMPLELIST_INTE_KEY" update="true">
<column name="`SIMPLELIST_INTE_E_ID`" unique="false"/>
</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_h_o_hibernate.hbm.xml
index a87e7994f..6ac1f97da 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_h_o_hibernate.hbm.xml
@@ -54,7 +54,7 @@
<list-index column="`SIMPLELIST_FLOA_IDX`"/>
<element type="java.lang.Float"/>
</list>
- <list name="inte" table="`SIMPLELIST_INTE`" lazy="true" cascade="all">
+ <list name="inte" fetch="subselect" table="`SIMPLELIST_INTE`" lazy="true" cascade="all">
<key foreign-key="SIMPLELIST_INTE_KEY" update="true">
<column name="`SIMPLELIST_INTE_E_ID`" unique="false"/>
</key>
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore
index 14e3b01f6..104a0092a 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="simpletypes"
- nsURI="http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="simpletypes" nsURI="http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes"
nsPrefix="simpletypes">
<eClassifiers xsi:type="ecore:EDataType" name="Bool" instanceClassName="java.lang.Boolean">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -130,6 +128,9 @@
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="inte" unique="false" lowerBound="1"
upperBound="-1" eType="#//Int">
+ <eAnnotations source="teneo.jpa">
+ <details key="appinfo" value="@Fetch(value=FetchMode.SUBSELECT)"/>
+ </eAnnotations>
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="kind" value="element"/>
<details key="name" value="inte"/>
@@ -153,7 +154,7 @@
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="enu" unique="false" lowerBound="1"
- upperBound="-1" eType="#//SimpleEnum" defaultValueLiteral="Enum1">
+ upperBound="-1" eType="#//SimpleEnum">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="kind" value="element"/>
<details key="name" value="enu"/>
@@ -271,7 +272,7 @@
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="enu" lowerBound="1" eType="#//SimpleEnum"
- defaultValueLiteral="Enum1" unsettable="true">
+ unsettable="true">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="kind" value="element"/>
<details key="name" value="enu"/>
@@ -367,7 +368,7 @@
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="enu" lowerBound="1" eType="#//SimpleEnumObject"
- defaultValueLiteral="Enum1" unsettable="true">
+ unsettable="true">
<eAnnotations source="teneo.jpa">
<details key="appinfo" value="@Enumerated(STRING)"/>
</eAnnotations>
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.genmodel b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.genmodel
index ff0c4ea1c..35d06dae8 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.genmodel
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.genmodel
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src"
- modelPluginID="org.eclipse.emf.teneo.samples" modelName="My" importerID="org.eclipse.xsd.ecore.importer"
- complianceLevel="5.0">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src" modelPluginID="org.eclipse.emf.teneo.samples"
+ modelName="My" importerID="org.eclipse.xsd.ecore.importer" complianceLevel="5.0">
<foreignModel>simpletypes.xsd</foreignModel>
<genPackages prefix="Simpletypes" basePackage="org.eclipse.emf.teneo.samples.emf.schemaconstructs"
resource="XML" disposableProviderFactory="true" ecorePackage="simpletypes.ecore#/">
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd
index c4f0d3261..b7d4913c1 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd
@@ -45,7 +45,11 @@
<element maxOccurs="unbounded" name="byt" type="this:Byte"/>
<element maxOccurs="unbounded" name="doubl" type="this:Double"/>
<element maxOccurs="unbounded" name="floa" type="this:Float"/>
- <element maxOccurs="unbounded" name="inte" type="this:Int"/>
+ <element maxOccurs="unbounded" name="inte" type="this:Int">
+ <annotation>
+ <appinfo source="teneo.jpa">@Fetch(value=FetchMode.SUBSELECT)</appinfo>
+ </annotation>
+ </element>
<element maxOccurs="unbounded" name="long" type="this:Long">
<annotation>
<appinfo source="teneo.jpa">@JoinTable(name="longNum")</appinfo>
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java
index b79e247ec..0a747a51c 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java
@@ -177,6 +177,7 @@ public interface SimpleList extends EObject {
* @return the value of the '<em>Inte</em>' attribute list.
* @see org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpletypesPackage#getSimpleList_Inte()
* @model unique="false" dataType="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.Int" required="true"
+ * annotation="teneo.jpa appinfo='@Fetch(value=FetchMode.SUBSELECT)'"
* extendedMetaData="kind='element' name='inte'"
* @generated
*/
@@ -230,7 +231,7 @@ public interface SimpleList extends EObject {
* @return the value of the '<em>Enu</em>' attribute list.
* @see org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum
* @see org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpletypesPackage#getSimpleList_Enu()
- * @model default="Enum1" unique="false" required="true"
+ * @model unique="false" required="true"
* extendedMetaData="kind='element' name='enu'"
* @generated
*/
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleType.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleType.java
index 83e4d05b2..7fe048e7b 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleType.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleType.java
@@ -475,7 +475,6 @@ public interface SimpleType extends EObject {
/**
* Returns the value of the '<em><b>Enu</b></em>' attribute.
- * The default value is <code>"Enum1"</code>.
* The literals are from the enumeration {@link org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum}.
* <!-- begin-user-doc -->
* <p>
@@ -489,7 +488,7 @@ public interface SimpleType extends EObject {
* @see #unsetEnu()
* @see #setEnu(SimpleEnum)
* @see org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpletypesPackage#getSimpleType_Enu()
- * @model default="Enum1" unsettable="true" required="true"
+ * @model unsettable="true" required="true"
* extendedMetaData="kind='element' name='enu'"
* @generated
*/
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleTypeObject.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleTypeObject.java
index c306436f0..6942fdec8 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleTypeObject.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleTypeObject.java
@@ -471,7 +471,6 @@ public interface SimpleTypeObject extends EObject {
/**
* Returns the value of the '<em><b>Enu</b></em>' attribute.
- * The default value is <code>"Enum1"</code>.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Enu</em>' attribute isn't clear,
@@ -483,7 +482,7 @@ public interface SimpleTypeObject extends EObject {
* @see #unsetEnu()
* @see #setEnu(SimpleEnum)
* @see org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpletypesPackage#getSimpleTypeObject_Enu()
- * @model default="Enum1" unsettable="true" dataType="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnumObject" required="true"
+ * @model unsettable="true" dataType="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnumObject" required="true"
* annotation="teneo.jpa appinfo='@Enumerated(STRING)'"
* extendedMetaData="kind='element' name='enu'"
* @generated
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpleTypeImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpleTypeImpl.java
index 386e6feb4..60ec38392 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpleTypeImpl.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpleTypeImpl.java
@@ -946,19 +946,19 @@ public class SimpleTypeImpl extends EObjectImpl implements SimpleType {
case SimpletypesPackage.SIMPLE_TYPE__CODE:
return getCode();
case SimpletypesPackage.SIMPLE_TYPE__BOO:
- return isBoo() ? Boolean.TRUE : Boolean.FALSE;
+ return isBoo();
case SimpletypesPackage.SIMPLE_TYPE__BYT:
- return new Byte(getByt());
+ return getByt();
case SimpletypesPackage.SIMPLE_TYPE__DOUBL:
- return new Double(getDoubl());
+ return getDoubl();
case SimpletypesPackage.SIMPLE_TYPE__FLOAT:
- return new Float(getFloat());
+ return getFloat();
case SimpletypesPackage.SIMPLE_TYPE__INTE:
- return new Integer(getInte());
+ return getInte();
case SimpletypesPackage.SIMPLE_TYPE__LON:
- return new Long(getLon());
+ return getLon();
case SimpletypesPackage.SIMPLE_TYPE__SHOR:
- return new Short(getShor());
+ return getShor();
case SimpletypesPackage.SIMPLE_TYPE__ENU:
return getEnu();
case SimpletypesPackage.SIMPLE_TYPE__DAT:
@@ -985,25 +985,25 @@ public class SimpleTypeImpl extends EObjectImpl implements SimpleType {
setCode((String)newValue);
return;
case SimpletypesPackage.SIMPLE_TYPE__BOO:
- setBoo(((Boolean)newValue).booleanValue());
+ setBoo((Boolean)newValue);
return;
case SimpletypesPackage.SIMPLE_TYPE__BYT:
- setByt(((Byte)newValue).byteValue());
+ setByt((Byte)newValue);
return;
case SimpletypesPackage.SIMPLE_TYPE__DOUBL:
- setDoubl(((Double)newValue).doubleValue());
+ setDoubl((Double)newValue);
return;
case SimpletypesPackage.SIMPLE_TYPE__FLOAT:
- setFloat(((Float)newValue).floatValue());
+ setFloat((Float)newValue);
return;
case SimpletypesPackage.SIMPLE_TYPE__INTE:
- setInte(((Integer)newValue).intValue());
+ setInte((Integer)newValue);
return;
case SimpletypesPackage.SIMPLE_TYPE__LON:
- setLon(((Long)newValue).longValue());
+ setLon((Long)newValue);
return;
case SimpletypesPackage.SIMPLE_TYPE__SHOR:
- setShor(((Short)newValue).shortValue());
+ setShor((Short)newValue);
return;
case SimpletypesPackage.SIMPLE_TYPE__ENU:
setEnu((SimpleEnum)newValue);
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpleTypeObjectImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpleTypeObjectImpl.java
index cd7c51667..afdf79a02 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpleTypeObjectImpl.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpleTypeObjectImpl.java
@@ -280,7 +280,7 @@ public class SimpleTypeObjectImpl extends EObjectImpl implements SimpleTypeObjec
* @generated
* @ordered
*/
- protected static final SimpleEnum ENU_EDEFAULT = (SimpleEnum)SimpletypesFactory.eINSTANCE.createFromString(SimpletypesPackage.eINSTANCE.getSimpleEnumObject(), "Enum1");
+ protected static final SimpleEnum ENU_EDEFAULT = null;
/**
* The cached value of the '{@link #getEnu() <em>Enu</em>}' attribute.
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java
index e7fa63c8e..aa9905b3b 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java
@@ -193,20 +193,10 @@ public class SimpletypesPackageImpl extends EPackageImpl implements SimpletypesP
private static boolean isInited = false;
/**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
+ * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+ *
+ * <p>This method is used to initialize {@link SimpletypesPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #eNS_URI
@@ -218,7 +208,7 @@ public class SimpletypesPackageImpl extends EPackageImpl implements SimpletypesP
if (isInited) return (SimpletypesPackage)EPackage.Registry.INSTANCE.getEPackage(SimpletypesPackage.eNS_URI);
// Obtain or create and register package
- SimpletypesPackageImpl theSimpletypesPackage = (SimpletypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof SimpletypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new SimpletypesPackageImpl());
+ SimpletypesPackageImpl theSimpletypesPackage = (SimpletypesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SimpletypesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SimpletypesPackageImpl());
isInited = true;
@@ -243,6 +233,9 @@ public class SimpletypesPackageImpl extends EPackageImpl implements SimpletypesP
// Mark meta-data to indicate it can't be changed
theSimpletypesPackage.freeze();
+
+ // Update the registry and return the package
+ EPackage.Registry.INSTANCE.put(SimpletypesPackage.eNS_URI, theSimpletypesPackage);
return theSimpletypesPackage;
}
@@ -904,7 +897,7 @@ public class SimpletypesPackageImpl extends EPackageImpl implements SimpletypesP
initEAttribute(getSimpleList_Inte(), this.getInt(), "inte", null, 1, -1, SimpleList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSimpleList_Long(), this.getLong(), "long", null, 1, -1, SimpleList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSimpleList_Shor(), theXMLTypePackage.getShort(), "shor", null, 1, -1, SimpleList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getSimpleList_Enu(), this.getSimpleEnum(), "enu", "Enum1", 1, -1, SimpleList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getSimpleList_Enu(), this.getSimpleEnum(), "enu", null, 1, -1, SimpleList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSimpleList_Dat(), this.getDate(), "dat", null, 1, -1, SimpleList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSimpleList_Limitedstring(), this.getLimitedString(), "limitedstring", null, 1, -1, SimpleList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSimpleList_Stri(), theXMLTypePackage.getString(), "stri", null, 1, -1, SimpleList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -922,7 +915,7 @@ public class SimpletypesPackageImpl extends EPackageImpl implements SimpletypesP
initEAttribute(getSimpleType_Inte(), theXMLTypePackage.getInt(), "inte", null, 1, 1, SimpleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSimpleType_Lon(), theXMLTypePackage.getLong(), "lon", null, 1, 1, SimpleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSimpleType_Shor(), theXMLTypePackage.getShort(), "shor", null, 1, 1, SimpleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getSimpleType_Enu(), this.getSimpleEnum(), "enu", "Enum1", 1, 1, SimpleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getSimpleType_Enu(), this.getSimpleEnum(), "enu", null, 1, 1, SimpleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSimpleType_Dat(), this.getDate(), "dat", null, 1, 1, SimpleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSimpleType_Limitedstring(), this.getLimitedString(), "limitedstring", null, 1, 1, SimpleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSimpleType_LimitedDecimal(), this.getLimitedDecimal(), "limitedDecimal", null, 1, 1, SimpleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -937,7 +930,7 @@ public class SimpletypesPackageImpl extends EPackageImpl implements SimpletypesP
initEAttribute(getSimpleTypeObject_Inte(), theXMLTypePackage.getIntObject(), "inte", null, 1, 1, SimpleTypeObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSimpleTypeObject_Lon(), theXMLTypePackage.getLongObject(), "lon", null, 1, 1, SimpleTypeObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSimpleTypeObject_Shor(), theXMLTypePackage.getShortObject(), "shor", null, 1, 1, SimpleTypeObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getSimpleTypeObject_Enu(), this.getSimpleEnumObject(), "enu", "Enum1", 1, 1, SimpleTypeObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getSimpleTypeObject_Enu(), this.getSimpleEnumObject(), "enu", null, 1, 1, SimpleTypeObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSimpleTypeObject_Dat(), this.getDate(), "dat", null, 1, 1, SimpleTypeObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Initialize enums and add enum literals
@@ -1118,7 +1111,7 @@ public class SimpletypesPackageImpl extends EPackageImpl implements SimpletypesP
new String[] {
"kind", "element",
"name", "floa"
- });
+ });
addAnnotation
(getSimpleList_Inte(),
source,
@@ -1386,7 +1379,13 @@ public class SimpletypesPackageImpl extends EPackageImpl implements SimpletypesP
* @generated
*/
protected void createTeneoAnnotations() {
- String source = "teneo.jpa";
+ String source = "teneo.jpa";
+ addAnnotation
+ (getSimpleList_Inte(),
+ source,
+ new String[] {
+ "appinfo", "@Fetch(value=FetchMode.SUBSELECT)"
+ });
addAnnotation
(getSimpleList_Long(),
source,
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesAdapterFactory.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesAdapterFactory.java
index b66ef524f..b1a98f984 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesAdapterFactory.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesAdapterFactory.java
@@ -64,7 +64,7 @@ public class SimpletypesAdapterFactory extends AdapterFactoryImpl {
}
/**
- * The switch the delegates to the <code>createXXX</code> methods.
+ * The switch that delegates to the <code>createXXX</code> methods.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesSwitch.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesSwitch.java
index b7c593fe9..09e0459d1 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesSwitch.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesSwitch.java
@@ -11,6 +11,8 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
import org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.*;
/**
@@ -26,7 +28,7 @@ import org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.*;
* @see org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpletypesPackage
* @generated
*/
-public class SimpletypesSwitch<T> {
+public class SimpletypesSwitch<T> extends Switch<T> {
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -48,34 +50,16 @@ public class SimpletypesSwitch<T> {
}
/**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ * Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
+ * @parameter ePackage the package in question.
+ * @return whether this is a switch for the given package.
* @generated
*/
- public T doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else {
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(eSuperTypes.get(0), theEObject);
- }
+ @Override
+ protected boolean isSwitchFor(EPackage ePackage) {
+ return ePackage == modelPackage;
}
/**
@@ -85,6 +69,7 @@ public class SimpletypesSwitch<T> {
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
+ @Override
protected T doSwitch(int classifierID, EObject theEObject) {
switch (classifierID) {
case SimpletypesPackage.SIMPLE_LIST: {
@@ -165,6 +150,7 @@ public class SimpletypesSwitch<T> {
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
*/
+ @Override
public T defaultCase(EObject object) {
return null;
}
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesValidator.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesValidator.java
index aa086c8e7..e947795b7 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesValidator.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/util/SimpletypesValidator.java
@@ -12,6 +12,7 @@ import java.util.Map;
import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.EObjectValidator;
@@ -139,7 +140,7 @@ public class SimpletypesValidator extends EObjectValidator {
return validateSimpleEnumObject((SimpleEnum)value, diagnostics, context);
case SimpletypesPackage.STRING_ARRAY:
return validateStringArray((String[])value, diagnostics, context);
- default:
+ default:
return true;
}
}
@@ -251,9 +252,9 @@ public class SimpletypesValidator extends EObjectValidator {
* @generated
*/
public boolean validateExtraLimitedString_MaxLength(String extraLimitedString, DiagnosticChain diagnostics, Map<Object, Object> context) {
- int length = extraLimitedString.length();
+ int length = extraLimitedString.length();
boolean result = length <= 5;
- if (!result && diagnostics != null)
+ if (!result && diagnostics != null)
reportMaxLengthViolation(SimpletypesPackage.Literals.EXTRA_LIMITED_STRING, extraLimitedString, length, 5, diagnostics, context);
return result;
}
@@ -304,9 +305,9 @@ public class SimpletypesValidator extends EObjectValidator {
*/
public boolean validateLimitedDecimal_TotalDigits(BigDecimal limitedDecimal, DiagnosticChain diagnostics, Map<Object, Object> context) {
boolean result = limitedDecimal.unscaledValue().abs().toString().length() <= 4;
- if (!result && diagnostics != null)
+ if (!result && diagnostics != null)
reportTotalDigitsViolation(SimpletypesPackage.Literals.LIMITED_DECIMAL, limitedDecimal, 4, diagnostics, context);
- return result;
+ return result;
}
/**
@@ -317,9 +318,9 @@ public class SimpletypesValidator extends EObjectValidator {
*/
public boolean validateLimitedDecimal_FractionDigits(BigDecimal limitedDecimal, DiagnosticChain diagnostics, Map<Object, Object> context) {
boolean result = limitedDecimal.scale() <= 1;
- if (!result && diagnostics != null)
+ if (!result && diagnostics != null)
reportFractionDigitsViolation(SimpletypesPackage.Literals.LIMITED_DECIMAL, limitedDecimal, 1, diagnostics, context);
- return result;
+ return result;
}
/**
@@ -340,9 +341,9 @@ public class SimpletypesValidator extends EObjectValidator {
* @generated
*/
public boolean validateLimitedString_MinLength(String limitedString, DiagnosticChain diagnostics, Map<Object, Object> context) {
- int length = limitedString.length();
+ int length = limitedString.length();
boolean result = length >= 10;
- if (!result && diagnostics != null)
+ if (!result && diagnostics != null)
reportMinLengthViolation(SimpletypesPackage.Literals.LIMITED_STRING, limitedString, length, 10, diagnostics, context);
return result;
}
@@ -354,9 +355,9 @@ public class SimpletypesValidator extends EObjectValidator {
* @generated
*/
public boolean validateLimitedString_MaxLength(String limitedString, DiagnosticChain diagnostics, Map<Object, Object> context) {
- int length = limitedString.length();
+ int length = limitedString.length();
boolean result = length <= 10;
- if (!result && diagnostics != null)
+ if (!result && diagnostics != null)
reportMaxLengthViolation(SimpletypesPackage.Literals.LIMITED_STRING, limitedString, length, 10, diagnostics, context);
return result;
}
@@ -388,4 +389,18 @@ public class SimpletypesValidator extends EObjectValidator {
return true;
}
+ /**
+ * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public ResourceLocator getResourceLocator() {
+ // TODO
+ // Specialize this to return a resource locator for messages specific to this validator.
+ // Ensure that you remove @generated or mark it @generated NOT
+ return super.getResourceLocator();
+ }
+
} //SimpletypesValidator

Back to the top