diff options
| author | Martin Taal | 2013-04-01 12:06:19 +0000 |
|---|---|---|
| committer | Martin Taal | 2013-04-01 12:06:19 +0000 |
| commit | 778f7d6395b132b70448babbbb1898e89ba3a33b (patch) | |
| tree | 97daad48e435f0000ce938de3b7df5dea4420001 /tests | |
| parent | 0c96040de3c3f55446c38927f06bfac279bbc472 (diff) | |
| download | org.eclipse.emf.teneo-778f7d6395b132b70448babbbb1898e89ba3a33b.tar.gz org.eclipse.emf.teneo-778f7d6395b132b70448babbbb1898e89ba3a33b.tar.xz org.eclipse.emf.teneo-778f7d6395b132b70448babbbb1898e89ba3a33b.zip | |
Fixes issue [402321]
Diffstat (limited to 'tests')
17 files changed, 94 insertions, 1179 deletions
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 |