Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfullbright2010-03-02 07:47:48 +0000
committerpfullbright2010-03-02 07:47:48 +0000
commitd67771a962633e163646db51821d3e66b96c74db (patch)
tree6faffd59bc7db0ee1ba11b3f4e64cd16592a41e0
parent58be3fc051f718ff764a3f7bcf62eb2920c1e9c6 (diff)
downloadwebtools.dali-d67771a962633e163646db51821d3e66b96c74db.tar.gz
webtools.dali-d67771a962633e163646db51821d3e66b96c74db.tar.xz
webtools.dali-d67771a962633e163646db51821d3e66b96c74db.zip
EclipseLink 2.1 resource model additions/alterations
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel39
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore68
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java36
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java534
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java183
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCacheInterceptor.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddable.java5
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java411
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlFetchAttribute.java214
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlFetchGroup.java286
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java1001
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPrimaryKey.java119
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlQueryRedirectors.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlReturnInsert.java211
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v1_1/XmlEntity_1_1.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/OrderCorrectionType_2_0.java1
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java15
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/CacheKeyType_2_1.java258
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java11
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Factory.java166
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java1195
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java88
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java60
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchAttribute_2_1.java61
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchGroupContainer_2_1.java53
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java80
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java83
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlPrimaryKey_2_1.java64
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlReturnInsert_2_1.java61
34 files changed, 4947 insertions, 398 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel
index 56d5a26686..78223af362 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel
@@ -145,6 +145,8 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlEntity/excludeDefaultMappings"/>
</genClasses>
<genClasses ecoreClass="eclipselink_orm.ecore#//XmlEntityMappings"/>
+ <genClasses ecoreClass="eclipselink_orm.ecore#//XmlFetchAttribute"/>
+ <genClasses ecoreClass="eclipselink_orm.ecore#//XmlFetchGroup"/>
<genClasses ecoreClass="eclipselink_orm.ecore#//XmlId"/>
<genClasses ecoreClass="eclipselink_orm.ecore#//XmlInstantiationCopyPolicy"/>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlJoinFetch">
@@ -210,6 +212,7 @@
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlReadOnly">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlReadOnly/readOnly"/>
</genClasses>
+ <genClasses ecoreClass="eclipselink_orm.ecore#//XmlReturnInsert"/>
<genClasses ecoreClass="eclipselink_orm.ecore#//XmlStoredProcedureParameter">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/direction"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/name"/>
@@ -295,5 +298,41 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/delete"/>
</genClasses>
</nestedGenPackages>
+ <nestedGenPackages prefix="EclipseLinkOrmV2_1" basePackage="org.eclipse.jpt.eclipselink.core.resource.orm"
+ disposableProviderFactory="true" adapterFactory="false" fileExtensions="eclipselinkormv2_1"
+ ecorePackage="eclipselink_orm.ecore#//v2_1">
+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1">
+ <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/ID_VALUE"/>
+ <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/CACHE_KEY"/>
+ <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/AUTO"/>
+ </genEnums>
+ <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlBasic_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlBasic_2_1/returnInsert"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlBasic_2_1/returnUpdate"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlEntity_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlEntity_2_1/classExtractor"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlFetchAttribute_2_1">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlFetchAttribute_2_1/name"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1/name"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1/attributes"/>
+ </genClasses>
+ <genClasses ecoreClass="eclipselink_orm.ecore#//v2_1/XmlFetchGroupContainer_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlFetchGroupContainer_2_1/fetchGroups"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1/sqlResultSetMappings"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1/queryRedirectors"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlReturnInsert_2_1">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlReturnInsert_2_1/returnOnly"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlPrimaryKey_2_1">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlPrimaryKey_2_1/cacheKeyType"/>
+ </genClasses>
+ </nestedGenPackages>
</genPackages>
</genmodel:GenModel>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore
index 3d6f29a413..b5cefa9ed5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore
@@ -24,7 +24,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="variableOneToOnes" upperBound="-1"
eType="#//XmlVariableOneToOne" containment="true" resolveProxies="false"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlBasic" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlBasic #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping #//v1_1/XmlBasic_1_1"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlBasic" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlBasic #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping #//v2_1/XmlBasic_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlBasicCollection" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlBasicMap" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlCache">
@@ -116,7 +116,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEmbedded #//XmlAttributeMapping"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedId" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEmbeddedId #//XmlAttributeMapping"/>
- <eClassifiers xsi:type="ecore:EClass" name="XmlEntity" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEntity #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConvertersHolder #//XmlQueryContainer #//XmlPropertyContainer #//v1_1/XmlEntity_1_1 #//v2_0/XmlEntity_2_0">
+ <eClassifiers xsi:type="ecore:EClass" name="XmlEntity" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEntity #//v1_1/XmlEntity_1_1 #//v2_0/XmlEntity_2_0 #//v2_1/XmlEntity_2_1 #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConvertersHolder #//XmlQueryContainer #//XmlPropertyContainer">
<eStructuralFeatures xsi:type="ecore:EReference" name="optimisticLocking" eType="#//XmlOptimisticLocking"
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="copyPolicy" eType="#//XmlCopyPolicy"
@@ -129,6 +129,8 @@
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEntityMappings #//XmlConvertersHolder #//XmlQueryContainer"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlFetchAttribute" eSuperTypes="#//v2_1/XmlFetchAttribute_2_1"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlFetchGroup" eSuperTypes="#//v2_1/XmlFetchGroup_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlId" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlId #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlInstantiationCopyPolicy"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlJoinFetch" abstract="true" interface="true">
@@ -136,7 +138,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlManyToMany #//XmlAttributeMapping #//XmlJoinFetch #//v2_0/XmlManyToMany_2_0"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlManyToOne #//XmlAttributeMapping #//XmlJoinFetch"/>
- <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlMappedSuperclass #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConvertersHolder #//XmlPropertyContainer #//v1_1/XmlMappedSuperclass_1_1 #//v2_0/XmlMappedSuperclass_2_0">
+ <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlMappedSuperclass #//v1_1/XmlMappedSuperclass_1_1 #//v2_0/XmlMappedSuperclass_2_0 #//v2_1/XmlMappedSuperclass_2_1 #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConvertersHolder #//XmlPropertyContainer">
<eStructuralFeatures xsi:type="ecore:EReference" name="optimisticLocking" eType="#//XmlOptimisticLocking"
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="copyPolicy" eType="#//XmlCopyPolicy"
@@ -187,7 +189,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings"
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlPrimaryKey" eSuperTypes="#//v1_1/XmlPrimaryKey_1_1"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlPrimaryKey" eSuperTypes="#//v1_1/XmlPrimaryKey_1_1 #//v2_1/XmlPrimaryKey_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlPrivateOwned" abstract="true" interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="privateOwned" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
</eClassifiers>
@@ -210,6 +212,7 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlReadOnly" abstract="true" interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="readOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlReturnInsert" eSuperTypes="#//v2_1/XmlReturnInsert_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlStoredProcedureParameter">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" eType="#//XmlDirection"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
@@ -285,7 +288,7 @@
containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlEntity_1_1" abstract="true" interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKey" eType="#//v1_1/XmlPrimaryKey_1_1"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKey" eType="#//XmlPrimaryKey"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_1_1" abstract="true"
@@ -319,9 +322,9 @@
interface="true" eSuperTypes="#//XmlAttributeMapping #//XmlConvertibleMapping #//XmlConvertersHolder #//v2_0/XmlCollectionMapping_2_0"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_0" abstract="true" interface="true"
eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//v2_0/XmlEntity_2_0">
- <eStructuralFeatures xsi:type="ecore:EReference" name="cacheInterceptor" eType="#//v2_0/XmlCacheInterceptor_2_0"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="cacheInterceptor" eType="#//XmlCacheInterceptor"
containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="queryRedirectors" eType="#//v2_0/XmlQueryRedirectors_2_0"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="queryRedirectors" eType="#//XmlQueryRedirectors"
containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany_2_0" abstract="true"
@@ -334,7 +337,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_2_0" abstract="true"
interface="true" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//v2_0/XmlCacheable_2_0">
- <eStructuralFeatures xsi:type="ecore:EReference" name="cacheInterceptor" eType="#//v2_0/XmlCacheInterceptor_2_0"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="cacheInterceptor" eType="#//XmlCacheInterceptor"
containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany_2_0" abstract="true"
@@ -359,4 +362,53 @@
<eLiterals name="EXCEPTION" value="2"/>
</eClassifiers>
</eSubpackages>
+ <eSubpackages name="v2_1" nsURI="jpt.eclipselink.orm.v2_1.xmi" nsPrefix="org.eclipse.jpt.eclipselink.core.resource.orm.v2_1">
+ <eClassifiers xsi:type="ecore:EClass" name="XmlBasic_2_1" abstract="true" interface="true"
+ eSuperTypes="#//v1_1/XmlBasic_1_1">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="returnInsert" eType="#//XmlReturnInsert"
+ containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="returnUpdate" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_1" abstract="true" interface="true"
+ eSuperTypes="#//v2_1/XmlFetchGroupContainer_2_1">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="classExtractor" eType="ecore:EClass ../../org.eclipse.jpt.core/model/orm.ecore#//XmlClassReference"
+ containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlFetchAttribute_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlFetchGroup_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
+ eType="#//XmlFetchAttribute" containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlFetchGroupContainer_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="fetchGroups" upperBound="-1"
+ eType="#//XmlFetchGroup" containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_2_1" abstract="true"
+ interface="true" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlAssociationOverrideContainer ../../org.eclipse.jpt.core/model/orm.ecore#//XmlAttributeOverrideContainer #//v2_1/XmlFetchGroupContainer_2_1 ../../org.eclipse.jpt.core/model/orm.ecore#//XmlGeneratorContainer ../../org.eclipse.jpt.core/model/orm.ecore#//XmlQueryContainer #//XmlQueryContainer">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sqlResultSetMappings"
+ upperBound="-1" eType="ecore:EClass ../../org.eclipse.jpt.core/model/orm.ecore#//SqlResultSetMapping"
+ containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="queryRedirectors" eType="#//XmlQueryRedirectors"
+ containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlReturnInsert_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="returnOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlPrimaryKey_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cacheKeyType" eType="#//v2_1/CacheKeyType_2_1"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="CacheKeyType_2_1">
+ <eLiterals name="ID_VALUE" literal="ID_VALUE"/>
+ <eLiterals name="CACHE_KEY" value="1"/>
+ <eLiterals name="AUTO" value="2"/>
+ </eClassifiers>
+ </eSubpackages>
</ecore:EPackage>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
index 303ed45196..68f4d54ab4 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
@@ -100,6 +100,8 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
case EclipseLinkOrmPackage.XML_EMBEDDED_ID: return (EObject)createXmlEmbeddedId();
case EclipseLinkOrmPackage.XML_ENTITY: return (EObject)createXmlEntity();
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS: return (EObject)createXmlEntityMappings();
+ case EclipseLinkOrmPackage.XML_FETCH_ATTRIBUTE: return (EObject)createXmlFetchAttribute();
+ case EclipseLinkOrmPackage.XML_FETCH_GROUP: return (EObject)createXmlFetchGroup();
case EclipseLinkOrmPackage.XML_ID: return (EObject)createXmlId();
case EclipseLinkOrmPackage.XML_INSTANTIATION_COPY_POLICY: return (EObject)createXmlInstantiationCopyPolicy();
case EclipseLinkOrmPackage.XML_MANY_TO_MANY: return (EObject)createXmlManyToMany();
@@ -116,6 +118,7 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
case EclipseLinkOrmPackage.XML_PRIMARY_KEY: return (EObject)createXmlPrimaryKey();
case EclipseLinkOrmPackage.XML_PROPERTY: return (EObject)createXmlProperty();
case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS: return (EObject)createXmlQueryRedirectors();
+ case EclipseLinkOrmPackage.XML_RETURN_INSERT: return (EObject)createXmlReturnInsert();
case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER: return (EObject)createXmlStoredProcedureParameter();
case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER: return (EObject)createXmlStructConverter();
case EclipseLinkOrmPackage.XML_TIME_OF_DAY: return (EObject)createXmlTimeOfDay();
@@ -401,6 +404,28 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
* <!-- end-user-doc -->
* @generated
*/
+ public XmlFetchAttribute createXmlFetchAttribute()
+ {
+ XmlFetchAttribute xmlFetchAttribute = new XmlFetchAttribute();
+ return xmlFetchAttribute;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public XmlFetchGroup createXmlFetchGroup()
+ {
+ XmlFetchGroup xmlFetchGroup = new XmlFetchGroup();
+ return xmlFetchGroup;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public XmlId createXmlId()
{
XmlId xmlId = new XmlId();
@@ -577,6 +602,17 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
* <!-- end-user-doc -->
* @generated
*/
+ public XmlReturnInsert createXmlReturnInsert()
+ {
+ XmlReturnInsert xmlReturnInsert = new XmlReturnInsert();
+ return xmlReturnInsert;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public XmlStoredProcedureParameter createXmlStoredProcedureParameter()
{
XmlStoredProcedureParameter xmlStoredProcedureParameter = new XmlStoredProcedureParameter();
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
index d3bf0feb02..2421ffa5d5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
@@ -21,6 +21,7 @@ import org.eclipse.jpt.core.resource.orm.OrmPackage;
import org.eclipse.jpt.core.resource.xml.CommonPackage;
import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
/**
* <!-- begin-user-doc -->
@@ -482,13 +483,29 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_BASIC__GENERATED_VALUE = OrmPackage.XML_BASIC_FEATURE_COUNT + 10;
/**
+ * The feature id for the '<em><b>Return Insert</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_BASIC__RETURN_INSERT = OrmPackage.XML_BASIC_FEATURE_COUNT + 11;
+ /**
+ * The feature id for the '<em><b>Return Update</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_BASIC__RETURN_UPDATE = OrmPackage.XML_BASIC_FEATURE_COUNT + 12;
+ /**
* The number of structural features of the '<em>Xml Basic</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_BASIC_FEATURE_COUNT = OrmPackage.XML_BASIC_FEATURE_COUNT + 11;
+ public static final int XML_BASIC_FEATURE_COUNT = OrmPackage.XML_BASIC_FEATURE_COUNT + 13;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}' class.
* <!-- begin-user-doc -->
@@ -858,7 +875,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter()
* @generated
*/
- public static final int XML_NAMED_CONVERTER = 34;
+ public static final int XML_NAMED_CONVERTER = 36;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -1968,117 +1985,133 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_ENTITY__ENTITY_LISTENERS = OrmPackage.XML_ENTITY__ENTITY_LISTENERS;
/**
- * The feature id for the '<em><b>Read Only</b></em>' attribute.
+ * The feature id for the '<em><b>Primary Key</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__READ_ONLY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 0;
+ public static final int XML_ENTITY__PRIMARY_KEY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Customizer</b></em>' containment reference.
+ * The feature id for the '<em><b>Cache Interceptor</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__CUSTOMIZER = OrmPackage.XML_ENTITY_FEATURE_COUNT + 1;
+ public static final int XML_ENTITY__CACHE_INTERCEPTOR = OrmPackage.XML_ENTITY_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>Change Tracking</b></em>' containment reference.
+ * The feature id for the '<em><b>Query Redirectors</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__CHANGE_TRACKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 2;
+ public static final int XML_ENTITY__QUERY_REDIRECTORS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 2;
/**
- * The feature id for the '<em><b>Cache</b></em>' containment reference.
+ * The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__CACHE = OrmPackage.XML_ENTITY_FEATURE_COUNT + 3;
+ public static final int XML_ENTITY__FETCH_GROUPS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 3;
/**
- * The feature id for the '<em><b>Existence Checking</b></em>' attribute.
+ * The feature id for the '<em><b>Class Extractor</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__EXISTENCE_CHECKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 4;
+ public static final int XML_ENTITY__CLASS_EXTRACTOR = OrmPackage.XML_ENTITY_FEATURE_COUNT + 4;
/**
- * The feature id for the '<em><b>Converters</b></em>' containment reference list.
+ * The feature id for the '<em><b>Read Only</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 5;
+ public static final int XML_ENTITY__READ_ONLY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 5;
/**
- * The feature id for the '<em><b>Type Converters</b></em>' containment reference list.
+ * The feature id for the '<em><b>Customizer</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 6;
+ public static final int XML_ENTITY__CUSTOMIZER = OrmPackage.XML_ENTITY_FEATURE_COUNT + 6;
/**
- * The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list.
+ * The feature id for the '<em><b>Change Tracking</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 7;
+ public static final int XML_ENTITY__CHANGE_TRACKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 7;
/**
- * The feature id for the '<em><b>Struct Converters</b></em>' containment reference list.
+ * The feature id for the '<em><b>Cache</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__STRUCT_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 8;
+ public static final int XML_ENTITY__CACHE = OrmPackage.XML_ENTITY_FEATURE_COUNT + 8;
/**
- * The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
+ * The feature id for the '<em><b>Existence Checking</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 9;
+ public static final int XML_ENTITY__EXISTENCE_CHECKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 9;
/**
- * The feature id for the '<em><b>Properties</b></em>' containment reference list.
+ * The feature id for the '<em><b>Converters</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__PROPERTIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 10;
+ public static final int XML_ENTITY__CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 10;
/**
- * The feature id for the '<em><b>Primary Key</b></em>' containment reference.
+ * The feature id for the '<em><b>Type Converters</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__PRIMARY_KEY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 11;
+ public static final int XML_ENTITY__TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 11;
/**
- * The feature id for the '<em><b>Cache Interceptor</b></em>' containment reference.
+ * The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__CACHE_INTERCEPTOR = OrmPackage.XML_ENTITY_FEATURE_COUNT + 12;
+ public static final int XML_ENTITY__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 12;
/**
- * The feature id for the '<em><b>Query Redirectors</b></em>' containment reference.
+ * The feature id for the '<em><b>Struct Converters</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ENTITY__STRUCT_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 13;
+ /**
+ * The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__QUERY_REDIRECTORS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 13;
+ public static final int XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 14;
+ /**
+ * The feature id for the '<em><b>Properties</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ENTITY__PROPERTIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 15;
/**
* The feature id for the '<em><b>Optimistic Locking</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -2086,7 +2119,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__OPTIMISTIC_LOCKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 14;
+ public static final int XML_ENTITY__OPTIMISTIC_LOCKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 16;
/**
* The feature id for the '<em><b>Copy Policy</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -2094,7 +2127,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 15;
+ public static final int XML_ENTITY__COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 17;
/**
* The feature id for the '<em><b>Instantiation Copy Policy</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -2102,7 +2135,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__INSTANTIATION_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 16;
+ public static final int XML_ENTITY__INSTANTIATION_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 18;
/**
* The feature id for the '<em><b>Clone Copy Policy</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -2110,7 +2143,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__CLONE_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 17;
+ public static final int XML_ENTITY__CLONE_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 19;
/**
* The feature id for the '<em><b>Exclude Default Mappings</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -2118,7 +2151,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 18;
+ public static final int XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 20;
/**
* The number of structural features of the '<em>Xml Entity</em>' class.
* <!-- begin-user-doc -->
@@ -2126,7 +2159,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_FEATURE_COUNT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 19;
+ public static final int XML_ENTITY_FEATURE_COUNT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 21;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
* <!-- begin-user-doc -->
@@ -2313,6 +2346,64 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_ENTITY_MAPPINGS_FEATURE_COUNT = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 5;
/**
+ * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchAttribute <em>Xml Fetch Attribute</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchAttribute
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchAttribute()
+ * @generated
+ */
+ public static final int XML_FETCH_ATTRIBUTE = 27;
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FETCH_ATTRIBUTE__NAME = EclipseLinkOrmV2_1Package.XML_FETCH_ATTRIBUTE_21__NAME;
+ /**
+ * The number of structural features of the '<em>Xml Fetch Attribute</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FETCH_ATTRIBUTE_FEATURE_COUNT = EclipseLinkOrmV2_1Package.XML_FETCH_ATTRIBUTE_21_FEATURE_COUNT + 0;
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchGroup <em>Xml Fetch Group</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchGroup
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroup()
+ * @generated
+ */
+ public static final int XML_FETCH_GROUP = 28;
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FETCH_GROUP__NAME = EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_21__NAME;
+ /**
+ * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FETCH_GROUP__ATTRIBUTES = EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_21__ATTRIBUTES;
+ /**
+ * The number of structural features of the '<em>Xml Fetch Group</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FETCH_GROUP_FEATURE_COUNT = EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_21_FEATURE_COUNT + 0;
+ /**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlId <em>Xml Id</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2320,7 +2411,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId()
* @generated
*/
- public static final int XML_ID = 27;
+ public static final int XML_ID = 29;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -2473,7 +2564,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlInstantiationCopyPolicy()
* @generated
*/
- public static final int XML_INSTANTIATION_COPY_POLICY = 28;
+ public static final int XML_INSTANTIATION_COPY_POLICY = 30;
/**
* The number of structural features of the '<em>Xml Instantiation Copy Policy</em>' class.
* <!-- begin-user-doc -->
@@ -2490,7 +2581,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch()
* @generated
*/
- public static final int XML_JOIN_FETCH = 29;
+ public static final int XML_JOIN_FETCH = 31;
/**
* The feature id for the '<em><b>Join Fetch</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -2515,7 +2606,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany()
* @generated
*/
- public static final int XML_MANY_TO_MANY = 30;
+ public static final int XML_MANY_TO_MANY = 32;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -2732,7 +2823,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOne()
* @generated
*/
- public static final int XML_MANY_TO_ONE = 31;
+ public static final int XML_MANY_TO_ONE = 33;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -2853,7 +2944,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass()
* @generated
*/
- public static final int XML_MAPPED_SUPERCLASS = 32;
+ public static final int XML_MAPPED_SUPERCLASS = 34;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -2927,109 +3018,189 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS = OrmPackage.XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS;
/**
- * The feature id for the '<em><b>Read Only</b></em>' attribute.
+ * The feature id for the '<em><b>Primary Key</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__READ_ONLY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 0;
+ public static final int XML_MAPPED_SUPERCLASS__PRIMARY_KEY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Customizer</b></em>' containment reference.
+ * The feature id for the '<em><b>Cacheable</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__CUSTOMIZER = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 1;
+ public static final int XML_MAPPED_SUPERCLASS__CACHEABLE = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>Change Tracking</b></em>' containment reference.
+ * The feature id for the '<em><b>Cache Interceptor</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__CHANGE_TRACKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 2;
+ public static final int XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 2;
/**
- * The feature id for the '<em><b>Cache</b></em>' containment reference.
+ * The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__CACHE = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 3;
+ public static final int XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 3;
/**
- * The feature id for the '<em><b>Existence Checking</b></em>' attribute.
+ * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 4;
+ public static final int XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 4;
/**
- * The feature id for the '<em><b>Converters</b></em>' containment reference list.
+ * The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 5;
+ public static final int XML_MAPPED_SUPERCLASS__FETCH_GROUPS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 5;
/**
- * The feature id for the '<em><b>Type Converters</b></em>' containment reference list.
+ * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 6;
+ public static final int XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 6;
/**
- * The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list.
+ * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 7;
+ public static final int XML_MAPPED_SUPERCLASS__TABLE_GENERATOR = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 7;
/**
- * The feature id for the '<em><b>Struct Converters</b></em>' containment reference list.
+ * The feature id for the '<em><b>Named Queries</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 8;
+ public static final int XML_MAPPED_SUPERCLASS__NAMED_QUERIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 8;
/**
- * The feature id for the '<em><b>Properties</b></em>' containment reference list.
+ * The feature id for the '<em><b>Named Native Queries</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__PROPERTIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 9;
+ public static final int XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 9;
/**
- * The feature id for the '<em><b>Primary Key</b></em>' containment reference.
+ * The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__PRIMARY_KEY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 10;
+ public static final int XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 10;
/**
- * The feature id for the '<em><b>Cacheable</b></em>' attribute.
+ * The feature id for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__CACHEABLE = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 11;
+ public static final int XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 11;
/**
- * The feature id for the '<em><b>Cache Interceptor</b></em>' containment reference.
+ * The feature id for the '<em><b>Query Redirectors</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 12;
+ public static final int XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 12;
+ /**
+ * The feature id for the '<em><b>Read Only</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS__READ_ONLY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 13;
+ /**
+ * The feature id for the '<em><b>Customizer</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS__CUSTOMIZER = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 14;
+ /**
+ * The feature id for the '<em><b>Change Tracking</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS__CHANGE_TRACKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 15;
+ /**
+ * The feature id for the '<em><b>Cache</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS__CACHE = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 16;
+ /**
+ * The feature id for the '<em><b>Existence Checking</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 17;
+ /**
+ * The feature id for the '<em><b>Converters</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS__CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 18;
+ /**
+ * The feature id for the '<em><b>Type Converters</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 19;
+ /**
+ * The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 20;
+ /**
+ * The feature id for the '<em><b>Struct Converters</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 21;
+ /**
+ * The feature id for the '<em><b>Properties</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS__PROPERTIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 22;
/**
* The feature id for the '<em><b>Optimistic Locking</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -3037,7 +3208,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 13;
+ public static final int XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 23;
/**
* The feature id for the '<em><b>Copy Policy</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -3045,7 +3216,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 14;
+ public static final int XML_MAPPED_SUPERCLASS__COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 24;
/**
* The feature id for the '<em><b>Instantiation Copy Policy</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -3053,7 +3224,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 15;
+ public static final int XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 25;
/**
* The feature id for the '<em><b>Clone Copy Policy</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -3061,7 +3232,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 16;
+ public static final int XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 26;
/**
* The feature id for the '<em><b>Exclude Default Mappings</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -3069,7 +3240,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 17;
+ public static final int XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 27;
/**
* The number of structural features of the '<em>Xml Mapped Superclass</em>' class.
* <!-- begin-user-doc -->
@@ -3077,7 +3248,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS_FEATURE_COUNT = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 18;
+ public static final int XML_MAPPED_SUPERCLASS_FEATURE_COUNT = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 28;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMutable <em>Xml Mutable</em>}' class.
* <!-- begin-user-doc -->
@@ -3086,7 +3257,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMutable()
* @generated
*/
- public static final int XML_MUTABLE = 33;
+ public static final int XML_MUTABLE = 35;
/**
* The feature id for the '<em><b>Mutable</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -3111,7 +3282,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery()
* @generated
*/
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY = 35;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY = 37;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -3184,7 +3355,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter()
* @generated
*/
- public static final int XML_OBJECT_TYPE_CONVERTER = 36;
+ public static final int XML_OBJECT_TYPE_CONVERTER = 38;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -3241,7 +3412,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany()
* @generated
*/
- public static final int XML_ONE_TO_MANY = 37;
+ public static final int XML_ONE_TO_MANY = 39;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -3482,7 +3653,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne()
* @generated
*/
- public static final int XML_ONE_TO_ONE = 38;
+ public static final int XML_ONE_TO_ONE = 40;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -3635,7 +3806,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLocking()
* @generated
*/
- public static final int XML_OPTIMISTIC_LOCKING = 39;
+ public static final int XML_OPTIMISTIC_LOCKING = 41;
/**
* The feature id for the '<em><b>Type</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -3676,7 +3847,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOrderColumn()
* @generated
*/
- public static final int XML_ORDER_COLUMN = 40;
+ public static final int XML_ORDER_COLUMN = 42;
/**
* The feature id for the '<em><b>Column Definition</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -3741,7 +3912,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitMetadata()
* @generated
*/
- public static final int XML_PERSISTENCE_UNIT_METADATA = 41;
+ public static final int XML_PERSISTENCE_UNIT_METADATA = 43;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -3790,7 +3961,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrimaryKey()
* @generated
*/
- public static final int XML_PRIMARY_KEY = 42;
+ public static final int XML_PRIMARY_KEY = 44;
/**
* The feature id for the '<em><b>Validation</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -3808,13 +3979,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_PRIMARY_KEY__COLUMNS = EclipseLinkOrmV1_1Package.XML_PRIMARY_KEY_11__COLUMNS;
/**
+ * The feature id for the '<em><b>Cache Key Type</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_PRIMARY_KEY__CACHE_KEY_TYPE = EclipseLinkOrmV1_1Package.XML_PRIMARY_KEY_11_FEATURE_COUNT + 0;
+ /**
* The number of structural features of the '<em>Xml Primary Key</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_PRIMARY_KEY_FEATURE_COUNT = EclipseLinkOrmV1_1Package.XML_PRIMARY_KEY_11_FEATURE_COUNT + 0;
+ public static final int XML_PRIMARY_KEY_FEATURE_COUNT = EclipseLinkOrmV1_1Package.XML_PRIMARY_KEY_11_FEATURE_COUNT + 1;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrivateOwned <em>Xml Private Owned</em>}' class.
* <!-- begin-user-doc -->
@@ -3823,7 +4002,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrivateOwned()
* @generated
*/
- public static final int XML_PRIVATE_OWNED = 43;
+ public static final int XML_PRIVATE_OWNED = 45;
/**
* The feature id for the '<em><b>Private Owned</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -3848,7 +4027,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlProperty()
* @generated
*/
- public static final int XML_PROPERTY = 44;
+ public static final int XML_PROPERTY = 46;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -3889,7 +4068,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer()
* @generated
*/
- public static final int XML_PROPERTY_CONTAINER = 45;
+ public static final int XML_PROPERTY_CONTAINER = 47;
/**
* The feature id for the '<em><b>Properties</b></em>' containment reference list.
* <!-- begin-user-doc -->
@@ -3914,7 +4093,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer()
* @generated
*/
- public static final int XML_QUERY_CONTAINER = 46;
+ public static final int XML_QUERY_CONTAINER = 48;
/**
* The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
* <!-- begin-user-doc -->
@@ -3939,7 +4118,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors()
* @generated
*/
- public static final int XML_QUERY_REDIRECTORS = 47;
+ public static final int XML_QUERY_REDIRECTORS = 49;
/**
* The feature id for the '<em><b>All Queries</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -4012,7 +4191,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReadOnly()
* @generated
*/
- public static final int XML_READ_ONLY = 48;
+ public static final int XML_READ_ONLY = 50;
/**
* The feature id for the '<em><b>Read Only</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -4030,6 +4209,31 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_READ_ONLY_FEATURE_COUNT = 1;
/**
+ * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlReturnInsert <em>Xml Return Insert</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlReturnInsert
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReturnInsert()
+ * @generated
+ */
+ public static final int XML_RETURN_INSERT = 51;
+ /**
+ * The feature id for the '<em><b>Return Only</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_RETURN_INSERT__RETURN_ONLY = EclipseLinkOrmV2_1Package.XML_RETURN_INSERT_21__RETURN_ONLY;
+ /**
+ * The number of structural features of the '<em>Xml Return Insert</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_RETURN_INSERT_FEATURE_COUNT = EclipseLinkOrmV2_1Package.XML_RETURN_INSERT_21_FEATURE_COUNT + 0;
+ /**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStoredProcedureParameter <em>Xml Stored Procedure Parameter</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4037,7 +4241,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter()
* @generated
*/
- public static final int XML_STORED_PROCEDURE_PARAMETER = 49;
+ public static final int XML_STORED_PROCEDURE_PARAMETER = 52;
/**
* The feature id for the '<em><b>Direction</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -4102,7 +4306,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter()
* @generated
*/
- public static final int XML_STRUCT_CONVERTER = 50;
+ public static final int XML_STRUCT_CONVERTER = 53;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -4135,7 +4339,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTimeOfDay()
* @generated
*/
- public static final int XML_TIME_OF_DAY = 51;
+ public static final int XML_TIME_OF_DAY = 54;
/**
* The feature id for the '<em><b>Hour</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -4184,7 +4388,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformation()
* @generated
*/
- public static final int XML_TRANSFORMATION = 52;
+ public static final int XML_TRANSFORMATION = 55;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -4233,7 +4437,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransient()
* @generated
*/
- public static final int XML_TRANSIENT = 53;
+ public static final int XML_TRANSIENT = 56;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -4282,7 +4486,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter()
* @generated
*/
- public static final int XML_TYPE_CONVERTER = 54;
+ public static final int XML_TYPE_CONVERTER = 57;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -4323,7 +4527,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOne()
* @generated
*/
- public static final int XML_VARIABLE_ONE_TO_ONE = 55;
+ public static final int XML_VARIABLE_ONE_TO_ONE = 58;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -4372,7 +4576,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion()
* @generated
*/
- public static final int XML_VERSION = 56;
+ public static final int XML_VERSION = 59;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -4501,7 +4705,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheCoordinationType()
* @generated
*/
- public static final int CACHE_COORDINATION_TYPE = 57;
+ public static final int CACHE_COORDINATION_TYPE = 60;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.CacheType <em>Cache Type</em>}' enum.
* <!-- begin-user-doc -->
@@ -4510,7 +4714,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheType()
* @generated
*/
- public static final int CACHE_TYPE = 58;
+ public static final int CACHE_TYPE = 61;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTrackingType <em>Xml Change Tracking Type</em>}' enum.
* <!-- begin-user-doc -->
@@ -4519,7 +4723,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingType()
* @generated
*/
- public static final int XML_CHANGE_TRACKING_TYPE = 59;
+ public static final int XML_CHANGE_TRACKING_TYPE = 62;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlDirection <em>Xml Direction</em>}' enum.
* <!-- begin-user-doc -->
@@ -4528,7 +4732,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlDirection()
* @generated
*/
- public static final int XML_DIRECTION = 60;
+ public static final int XML_DIRECTION = 63;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.ExistenceType <em>Existence Type</em>}' enum.
* <!-- begin-user-doc -->
@@ -4537,7 +4741,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getExistenceType()
* @generated
*/
- public static final int EXISTENCE_TYPE = 61;
+ public static final int EXISTENCE_TYPE = 64;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType <em>Xml Join Fetch Type</em>}' enum.
* <!-- begin-user-doc -->
@@ -4546,7 +4750,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetchType()
* @generated
*/
- public static final int XML_JOIN_FETCH_TYPE = 62;
+ public static final int XML_JOIN_FETCH_TYPE = 65;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOptimisticLockingType <em>Xml Optimistic Locking Type</em>}' enum.
* <!-- begin-user-doc -->
@@ -4555,7 +4759,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLockingType()
* @generated
*/
- public static final int XML_OPTIMISTIC_LOCKING_TYPE = 63;
+ public static final int XML_OPTIMISTIC_LOCKING_TYPE = 66;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4723,6 +4927,18 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
+ private EClass xmlFetchAttributeEClass = null;
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass xmlFetchGroupEClass = null;
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EClass xmlIdEClass = null;
/**
* <!-- begin-user-doc -->
@@ -4855,6 +5071,12 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
+ private EClass xmlReturnInsertEClass = null;
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EClass xmlStoredProcedureParameterEClass = null;
/**
* <!-- begin-user-doc -->
@@ -4997,16 +5219,19 @@ public class EclipseLinkOrmPackage extends EPackageImpl
// Obtain or create and register interdependencies
EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) instanceof EclipseLinkOrmV1_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) : EclipseLinkOrmV1_1Package.eINSTANCE);
EclipseLinkOrmV2_0Package theEclipseLinkOrmV2_0Package = (EclipseLinkOrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) instanceof EclipseLinkOrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) : EclipseLinkOrmV2_0Package.eINSTANCE);
+ EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) instanceof EclipseLinkOrmV2_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) : EclipseLinkOrmV2_1Package.eINSTANCE);
// Create package meta-data objects
theEclipseLinkOrmPackage.createPackageContents();
theEclipseLinkOrmV1_1Package.createPackageContents();
theEclipseLinkOrmV2_0Package.createPackageContents();
+ theEclipseLinkOrmV2_1Package.createPackageContents();
// Initialize created meta-data
theEclipseLinkOrmPackage.initializePackageContents();
theEclipseLinkOrmV1_1Package.initializePackageContents();
theEclipseLinkOrmV2_0Package.initializePackageContents();
+ theEclipseLinkOrmV2_1Package.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theEclipseLinkOrmPackage.freeze();
@@ -6013,6 +6238,32 @@ public class EclipseLinkOrmPackage extends EPackageImpl
}
/**
+ * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchAttribute <em>Xml Fetch Attribute</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Fetch Attribute</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchAttribute
+ * @generated
+ */
+ public EClass getXmlFetchAttribute()
+ {
+ return xmlFetchAttributeEClass;
+ }
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchGroup <em>Xml Fetch Group</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Fetch Group</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchGroup
+ * @generated
+ */
+ public EClass getXmlFetchGroup()
+ {
+ return xmlFetchGroupEClass;
+ }
+
+ /**
* Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlId <em>Xml Id</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -6719,6 +6970,19 @@ public class EclipseLinkOrmPackage extends EPackageImpl
}
/**
+ * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlReturnInsert <em>Xml Return Insert</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Return Insert</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlReturnInsert
+ * @generated
+ */
+ public EClass getXmlReturnInsert()
+ {
+ return xmlReturnInsertEClass;
+ }
+
+ /**
* Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStoredProcedureParameter <em>Xml Stored Procedure Parameter</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -7227,6 +7491,10 @@ public class EclipseLinkOrmPackage extends EPackageImpl
xmlEntityMappingsEClass = createEClass(XML_ENTITY_MAPPINGS);
+ xmlFetchAttributeEClass = createEClass(XML_FETCH_ATTRIBUTE);
+
+ xmlFetchGroupEClass = createEClass(XML_FETCH_GROUP);
+
xmlIdEClass = createEClass(XML_ID);
xmlInstantiationCopyPolicyEClass = createEClass(XML_INSTANTIATION_COPY_POLICY);
@@ -7301,6 +7569,8 @@ public class EclipseLinkOrmPackage extends EPackageImpl
xmlReadOnlyEClass = createEClass(XML_READ_ONLY);
createEAttribute(xmlReadOnlyEClass, XML_READ_ONLY__READ_ONLY);
+ xmlReturnInsertEClass = createEClass(XML_RETURN_INSERT);
+
xmlStoredProcedureParameterEClass = createEClass(XML_STORED_PROCEDURE_PARAMETER);
createEAttribute(xmlStoredProcedureParameterEClass, XML_STORED_PROCEDURE_PARAMETER__DIRECTION);
createEAttribute(xmlStoredProcedureParameterEClass, XML_STORED_PROCEDURE_PARAMETER__NAME);
@@ -7367,12 +7637,14 @@ public class EclipseLinkOrmPackage extends EPackageImpl
// Obtain other dependent packages
EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI);
EclipseLinkOrmV2_0Package theEclipseLinkOrmV2_0Package = (EclipseLinkOrmV2_0Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI);
+ EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI);
XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
// Add subpackages
getESubpackages().add(theEclipseLinkOrmV1_1Package);
getESubpackages().add(theEclipseLinkOrmV2_0Package);
+ getESubpackages().add(theEclipseLinkOrmV2_1Package);
// Create type parameters
@@ -7387,7 +7659,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
xmlBasicEClass.getESuperTypes().add(this.getXmlAttributeMapping());
xmlBasicEClass.getESuperTypes().add(this.getXmlMutable());
xmlBasicEClass.getESuperTypes().add(this.getXmlConvertibleMapping());
- xmlBasicEClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlBasic_1_1());
+ xmlBasicEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlBasic_2_1());
xmlBasicCollectionEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping());
xmlBasicCollectionEClass.getESuperTypes().add(this.getXmlAttributeMapping());
xmlBasicMapEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping());
@@ -7408,6 +7680,9 @@ public class EclipseLinkOrmPackage extends EPackageImpl
xmlEmbeddedIdEClass.getESuperTypes().add(theOrmPackage.getXmlEmbeddedId());
xmlEmbeddedIdEClass.getESuperTypes().add(this.getXmlAttributeMapping());
xmlEntityEClass.getESuperTypes().add(theOrmPackage.getXmlEntity());
+ xmlEntityEClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlEntity_1_1());
+ xmlEntityEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlEntity_2_0());
+ xmlEntityEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlEntity_2_1());
xmlEntityEClass.getESuperTypes().add(this.getXmlReadOnly());
xmlEntityEClass.getESuperTypes().add(this.getXmlCustomizerHolder());
xmlEntityEClass.getESuperTypes().add(this.getXmlChangeTrackingHolder());
@@ -7415,11 +7690,11 @@ public class EclipseLinkOrmPackage extends EPackageImpl
xmlEntityEClass.getESuperTypes().add(this.getXmlConvertersHolder());
xmlEntityEClass.getESuperTypes().add(this.getXmlQueryContainer());
xmlEntityEClass.getESuperTypes().add(this.getXmlPropertyContainer());
- xmlEntityEClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlEntity_1_1());
- xmlEntityEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlEntity_2_0());
xmlEntityMappingsEClass.getESuperTypes().add(theOrmPackage.getXmlEntityMappings());
xmlEntityMappingsEClass.getESuperTypes().add(this.getXmlConvertersHolder());
xmlEntityMappingsEClass.getESuperTypes().add(this.getXmlQueryContainer());
+ xmlFetchAttributeEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlFetchAttribute_2_1());
+ xmlFetchGroupEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlFetchGroup_2_1());
xmlIdEClass.getESuperTypes().add(theOrmPackage.getXmlId());
xmlIdEClass.getESuperTypes().add(this.getXmlAttributeMapping());
xmlIdEClass.getESuperTypes().add(this.getXmlMutable());
@@ -7432,14 +7707,15 @@ public class EclipseLinkOrmPackage extends EPackageImpl
xmlManyToOneEClass.getESuperTypes().add(this.getXmlAttributeMapping());
xmlManyToOneEClass.getESuperTypes().add(this.getXmlJoinFetch());
xmlMappedSuperclassEClass.getESuperTypes().add(theOrmPackage.getXmlMappedSuperclass());
+ xmlMappedSuperclassEClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlMappedSuperclass_1_1());
+ xmlMappedSuperclassEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlMappedSuperclass_2_0());
+ xmlMappedSuperclassEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlMappedSuperclass_2_1());
xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlReadOnly());
xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlCustomizerHolder());
xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlChangeTrackingHolder());
xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlCacheHolder());
xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlConvertersHolder());
xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlPropertyContainer());
- xmlMappedSuperclassEClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlMappedSuperclass_1_1());
- xmlMappedSuperclassEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlMappedSuperclass_2_0());
xmlObjectTypeConverterEClass.getESuperTypes().add(this.getXmlNamedConverter());
xmlOneToManyEClass.getESuperTypes().add(theOrmPackage.getXmlOneToMany());
xmlOneToManyEClass.getESuperTypes().add(this.getXmlAttributeMapping());
@@ -7454,7 +7730,9 @@ public class EclipseLinkOrmPackage extends EPackageImpl
xmlOrderColumnEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlOrderColumn_2_0());
xmlPersistenceUnitMetadataEClass.getESuperTypes().add(theOrmPackage.getXmlPersistenceUnitMetadata());
xmlPrimaryKeyEClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlPrimaryKey_1_1());
+ xmlPrimaryKeyEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlPrimaryKey_2_1());
xmlQueryRedirectorsEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlQueryRedirectors_2_0());
+ xmlReturnInsertEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlReturnInsert_2_1());
xmlStructConverterEClass.getESuperTypes().add(this.getXmlNamedConverter());
xmlTransformationEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping());
xmlTransformationEClass.getESuperTypes().add(this.getXmlAttributeMapping());
@@ -7569,6 +7847,10 @@ public class EclipseLinkOrmPackage extends EPackageImpl
initEClass(xmlEntityMappingsEClass, XmlEntityMappings.class, "XmlEntityMappings", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEClass(xmlFetchAttributeEClass, XmlFetchAttribute.class, "XmlFetchAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+ initEClass(xmlFetchGroupEClass, XmlFetchGroup.class, "XmlFetchGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
initEClass(xmlIdEClass, XmlId.class, "XmlId", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(xmlInstantiationCopyPolicyEClass, XmlInstantiationCopyPolicy.class, "XmlInstantiationCopyPolicy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -7643,6 +7925,8 @@ public class EclipseLinkOrmPackage extends EPackageImpl
initEClass(xmlReadOnlyEClass, XmlReadOnly.class, "XmlReadOnly", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlReadOnly_ReadOnly(), theXMLTypePackage.getBooleanObject(), "readOnly", null, 0, 1, XmlReadOnly.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(xmlReturnInsertEClass, XmlReturnInsert.class, "XmlReturnInsert", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
initEClass(xmlStoredProcedureParameterEClass, XmlStoredProcedureParameter.class, "XmlStoredProcedureParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlStoredProcedureParameter_Direction(), this.getXmlDirection(), "direction", null, 0, 1, XmlStoredProcedureParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlStoredProcedureParameter_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlStoredProcedureParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -8373,6 +8657,26 @@ public class EclipseLinkOrmPackage extends EPackageImpl
public static final EClass XML_ENTITY_MAPPINGS = eINSTANCE.getXmlEntityMappings();
/**
+ * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchAttribute <em>Xml Fetch Attribute</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchAttribute
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchAttribute()
+ * @generated
+ */
+ public static final EClass XML_FETCH_ATTRIBUTE = eINSTANCE.getXmlFetchAttribute();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchGroup <em>Xml Fetch Group</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchGroup
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroup()
+ * @generated
+ */
+ public static final EClass XML_FETCH_GROUP = eINSTANCE.getXmlFetchGroup();
+
+ /**
* The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlId <em>Xml Id</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -8833,6 +9137,16 @@ public class EclipseLinkOrmPackage extends EPackageImpl
public static final EAttribute XML_READ_ONLY__READ_ONLY = eINSTANCE.getXmlReadOnly_ReadOnly();
/**
+ * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlReturnInsert <em>Xml Return Insert</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlReturnInsert
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReturnInsert()
+ * @generated
+ */
+ public static final EClass XML_RETURN_INSERT = eINSTANCE.getXmlReturnInsert();
+
+ /**
* The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStoredProcedureParameter <em>Xml Stored Procedure Parameter</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java
index a4358435cb..b04b1b3525 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java
@@ -30,6 +30,9 @@ import org.eclipse.jpt.core.utility.TextRange;
import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.EclipseLink1_1;
import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package;
import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.XmlBasic_1_1;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -53,7 +56,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic implements XmlAttributeMapping, XmlMutable, XmlConvertibleMapping, XmlBasic_1_1
+public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic implements XmlAttributeMapping, XmlMutable, XmlConvertibleMapping, XmlBasic_2_1
{
/**
* The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
@@ -175,6 +178,34 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme
protected XmlGeneratedValue generatedValue;
/**
+ * The cached value of the '{@link #getReturnInsert() <em>Return Insert</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getReturnInsert()
+ * @generated
+ * @ordered
+ */
+ protected XmlReturnInsert returnInsert;
+ /**
+ * The default value of the '{@link #getReturnUpdate() <em>Return Update</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getReturnUpdate()
+ * @generated
+ * @ordered
+ */
+ protected static final Boolean RETURN_UPDATE_EDEFAULT = null;
+ /**
+ * The cached value of the '{@link #getReturnUpdate() <em>Return Update</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getReturnUpdate()
+ * @generated
+ * @ordered
+ */
+ protected Boolean returnUpdate = RETURN_UPDATE_EDEFAULT;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -446,6 +477,101 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme
}
/**
+ * Returns the value of the '<em><b>Return Insert</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Return Insert</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Return Insert</em>' containment reference.
+ * @see #setReturnInsert(XmlReturnInsert)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_2_1_ReturnInsert()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlReturnInsert getReturnInsert()
+ {
+ return returnInsert;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetReturnInsert(XmlReturnInsert newReturnInsert, NotificationChain msgs)
+ {
+ XmlReturnInsert oldReturnInsert = returnInsert;
+ returnInsert = newReturnInsert;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT, oldReturnInsert, newReturnInsert);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic#getReturnInsert <em>Return Insert</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Return Insert</em>' containment reference.
+ * @see #getReturnInsert()
+ * @generated
+ */
+ public void setReturnInsert(XmlReturnInsert newReturnInsert)
+ {
+ if (newReturnInsert != returnInsert)
+ {
+ NotificationChain msgs = null;
+ if (returnInsert != null)
+ msgs = ((InternalEObject)returnInsert).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT, null, msgs);
+ if (newReturnInsert != null)
+ msgs = ((InternalEObject)newReturnInsert).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT, null, msgs);
+ msgs = basicSetReturnInsert(newReturnInsert, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT, newReturnInsert, newReturnInsert));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Return Update</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Return Update</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Return Update</em>' attribute.
+ * @see #setReturnUpdate(Boolean)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_2_1_ReturnUpdate()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
+ * @generated
+ */
+ public Boolean getReturnUpdate()
+ {
+ return returnUpdate;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic#getReturnUpdate <em>Return Update</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Return Update</em>' attribute.
+ * @see #getReturnUpdate()
+ * @generated
+ */
+ public void setReturnUpdate(Boolean newReturnUpdate)
+ {
+ Boolean oldReturnUpdate = returnUpdate;
+ returnUpdate = newReturnUpdate;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE, oldReturnUpdate, returnUpdate));
+ }
+
+ /**
* Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
@@ -796,6 +922,8 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme
return basicSetTableGenerator(null, msgs);
case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE:
return basicSetGeneratedValue(null, msgs);
+ case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT:
+ return basicSetReturnInsert(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -832,6 +960,10 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme
return getTableGenerator();
case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE:
return getGeneratedValue();
+ case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT:
+ return getReturnInsert();
+ case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE:
+ return getReturnUpdate();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -881,6 +1013,12 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme
case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE:
setGeneratedValue((XmlGeneratedValue)newValue);
return;
+ case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT:
+ setReturnInsert((XmlReturnInsert)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE:
+ setReturnUpdate((Boolean)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -928,6 +1066,12 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme
case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE:
setGeneratedValue((XmlGeneratedValue)null);
return;
+ case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT:
+ setReturnInsert((XmlReturnInsert)null);
+ return;
+ case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE:
+ setReturnUpdate(RETURN_UPDATE_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -964,6 +1108,10 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme
return tableGenerator != null;
case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE:
return generatedValue != null;
+ case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT:
+ return returnInsert != null;
+ case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE:
+ return RETURN_UPDATE_EDEFAULT == null ? returnUpdate != null : !RETURN_UPDATE_EDEFAULT.equals(returnUpdate);
}
return super.eIsSet(featureID);
}
@@ -1043,6 +1191,15 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme
default: return -1;
}
}
+ if (baseClass == XmlBasic_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT: return EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_INSERT;
+ case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE: return EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_UPDATE;
+ default: return -1;
+ }
+ }
return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
}
@@ -1121,6 +1278,15 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme
default: return -1;
}
}
+ if (baseClass == XmlBasic_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_INSERT: return EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT;
+ case EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_UPDATE: return EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE;
+ default: return -1;
+ }
+ }
return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
}
@@ -1139,6 +1305,8 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme
result.append(mutable);
result.append(", convert: ");
result.append(convert);
+ result.append(", returnUpdate: ");
+ result.append(returnUpdate);
result.append(')');
return result.toString();
}
@@ -1181,8 +1349,9 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme
buildTableGeneratorTranslator(),
buildSequenceGeneratorTranslator(),
buildPropertyTranslator(),
- buildAccessMethodsTranslator()
- };
+ buildAccessMethodsTranslator(),
+ buildReturnInsertTranslator(),
+ buildReturnUpdateTranslator()};
}
protected static Translator buildMutableTranslator() {
@@ -1228,4 +1397,12 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme
protected static Translator buildAccessMethodsTranslator() {
return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
}
+
+ protected static Translator buildReturnInsertTranslator() {
+ return XmlReturnInsert.buildTranslator(EclipseLink2_1.RETURN_INSERT, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlBasic_2_1_ReturnInsert());
+ }
+
+ protected static Translator buildReturnUpdateTranslator() {
+ return new Translator(EclipseLink2_1.RETURN_UPDATE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlBasic_2_1_ReturnUpdate());
+ }
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCacheInterceptor.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCacheInterceptor.java
index f0abbfbdf0..aac718240f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCacheInterceptor.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCacheInterceptor.java
@@ -10,16 +10,12 @@
package org.eclipse.jpt.eclipselink.core.resource.orm;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.core.resource.orm.JPA;
import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
-
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0;
import org.eclipse.wst.common.internal.emf.resource.Translator;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddable.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddable.java
index 153ff92b44..6013c9bf76 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddable.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddable.java
@@ -984,12 +984,11 @@ public class XmlEmbeddable extends org.eclipse.jpt.core.resource.orm.XmlEmbeddab
buildTypeConverterTranslator(),
buildObjectTypeConverterTranslator(),
buildStructConverterTranslator(),
- buildPropertyTranslator(),
- Attributes.buildTranslator(),
buildCopyPolicyTranslator(),
buildInstantiationCoypPolicyTranslator(),
buildCloneCopyPolicyTranslator(),
- };
+ buildPropertyTranslator(),
+ Attributes.buildTranslator()};
}
protected static Translator buildExcludeDefaultMappingsTranslator() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java
index c5824604df..ada50de464 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java
@@ -22,16 +22,18 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.core.resource.orm.XmlClassReference;
import org.eclipse.jpt.core.utility.TextRange;
import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.EclipseLink1_1;
import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package;
import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.XmlEntity_1_1;
-import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLink2_0;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
-import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0;
-import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -65,9 +67,59 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity implements XmlReadOnly, XmlCustomizerHolder, XmlChangeTrackingHolder, XmlCacheHolder, XmlConvertersHolder, XmlQueryContainer, XmlPropertyContainer, XmlEntity_1_1, XmlEntity_2_0
+public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity implements XmlEntity_1_1, XmlEntity_2_0, XmlEntity_2_1, XmlReadOnly, XmlCustomizerHolder, XmlChangeTrackingHolder, XmlCacheHolder, XmlConvertersHolder, XmlQueryContainer, XmlPropertyContainer
{
/**
+ * The cached value of the '{@link #getPrimaryKey() <em>Primary Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getPrimaryKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlPrimaryKey primaryKey;
+
+ /**
+ * The cached value of the '{@link #getCacheInterceptor() <em>Cache Interceptor</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getCacheInterceptor()
+ * @generated
+ * @ordered
+ */
+ protected XmlCacheInterceptor cacheInterceptor;
+
+ /**
+ * The cached value of the '{@link #getQueryRedirectors() <em>Query Redirectors</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getQueryRedirectors()
+ * @generated
+ * @ordered
+ */
+ protected XmlQueryRedirectors queryRedirectors;
+
+ /**
+ * The cached value of the '{@link #getFetchGroups() <em>Fetch Groups</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getFetchGroups()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlFetchGroup> fetchGroups;
+
+ /**
+ * The cached value of the '{@link #getClassExtractor() <em>Class Extractor</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getClassExtractor()
+ * @generated
+ * @ordered
+ */
+ protected XmlClassReference classExtractor;
+
+ /**
* The default value of the '{@link #getReadOnly() <em>Read Only</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -194,36 +246,6 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
protected EList<XmlProperty> properties;
/**
- * The cached value of the '{@link #getPrimaryKey() <em>Primary Key</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPrimaryKey()
- * @generated
- * @ordered
- */
- protected XmlPrimaryKey_1_1 primaryKey;
-
- /**
- * The cached value of the '{@link #getCacheInterceptor() <em>Cache Interceptor</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCacheInterceptor()
- * @generated
- * @ordered
- */
- protected XmlCacheInterceptor_2_0 cacheInterceptor;
-
- /**
- * The cached value of the '{@link #getQueryRedirectors() <em>Query Redirectors</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getQueryRedirectors()
- * @generated
- * @ordered
- */
- protected XmlQueryRedirectors_2_0 queryRedirectors;
-
- /**
* The cached value of the '{@link #getOptimisticLocking() <em>Optimistic Locking</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -945,12 +967,12 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Primary Key</em>' containment reference.
- * @see #setPrimaryKey(XmlPrimaryKey_1_1)
+ * @see #setPrimaryKey(XmlPrimaryKey)
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_1_1_PrimaryKey()
* @model containment="true"
* @generated
*/
- public XmlPrimaryKey_1_1 getPrimaryKey()
+ public XmlPrimaryKey getPrimaryKey()
{
return primaryKey;
}
@@ -960,9 +982,9 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPrimaryKey(XmlPrimaryKey_1_1 newPrimaryKey, NotificationChain msgs)
+ public NotificationChain basicSetPrimaryKey(XmlPrimaryKey newPrimaryKey, NotificationChain msgs)
{
- XmlPrimaryKey_1_1 oldPrimaryKey = primaryKey;
+ XmlPrimaryKey oldPrimaryKey = primaryKey;
primaryKey = newPrimaryKey;
if (eNotificationRequired())
{
@@ -980,7 +1002,7 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
* @see #getPrimaryKey()
* @generated
*/
- public void setPrimaryKey(XmlPrimaryKey_1_1 newPrimaryKey)
+ public void setPrimaryKey(XmlPrimaryKey newPrimaryKey)
{
if (newPrimaryKey != primaryKey)
{
@@ -1005,12 +1027,12 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Cache Interceptor</em>' containment reference.
- * @see #setCacheInterceptor(XmlCacheInterceptor_2_0)
+ * @see #setCacheInterceptor(XmlCacheInterceptor)
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_0_CacheInterceptor()
* @model containment="true"
* @generated
*/
- public XmlCacheInterceptor_2_0 getCacheInterceptor()
+ public XmlCacheInterceptor getCacheInterceptor()
{
return cacheInterceptor;
}
@@ -1020,9 +1042,9 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetCacheInterceptor(XmlCacheInterceptor_2_0 newCacheInterceptor, NotificationChain msgs)
+ public NotificationChain basicSetCacheInterceptor(XmlCacheInterceptor newCacheInterceptor, NotificationChain msgs)
{
- XmlCacheInterceptor_2_0 oldCacheInterceptor = cacheInterceptor;
+ XmlCacheInterceptor oldCacheInterceptor = cacheInterceptor;
cacheInterceptor = newCacheInterceptor;
if (eNotificationRequired())
{
@@ -1040,7 +1062,7 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
* @see #getCacheInterceptor()
* @generated
*/
- public void setCacheInterceptor(XmlCacheInterceptor_2_0 newCacheInterceptor)
+ public void setCacheInterceptor(XmlCacheInterceptor newCacheInterceptor)
{
if (newCacheInterceptor != cacheInterceptor)
{
@@ -1065,12 +1087,12 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Query Redirectors</em>' containment reference.
- * @see #setQueryRedirectors(XmlQueryRedirectors_2_0)
+ * @see #setQueryRedirectors(XmlQueryRedirectors)
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_0_QueryRedirectors()
* @model containment="true"
* @generated
*/
- public XmlQueryRedirectors_2_0 getQueryRedirectors()
+ public XmlQueryRedirectors getQueryRedirectors()
{
return queryRedirectors;
}
@@ -1080,9 +1102,9 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetQueryRedirectors(XmlQueryRedirectors_2_0 newQueryRedirectors, NotificationChain msgs)
+ public NotificationChain basicSetQueryRedirectors(XmlQueryRedirectors newQueryRedirectors, NotificationChain msgs)
{
- XmlQueryRedirectors_2_0 oldQueryRedirectors = queryRedirectors;
+ XmlQueryRedirectors oldQueryRedirectors = queryRedirectors;
queryRedirectors = newQueryRedirectors;
if (eNotificationRequired())
{
@@ -1100,7 +1122,7 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
* @see #getQueryRedirectors()
* @generated
*/
- public void setQueryRedirectors(XmlQueryRedirectors_2_0 newQueryRedirectors)
+ public void setQueryRedirectors(XmlQueryRedirectors newQueryRedirectors)
{
if (newQueryRedirectors != queryRedirectors)
{
@@ -1117,6 +1139,89 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
}
/**
+ * Returns the value of the '<em><b>Fetch Groups</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchGroup}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Fetch Groups</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Fetch Groups</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroupContainer_2_1_FetchGroups()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlFetchGroup> getFetchGroups()
+ {
+ if (fetchGroups == null)
+ {
+ fetchGroups = new EObjectContainmentEList<XmlFetchGroup>(XmlFetchGroup.class, this, EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS);
+ }
+ return fetchGroups;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Class Extractor</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Class Extractor</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Class Extractor</em>' containment reference.
+ * @see #setClassExtractor(XmlClassReference)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_1_ClassExtractor()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlClassReference getClassExtractor()
+ {
+ return classExtractor;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetClassExtractor(XmlClassReference newClassExtractor, NotificationChain msgs)
+ {
+ XmlClassReference oldClassExtractor = classExtractor;
+ classExtractor = newClassExtractor;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR, oldClassExtractor, newClassExtractor);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity#getClassExtractor <em>Class Extractor</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Class Extractor</em>' containment reference.
+ * @see #getClassExtractor()
+ * @generated
+ */
+ public void setClassExtractor(XmlClassReference newClassExtractor)
+ {
+ if (newClassExtractor != classExtractor)
+ {
+ NotificationChain msgs = null;
+ if (classExtractor != null)
+ msgs = ((InternalEObject)classExtractor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR, null, msgs);
+ if (newClassExtractor != null)
+ msgs = ((InternalEObject)newClassExtractor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR, null, msgs);
+ msgs = basicSetClassExtractor(newClassExtractor, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR, newClassExtractor, newClassExtractor));
+ }
+
+ /**
* Returns the value of the '<em><b>Exclude Default Mappings</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -1161,6 +1266,16 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
{
switch (featureID)
{
+ case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
+ return basicSetPrimaryKey(null, msgs);
+ case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
+ return basicSetCacheInterceptor(null, msgs);
+ case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
+ return basicSetQueryRedirectors(null, msgs);
+ case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS:
+ return ((InternalEList<?>)getFetchGroups()).basicRemove(otherEnd, msgs);
+ case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR:
+ return basicSetClassExtractor(null, msgs);
case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER:
return basicSetCustomizer(null, msgs);
case EclipseLinkOrmPackage.XML_ENTITY__CHANGE_TRACKING:
@@ -1179,12 +1294,6 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
return ((InternalEList<?>)getNamedStoredProcedureQueries()).basicRemove(otherEnd, msgs);
case EclipseLinkOrmPackage.XML_ENTITY__PROPERTIES:
return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
- case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
- return basicSetPrimaryKey(null, msgs);
- case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
- return basicSetCacheInterceptor(null, msgs);
- case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
- return basicSetQueryRedirectors(null, msgs);
case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING:
return basicSetOptimisticLocking(null, msgs);
case EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY:
@@ -1207,6 +1316,16 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
{
switch (featureID)
{
+ case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
+ return getPrimaryKey();
+ case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
+ return getCacheInterceptor();
+ case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
+ return getQueryRedirectors();
+ case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS:
+ return getFetchGroups();
+ case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR:
+ return getClassExtractor();
case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY:
return getReadOnly();
case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER:
@@ -1229,12 +1348,6 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
return getNamedStoredProcedureQueries();
case EclipseLinkOrmPackage.XML_ENTITY__PROPERTIES:
return getProperties();
- case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
- return getPrimaryKey();
- case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
- return getCacheInterceptor();
- case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
- return getQueryRedirectors();
case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING:
return getOptimisticLocking();
case EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY:
@@ -1260,6 +1373,22 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
{
switch (featureID)
{
+ case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
+ setPrimaryKey((XmlPrimaryKey)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
+ setCacheInterceptor((XmlCacheInterceptor)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
+ setQueryRedirectors((XmlQueryRedirectors)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS:
+ getFetchGroups().clear();
+ getFetchGroups().addAll((Collection<? extends XmlFetchGroup>)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR:
+ setClassExtractor((XmlClassReference)newValue);
+ return;
case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY:
setReadOnly((Boolean)newValue);
return;
@@ -1299,15 +1428,6 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
getProperties().clear();
getProperties().addAll((Collection<? extends XmlProperty>)newValue);
return;
- case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
- setPrimaryKey((XmlPrimaryKey_1_1)newValue);
- return;
- case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
- setCacheInterceptor((XmlCacheInterceptor_2_0)newValue);
- return;
- case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
- setQueryRedirectors((XmlQueryRedirectors_2_0)newValue);
- return;
case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING:
setOptimisticLocking((XmlOptimisticLocking)newValue);
return;
@@ -1337,6 +1457,21 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
{
switch (featureID)
{
+ case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
+ setPrimaryKey((XmlPrimaryKey)null);
+ return;
+ case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
+ setCacheInterceptor((XmlCacheInterceptor)null);
+ return;
+ case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
+ setQueryRedirectors((XmlQueryRedirectors)null);
+ return;
+ case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS:
+ getFetchGroups().clear();
+ return;
+ case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR:
+ setClassExtractor((XmlClassReference)null);
+ return;
case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY:
setReadOnly(READ_ONLY_EDEFAULT);
return;
@@ -1370,15 +1505,6 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
case EclipseLinkOrmPackage.XML_ENTITY__PROPERTIES:
getProperties().clear();
return;
- case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
- setPrimaryKey((XmlPrimaryKey_1_1)null);
- return;
- case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
- setCacheInterceptor((XmlCacheInterceptor_2_0)null);
- return;
- case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
- setQueryRedirectors((XmlQueryRedirectors_2_0)null);
- return;
case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING:
setOptimisticLocking((XmlOptimisticLocking)null);
return;
@@ -1408,6 +1534,16 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
{
switch (featureID)
{
+ case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
+ return primaryKey != null;
+ case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
+ return cacheInterceptor != null;
+ case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
+ return queryRedirectors != null;
+ case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS:
+ return fetchGroups != null && !fetchGroups.isEmpty();
+ case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR:
+ return classExtractor != null;
case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY:
return READ_ONLY_EDEFAULT == null ? readOnly != null : !READ_ONLY_EDEFAULT.equals(readOnly);
case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER:
@@ -1430,12 +1566,6 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
return namedStoredProcedureQueries != null && !namedStoredProcedureQueries.isEmpty();
case EclipseLinkOrmPackage.XML_ENTITY__PROPERTIES:
return properties != null && !properties.isEmpty();
- case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
- return primaryKey != null;
- case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
- return cacheInterceptor != null;
- case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
- return queryRedirectors != null;
case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING:
return optimisticLocking != null;
case EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY:
@@ -1458,6 +1588,39 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
{
+ if (baseClass == XmlEntity_1_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY: return EclipseLinkOrmV1_1Package.XML_ENTITY_11__PRIMARY_KEY;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlEntity_2_0.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR: return EclipseLinkOrmV2_0Package.XML_ENTITY_20__CACHE_INTERCEPTOR;
+ case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS: return EclipseLinkOrmV2_0Package.XML_ENTITY_20__QUERY_REDIRECTORS;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlFetchGroupContainer_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS: return EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlEntity_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR: return EclipseLinkOrmV2_1Package.XML_ENTITY_21__CLASS_EXTRACTOR;
+ default: return -1;
+ }
+ }
if (baseClass == XmlReadOnly.class)
{
switch (derivedFeatureID)
@@ -1518,34 +1681,50 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
default: return -1;
}
}
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+ {
if (baseClass == XmlEntity_1_1.class)
{
- switch (derivedFeatureID)
+ switch (baseFeatureID)
{
- case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY: return EclipseLinkOrmV1_1Package.XML_ENTITY_11__PRIMARY_KEY;
+ case EclipseLinkOrmV1_1Package.XML_ENTITY_11__PRIMARY_KEY: return EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY;
default: return -1;
}
}
if (baseClass == XmlEntity_2_0.class)
{
- switch (derivedFeatureID)
+ switch (baseFeatureID)
{
- case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR: return EclipseLinkOrmV2_0Package.XML_ENTITY_20__CACHE_INTERCEPTOR;
- case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS: return EclipseLinkOrmV2_0Package.XML_ENTITY_20__QUERY_REDIRECTORS;
+ case EclipseLinkOrmV2_0Package.XML_ENTITY_20__CACHE_INTERCEPTOR: return EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR;
+ case EclipseLinkOrmV2_0Package.XML_ENTITY_20__QUERY_REDIRECTORS: return EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlFetchGroupContainer_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS: return EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlEntity_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case EclipseLinkOrmV2_1Package.XML_ENTITY_21__CLASS_EXTRACTOR: return EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR;
default: return -1;
}
}
- return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
- {
if (baseClass == XmlReadOnly.class)
{
switch (baseFeatureID)
@@ -1606,23 +1785,6 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
default: return -1;
}
}
- if (baseClass == XmlEntity_1_1.class)
- {
- switch (baseFeatureID)
- {
- case EclipseLinkOrmV1_1Package.XML_ENTITY_11__PRIMARY_KEY: return EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY;
- default: return -1;
- }
- }
- if (baseClass == XmlEntity_2_0.class)
- {
- switch (baseFeatureID)
- {
- case EclipseLinkOrmV2_0Package.XML_ENTITY_20__CACHE_INTERCEPTOR: return EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR;
- case EclipseLinkOrmV2_0Package.XML_ENTITY_20__QUERY_REDIRECTORS: return EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS;
- default: return -1;
- }
- }
return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
}
@@ -1682,9 +1844,11 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
buildInheritanceTranslator(),
buildDiscriminatorValueTranslator(),
buildDiscriminatorColumnTranslator(),
+ buildClassExtractorTranslator(),
buildOptimisticLockingTranslator(),
buildCacheTranslator(),
buildCacheInterceptorTranslator(),
+ buildFetchGroupsTranslator(),
buildConverterTranslator(),
buildTypeConverterTranslator(),
buildObjectTypeConverterTranslator(),
@@ -1712,8 +1876,7 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
buildPropertyTranslator(),
buildAttributeOverrideTranslator(),
buildAssociationOverrideTranslator(),
- Attributes.buildTranslator()
- };
+ Attributes.buildTranslator()};
}
protected static Translator buildCustomizerTranslator() {
@@ -1728,6 +1891,10 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
return XmlPrimaryKey.buildTranslator(EclipseLink1_1.PRIMARY_KEY, EclipseLinkOrmV1_1Package.eINSTANCE.getXmlEntity_1_1_PrimaryKey());
}
+ protected static Translator buildClassExtractorTranslator() {
+ return XmlClassReference.buildTranslator(EclipseLink2_1.CLASS_EXTRACTOR, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlEntity_2_1_ClassExtractor());
+ }
+
protected static Translator buildOptimisticLockingTranslator() {
return XmlOptimisticLocking.buildTranslator(EclipseLink.OPTIMISTIC_LOCKING, EclipseLinkOrmPackage.eINSTANCE.getXmlEntity_OptimisticLocking());
}
@@ -1740,6 +1907,10 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
return XmlCacheInterceptor.buildTranslator(EclipseLink2_0.CACHE_INTERCEPTOR, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlEntity_2_0_CacheInterceptor());
}
+ protected static Translator buildFetchGroupsTranslator() {
+ return XmlFetchGroup.buildTranslator(EclipseLink2_1.FETCH_GROUP, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchGroupContainer_2_1_FetchGroups());
+ }
+
protected static Translator buildQueryRedirectorsTranslator() {
return XmlQueryRedirectors.buildTranslator(EclipseLink2_0.QUERY_REDIRECTORS, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlEntity_2_0_QueryRedirectors());
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlFetchAttribute.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlFetchAttribute.java
new file mode 100644
index 0000000000..004de22448
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlFetchAttribute.java
@@ -0,0 +1,214 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jpt.eclipselink.core.resource.orm;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1;
+import org.eclipse.wst.common.internal.emf.resource.Translator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Fetch Attribute</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchAttribute()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlFetchAttribute extends AbstractJpaEObject implements XmlFetchAttribute_2_1
+{
+ /**
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected XmlFetchAttribute()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return EclipseLinkOrmPackage.Literals.XML_FETCH_ATTRIBUTE;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchAttribute_2_1_Name()
+ * @model
+ * @generated
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchAttribute#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ public void setName(String newName)
+ {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_FETCH_ATTRIBUTE__NAME, oldName, name));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case EclipseLinkOrmPackage.XML_FETCH_ATTRIBUTE__NAME:
+ return getName();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case EclipseLinkOrmPackage.XML_FETCH_ATTRIBUTE__NAME:
+ setName((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case EclipseLinkOrmPackage.XML_FETCH_ATTRIBUTE__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case EclipseLinkOrmPackage.XML_FETCH_ATTRIBUTE__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (name: ");
+ result.append(name);
+ result.append(')');
+ return result.toString();
+ }
+
+
+ // ********** translators **********
+
+ public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
+ return new SimpleTranslator(
+ elementName,
+ structuralFeature,
+ buildTranslatorChildren());
+ }
+
+ private static Translator[] buildTranslatorChildren() {
+ return new Translator[] {
+ buildNameTranslator()};
+ }
+
+ private static Translator buildNameTranslator() {
+ return new Translator(EclipseLink2_1.NAME, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchAttribute_2_1_Name(), Translator.DOM_ATTRIBUTE);
+ }
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlFetchGroup.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlFetchGroup.java
new file mode 100644
index 0000000000..c62518bb1c
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlFetchGroup.java
@@ -0,0 +1,286 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jpt.eclipselink.core.resource.orm;
+
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1;
+import org.eclipse.wst.common.internal.emf.resource.Translator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Fetch Group</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroup()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlFetchGroup extends AbstractJpaEObject implements XmlFetchGroup_2_1
+{
+ /**
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getAttributes()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlFetchAttribute> attributes;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected XmlFetchGroup()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return EclipseLinkOrmPackage.Literals.XML_FETCH_GROUP;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroup_2_1_Name()
+ * @model
+ * @generated
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchGroup#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ public void setName(String newName)
+ {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_FETCH_GROUP__NAME, oldName, name));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Attributes</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchAttribute}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Attributes</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Attributes</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroup_2_1_Attributes()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlFetchAttribute> getAttributes()
+ {
+ if (attributes == null)
+ {
+ attributes = new EObjectContainmentEList<XmlFetchAttribute>(XmlFetchAttribute.class, this, EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES);
+ }
+ return attributes;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ {
+ switch (featureID)
+ {
+ case EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES:
+ return ((InternalEList<?>)getAttributes()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case EclipseLinkOrmPackage.XML_FETCH_GROUP__NAME:
+ return getName();
+ case EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES:
+ return getAttributes();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case EclipseLinkOrmPackage.XML_FETCH_GROUP__NAME:
+ setName((String)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES:
+ getAttributes().clear();
+ getAttributes().addAll((Collection<? extends XmlFetchAttribute>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case EclipseLinkOrmPackage.XML_FETCH_GROUP__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES:
+ getAttributes().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case EclipseLinkOrmPackage.XML_FETCH_GROUP__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES:
+ return attributes != null && !attributes.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (name: ");
+ result.append(name);
+ result.append(')');
+ return result.toString();
+ }
+
+
+ // ********** translators **********
+
+ public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
+ return new SimpleTranslator(
+ elementName,
+ structuralFeature,
+ buildTranslatorChildren());
+ }
+
+ private static Translator[] buildTranslatorChildren() {
+ return new Translator[] {
+ buildNameTranslator(),
+ buildAttributesTranslator()};
+ }
+
+ private static Translator buildNameTranslator() {
+ return new Translator(EclipseLink2_1.NAME, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchGroup_2_1_Name(), Translator.DOM_ATTRIBUTE);
+ }
+
+ private static Translator buildAttributesTranslator() {
+ return XmlFetchAttribute.buildTranslator(EclipseLink2_1.ATTRIBUTE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchGroup_2_1_Attributes());
+ }
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java
index 24ec59da25..277b50c2a5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java
@@ -20,9 +20,9 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
+import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
import org.eclipse.jpt.core.resource.orm.v2_0.JPA2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package;
import org.eclipse.jpt.core.utility.TextRange;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java
index 60e0bc5024..1099f120cd 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java
@@ -20,6 +20,19 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.core.resource.orm.JPA;
+import org.eclipse.jpt.core.resource.orm.OrmPackage;
+import org.eclipse.jpt.core.resource.orm.SqlResultSetMapping;
+import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
+import org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideContainer;
+import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
+import org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideContainer;
+import org.eclipse.jpt.core.resource.orm.XmlGeneratorContainer;
+import org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery;
+import org.eclipse.jpt.core.resource.orm.XmlNamedQuery;
+import org.eclipse.jpt.core.resource.orm.XmlQueryContainer;
+import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator;
+import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
import org.eclipse.jpt.core.resource.orm.v2_0.JPA2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0;
@@ -29,8 +42,11 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Pack
import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.XmlMappedSuperclass_1_1;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLink2_0;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
-import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -64,9 +80,149 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass implements XmlReadOnly, XmlCustomizerHolder, XmlChangeTrackingHolder, XmlCacheHolder, XmlConvertersHolder, XmlPropertyContainer, XmlMappedSuperclass_1_1, XmlMappedSuperclass_2_0
+public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass implements XmlMappedSuperclass_1_1, XmlMappedSuperclass_2_0, XmlMappedSuperclass_2_1, XmlReadOnly, XmlCustomizerHolder, XmlChangeTrackingHolder, XmlCacheHolder, XmlConvertersHolder, XmlPropertyContainer
{
/**
+ * The cached value of the '{@link #getPrimaryKey() <em>Primary Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getPrimaryKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlPrimaryKey primaryKey;
+
+ /**
+ * The default value of the '{@link #getCacheable() <em>Cacheable</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getCacheable()
+ * @generated
+ * @ordered
+ */
+ protected static final Boolean CACHEABLE_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getCacheable() <em>Cacheable</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getCacheable()
+ * @generated
+ * @ordered
+ */
+ protected Boolean cacheable = CACHEABLE_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getCacheInterceptor() <em>Cache Interceptor</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getCacheInterceptor()
+ * @generated
+ * @ordered
+ */
+ protected XmlCacheInterceptor cacheInterceptor;
+
+ /**
+ * The cached value of the '{@link #getAssociationOverrides() <em>Association Overrides</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getAssociationOverrides()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlAssociationOverride> associationOverrides;
+
+ /**
+ * The cached value of the '{@link #getAttributeOverrides() <em>Attribute Overrides</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getAttributeOverrides()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlAttributeOverride> attributeOverrides;
+
+ /**
+ * The cached value of the '{@link #getFetchGroups() <em>Fetch Groups</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getFetchGroups()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlFetchGroup> fetchGroups;
+
+ /**
+ * The cached value of the '{@link #getSequenceGenerator() <em>Sequence Generator</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSequenceGenerator()
+ * @generated
+ * @ordered
+ */
+ protected XmlSequenceGenerator sequenceGenerator;
+
+ /**
+ * The cached value of the '{@link #getTableGenerator() <em>Table Generator</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getTableGenerator()
+ * @generated
+ * @ordered
+ */
+ protected XmlTableGenerator tableGenerator;
+
+ /**
+ * The cached value of the '{@link #getNamedQueries() <em>Named Queries</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getNamedQueries()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlNamedQuery> namedQueries;
+
+ /**
+ * The cached value of the '{@link #getNamedNativeQueries() <em>Named Native Queries</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getNamedNativeQueries()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlNamedNativeQuery> namedNativeQueries;
+
+ /**
+ * The cached value of the '{@link #getNamedStoredProcedureQueries() <em>Named Stored Procedure Queries</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getNamedStoredProcedureQueries()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlNamedStoredProcedureQuery> namedStoredProcedureQueries;
+
+ /**
+ * The cached value of the '{@link #getSqlResultSetMappings() <em>Sql Result Set Mappings</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSqlResultSetMappings()
+ * @generated
+ * @ordered
+ */
+ protected EList<SqlResultSetMapping> sqlResultSetMappings;
+
+ /**
+ * The cached value of the '{@link #getQueryRedirectors() <em>Query Redirectors</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getQueryRedirectors()
+ * @generated
+ * @ordered
+ */
+ protected XmlQueryRedirectors queryRedirectors;
+
+ /**
* The default value of the '{@link #getReadOnly() <em>Read Only</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -183,46 +339,6 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
protected EList<XmlProperty> properties;
/**
- * The cached value of the '{@link #getPrimaryKey() <em>Primary Key</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPrimaryKey()
- * @generated
- * @ordered
- */
- protected XmlPrimaryKey primaryKey;
-
- /**
- * The default value of the '{@link #getCacheable() <em>Cacheable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCacheable()
- * @generated
- * @ordered
- */
- protected static final Boolean CACHEABLE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getCacheable() <em>Cacheable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCacheable()
- * @generated
- * @ordered
- */
- protected Boolean cacheable = CACHEABLE_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getCacheInterceptor() <em>Cache Interceptor</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCacheInterceptor()
- * @generated
- * @ordered
- */
- protected XmlCacheInterceptor_2_0 cacheInterceptor;
-
- /**
* The cached value of the '{@link #getOptimisticLocking() <em>Optimistic Locking</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1016,12 +1132,12 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Cache Interceptor</em>' containment reference.
- * @see #setCacheInterceptor(XmlCacheInterceptor_2_0)
+ * @see #setCacheInterceptor(XmlCacheInterceptor)
* @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_0_CacheInterceptor()
* @model containment="true"
* @generated
*/
- public XmlCacheInterceptor_2_0 getCacheInterceptor()
+ public XmlCacheInterceptor getCacheInterceptor()
{
return cacheInterceptor;
}
@@ -1031,9 +1147,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetCacheInterceptor(XmlCacheInterceptor_2_0 newCacheInterceptor, NotificationChain msgs)
+ public NotificationChain basicSetCacheInterceptor(XmlCacheInterceptor newCacheInterceptor, NotificationChain msgs)
{
- XmlCacheInterceptor_2_0 oldCacheInterceptor = cacheInterceptor;
+ XmlCacheInterceptor oldCacheInterceptor = cacheInterceptor;
cacheInterceptor = newCacheInterceptor;
if (eNotificationRequired())
{
@@ -1051,7 +1167,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
* @see #getCacheInterceptor()
* @generated
*/
- public void setCacheInterceptor(XmlCacheInterceptor_2_0 newCacheInterceptor)
+ public void setCacheInterceptor(XmlCacheInterceptor newCacheInterceptor)
{
if (newCacheInterceptor != cacheInterceptor)
{
@@ -1068,6 +1184,347 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
}
/**
+ * Returns the value of the '<em><b>Association Overrides</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Association Overrides</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Association Overrides</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAssociationOverrideContainer_AssociationOverrides()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlAssociationOverride> getAssociationOverrides()
+ {
+ if (associationOverrides == null)
+ {
+ associationOverrides = new EObjectContainmentEList<XmlAssociationOverride>(XmlAssociationOverride.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES);
+ }
+ return associationOverrides;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Attribute Overrides</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Attribute Overrides</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Attribute Overrides</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAttributeOverrideContainer_AttributeOverrides()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlAttributeOverride> getAttributeOverrides()
+ {
+ if (attributeOverrides == null)
+ {
+ attributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES);
+ }
+ return attributeOverrides;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Fetch Groups</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchGroup}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Fetch Groups</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Fetch Groups</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroupContainer_2_1_FetchGroups()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlFetchGroup> getFetchGroups()
+ {
+ if (fetchGroups == null)
+ {
+ fetchGroups = new EObjectContainmentEList<XmlFetchGroup>(XmlFetchGroup.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS);
+ }
+ return fetchGroups;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Sequence Generator</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Sequence Generator</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Sequence Generator</em>' containment reference.
+ * @see #setSequenceGenerator(XmlSequenceGenerator)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGeneratorContainer_SequenceGenerator()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlSequenceGenerator getSequenceGenerator()
+ {
+ return sequenceGenerator;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetSequenceGenerator(XmlSequenceGenerator newSequenceGenerator, NotificationChain msgs)
+ {
+ XmlSequenceGenerator oldSequenceGenerator = sequenceGenerator;
+ sequenceGenerator = newSequenceGenerator;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR, oldSequenceGenerator, newSequenceGenerator);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass#getSequenceGenerator <em>Sequence Generator</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Sequence Generator</em>' containment reference.
+ * @see #getSequenceGenerator()
+ * @generated
+ */
+ public void setSequenceGenerator(XmlSequenceGenerator newSequenceGenerator)
+ {
+ if (newSequenceGenerator != sequenceGenerator)
+ {
+ NotificationChain msgs = null;
+ if (sequenceGenerator != null)
+ msgs = ((InternalEObject)sequenceGenerator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR, null, msgs);
+ if (newSequenceGenerator != null)
+ msgs = ((InternalEObject)newSequenceGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR, null, msgs);
+ msgs = basicSetSequenceGenerator(newSequenceGenerator, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR, newSequenceGenerator, newSequenceGenerator));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Table Generator</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Table Generator</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Table Generator</em>' containment reference.
+ * @see #setTableGenerator(XmlTableGenerator)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGeneratorContainer_TableGenerator()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlTableGenerator getTableGenerator()
+ {
+ return tableGenerator;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetTableGenerator(XmlTableGenerator newTableGenerator, NotificationChain msgs)
+ {
+ XmlTableGenerator oldTableGenerator = tableGenerator;
+ tableGenerator = newTableGenerator;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR, oldTableGenerator, newTableGenerator);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass#getTableGenerator <em>Table Generator</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Table Generator</em>' containment reference.
+ * @see #getTableGenerator()
+ * @generated
+ */
+ public void setTableGenerator(XmlTableGenerator newTableGenerator)
+ {
+ if (newTableGenerator != tableGenerator)
+ {
+ NotificationChain msgs = null;
+ if (tableGenerator != null)
+ msgs = ((InternalEObject)tableGenerator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR, null, msgs);
+ if (newTableGenerator != null)
+ msgs = ((InternalEObject)newTableGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR, null, msgs);
+ msgs = basicSetTableGenerator(newTableGenerator, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR, newTableGenerator, newTableGenerator));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Named Queries</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Named Queries</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Named Queries</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer_NamedQueries()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlNamedQuery> getNamedQueries()
+ {
+ if (namedQueries == null)
+ {
+ namedQueries = new EObjectContainmentEList<XmlNamedQuery>(XmlNamedQuery.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES);
+ }
+ return namedQueries;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Named Native Queries</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Named Native Queries</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Named Native Queries</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer_NamedNativeQueries()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlNamedNativeQuery> getNamedNativeQueries()
+ {
+ if (namedNativeQueries == null)
+ {
+ namedNativeQueries = new EObjectContainmentEList<XmlNamedNativeQuery>(XmlNamedNativeQuery.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES);
+ }
+ return namedNativeQueries;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Named Stored Procedure Queries</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Named Stored Procedure Queries</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer_NamedStoredProcedureQueries()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlNamedStoredProcedureQuery> getNamedStoredProcedureQueries()
+ {
+ if (namedStoredProcedureQueries == null)
+ {
+ namedStoredProcedureQueries = new EObjectContainmentEList<XmlNamedStoredProcedureQuery>(XmlNamedStoredProcedureQuery.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES);
+ }
+ return namedStoredProcedureQueries;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Sql Result Set Mappings</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Sql Result Set Mappings</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_1_SqlResultSetMappings()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<SqlResultSetMapping> getSqlResultSetMappings()
+ {
+ if (sqlResultSetMappings == null)
+ {
+ sqlResultSetMappings = new EObjectContainmentEList<SqlResultSetMapping>(SqlResultSetMapping.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS);
+ }
+ return sqlResultSetMappings;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Query Redirectors</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Query Redirectors</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Query Redirectors</em>' containment reference.
+ * @see #setQueryRedirectors(XmlQueryRedirectors)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_1_QueryRedirectors()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlQueryRedirectors getQueryRedirectors()
+ {
+ return queryRedirectors;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetQueryRedirectors(XmlQueryRedirectors newQueryRedirectors, NotificationChain msgs)
+ {
+ XmlQueryRedirectors oldQueryRedirectors = queryRedirectors;
+ queryRedirectors = newQueryRedirectors;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS, oldQueryRedirectors, newQueryRedirectors);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass#getQueryRedirectors <em>Query Redirectors</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Query Redirectors</em>' containment reference.
+ * @see #getQueryRedirectors()
+ * @generated
+ */
+ public void setQueryRedirectors(XmlQueryRedirectors newQueryRedirectors)
+ {
+ if (newQueryRedirectors != queryRedirectors)
+ {
+ NotificationChain msgs = null;
+ if (queryRedirectors != null)
+ msgs = ((InternalEObject)queryRedirectors).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS, null, msgs);
+ if (newQueryRedirectors != null)
+ msgs = ((InternalEObject)newQueryRedirectors).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS, null, msgs);
+ msgs = basicSetQueryRedirectors(newQueryRedirectors, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS, newQueryRedirectors, newQueryRedirectors));
+ }
+
+ /**
* Returns the value of the '<em><b>Exclude Default Mappings</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -1112,6 +1569,30 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
{
switch (featureID)
{
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
+ return basicSetPrimaryKey(null, msgs);
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
+ return basicSetCacheInterceptor(null, msgs);
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES:
+ return ((InternalEList<?>)getAssociationOverrides()).basicRemove(otherEnd, msgs);
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES:
+ return ((InternalEList<?>)getAttributeOverrides()).basicRemove(otherEnd, msgs);
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS:
+ return ((InternalEList<?>)getFetchGroups()).basicRemove(otherEnd, msgs);
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR:
+ return basicSetSequenceGenerator(null, msgs);
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR:
+ return basicSetTableGenerator(null, msgs);
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES:
+ return ((InternalEList<?>)getNamedQueries()).basicRemove(otherEnd, msgs);
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES:
+ return ((InternalEList<?>)getNamedNativeQueries()).basicRemove(otherEnd, msgs);
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES:
+ return ((InternalEList<?>)getNamedStoredProcedureQueries()).basicRemove(otherEnd, msgs);
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS:
+ return ((InternalEList<?>)getSqlResultSetMappings()).basicRemove(otherEnd, msgs);
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS:
+ return basicSetQueryRedirectors(null, msgs);
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER:
return basicSetCustomizer(null, msgs);
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CHANGE_TRACKING:
@@ -1128,10 +1609,6 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
return ((InternalEList<?>)getStructConverters()).basicRemove(otherEnd, msgs);
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES:
return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
- return basicSetPrimaryKey(null, msgs);
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
- return basicSetCacheInterceptor(null, msgs);
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING:
return basicSetOptimisticLocking(null, msgs);
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__COPY_POLICY:
@@ -1154,6 +1631,32 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
{
switch (featureID)
{
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
+ return getPrimaryKey();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE:
+ return getCacheable();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
+ return getCacheInterceptor();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES:
+ return getAssociationOverrides();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES:
+ return getAttributeOverrides();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS:
+ return getFetchGroups();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR:
+ return getSequenceGenerator();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR:
+ return getTableGenerator();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES:
+ return getNamedQueries();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES:
+ return getNamedNativeQueries();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES:
+ return getNamedStoredProcedureQueries();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS:
+ return getSqlResultSetMappings();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS:
+ return getQueryRedirectors();
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY:
return getReadOnly();
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER:
@@ -1174,12 +1677,6 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
return getStructConverters();
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES:
return getProperties();
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
- return getPrimaryKey();
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE:
- return getCacheable();
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
- return getCacheInterceptor();
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING:
return getOptimisticLocking();
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__COPY_POLICY:
@@ -1205,6 +1702,52 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
{
switch (featureID)
{
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
+ setPrimaryKey((XmlPrimaryKey)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE:
+ setCacheable((Boolean)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
+ setCacheInterceptor((XmlCacheInterceptor)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES:
+ getAssociationOverrides().clear();
+ getAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES:
+ getAttributeOverrides().clear();
+ getAttributeOverrides().addAll((Collection<? extends XmlAttributeOverride>)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS:
+ getFetchGroups().clear();
+ getFetchGroups().addAll((Collection<? extends XmlFetchGroup>)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR:
+ setSequenceGenerator((XmlSequenceGenerator)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR:
+ setTableGenerator((XmlTableGenerator)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES:
+ getNamedQueries().clear();
+ getNamedQueries().addAll((Collection<? extends XmlNamedQuery>)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES:
+ getNamedNativeQueries().clear();
+ getNamedNativeQueries().addAll((Collection<? extends XmlNamedNativeQuery>)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES:
+ getNamedStoredProcedureQueries().clear();
+ getNamedStoredProcedureQueries().addAll((Collection<? extends XmlNamedStoredProcedureQuery>)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS:
+ getSqlResultSetMappings().clear();
+ getSqlResultSetMappings().addAll((Collection<? extends SqlResultSetMapping>)newValue);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS:
+ setQueryRedirectors((XmlQueryRedirectors)newValue);
+ return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY:
setReadOnly((Boolean)newValue);
return;
@@ -1240,15 +1783,6 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
getProperties().clear();
getProperties().addAll((Collection<? extends XmlProperty>)newValue);
return;
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
- setPrimaryKey((XmlPrimaryKey)newValue);
- return;
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE:
- setCacheable((Boolean)newValue);
- return;
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
- setCacheInterceptor((XmlCacheInterceptor_2_0)newValue);
- return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING:
setOptimisticLocking((XmlOptimisticLocking)newValue);
return;
@@ -1278,6 +1812,45 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
{
switch (featureID)
{
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
+ setPrimaryKey((XmlPrimaryKey)null);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE:
+ setCacheable(CACHEABLE_EDEFAULT);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
+ setCacheInterceptor((XmlCacheInterceptor)null);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES:
+ getAssociationOverrides().clear();
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES:
+ getAttributeOverrides().clear();
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS:
+ getFetchGroups().clear();
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR:
+ setSequenceGenerator((XmlSequenceGenerator)null);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR:
+ setTableGenerator((XmlTableGenerator)null);
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES:
+ getNamedQueries().clear();
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES:
+ getNamedNativeQueries().clear();
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES:
+ getNamedStoredProcedureQueries().clear();
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS:
+ getSqlResultSetMappings().clear();
+ return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS:
+ setQueryRedirectors((XmlQueryRedirectors)null);
+ return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY:
setReadOnly(READ_ONLY_EDEFAULT);
return;
@@ -1308,15 +1881,6 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES:
getProperties().clear();
return;
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
- setPrimaryKey((XmlPrimaryKey)null);
- return;
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE:
- setCacheable(CACHEABLE_EDEFAULT);
- return;
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
- setCacheInterceptor((XmlCacheInterceptor_2_0)null);
- return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING:
setOptimisticLocking((XmlOptimisticLocking)null);
return;
@@ -1346,6 +1910,32 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
{
switch (featureID)
{
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
+ return primaryKey != null;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE:
+ return CACHEABLE_EDEFAULT == null ? cacheable != null : !CACHEABLE_EDEFAULT.equals(cacheable);
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
+ return cacheInterceptor != null;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES:
+ return associationOverrides != null && !associationOverrides.isEmpty();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES:
+ return attributeOverrides != null && !attributeOverrides.isEmpty();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS:
+ return fetchGroups != null && !fetchGroups.isEmpty();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR:
+ return sequenceGenerator != null;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR:
+ return tableGenerator != null;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES:
+ return namedQueries != null && !namedQueries.isEmpty();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES:
+ return namedNativeQueries != null && !namedNativeQueries.isEmpty();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES:
+ return namedStoredProcedureQueries != null && !namedStoredProcedureQueries.isEmpty();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS:
+ return sqlResultSetMappings != null && !sqlResultSetMappings.isEmpty();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS:
+ return queryRedirectors != null;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY:
return READ_ONLY_EDEFAULT == null ? readOnly != null : !READ_ONLY_EDEFAULT.equals(readOnly);
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER:
@@ -1366,12 +1956,6 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
return structConverters != null && !structConverters.isEmpty();
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES:
return properties != null && !properties.isEmpty();
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
- return primaryKey != null;
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE:
- return CACHEABLE_EDEFAULT == null ? cacheable != null : !CACHEABLE_EDEFAULT.equals(cacheable);
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
- return cacheInterceptor != null;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING:
return optimisticLocking != null;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__COPY_POLICY:
@@ -1394,6 +1978,89 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
{
+ if (baseClass == XmlMappedSuperclass_1_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY: return EclipseLinkOrmV1_1Package.XML_MAPPED_SUPERCLASS_11__PRIMARY_KEY;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlCacheable_2_0.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE: return OrmV2_0Package.XML_CACHEABLE_20__CACHEABLE;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlMappedSuperclass_2_0.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR: return EclipseLinkOrmV2_0Package.XML_MAPPED_SUPERCLASS_20__CACHE_INTERCEPTOR;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlAssociationOverrideContainer.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES: return OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER__ASSOCIATION_OVERRIDES;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlAttributeOverrideContainer.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES: return OrmPackage.XML_ATTRIBUTE_OVERRIDE_CONTAINER__ATTRIBUTE_OVERRIDES;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlFetchGroupContainer_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS: return EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlGeneratorContainer.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR: return OrmPackage.XML_GENERATOR_CONTAINER__SEQUENCE_GENERATOR;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR: return OrmPackage.XML_GENERATOR_CONTAINER__TABLE_GENERATOR;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlQueryContainer.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES: return OrmPackage.XML_QUERY_CONTAINER__NAMED_QUERIES;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES: return OrmPackage.XML_QUERY_CONTAINER__NAMED_NATIVE_QUERIES;
+ default: return -1;
+ }
+ }
+ if (baseClass == org.eclipse.jpt.eclipselink.core.resource.orm.XmlQueryContainer.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_QUERY_CONTAINER__NAMED_STORED_PROCEDURE_QUERIES;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlMappedSuperclass_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS: return EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS: return EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS;
+ default: return -1;
+ }
+ }
if (baseClass == XmlReadOnly.class)
{
switch (derivedFeatureID)
@@ -1446,114 +2113,149 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
default: return -1;
}
}
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+ {
if (baseClass == XmlMappedSuperclass_1_1.class)
{
- switch (derivedFeatureID)
+ switch (baseFeatureID)
{
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY: return EclipseLinkOrmV1_1Package.XML_MAPPED_SUPERCLASS_11__PRIMARY_KEY;
+ case EclipseLinkOrmV1_1Package.XML_MAPPED_SUPERCLASS_11__PRIMARY_KEY: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY;
default: return -1;
}
}
if (baseClass == XmlCacheable_2_0.class)
{
- switch (derivedFeatureID)
+ switch (baseFeatureID)
{
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE: return OrmV2_0Package.XML_CACHEABLE_20__CACHEABLE;
+ case OrmV2_0Package.XML_CACHEABLE_20__CACHEABLE: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE;
default: return -1;
}
}
if (baseClass == XmlMappedSuperclass_2_0.class)
{
- switch (derivedFeatureID)
+ switch (baseFeatureID)
{
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR: return EclipseLinkOrmV2_0Package.XML_MAPPED_SUPERCLASS_20__CACHE_INTERCEPTOR;
+ case EclipseLinkOrmV2_0Package.XML_MAPPED_SUPERCLASS_20__CACHE_INTERCEPTOR: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR;
default: return -1;
}
}
- return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
- {
- if (baseClass == XmlReadOnly.class)
+ if (baseClass == XmlAssociationOverrideContainer.class)
{
switch (baseFeatureID)
{
- case EclipseLinkOrmPackage.XML_READ_ONLY__READ_ONLY: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY;
+ case OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER__ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES;
default: return -1;
}
}
- if (baseClass == XmlCustomizerHolder.class)
+ if (baseClass == XmlAttributeOverrideContainer.class)
{
switch (baseFeatureID)
{
- case EclipseLinkOrmPackage.XML_CUSTOMIZER_HOLDER__CUSTOMIZER: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER;
+ case OrmPackage.XML_ATTRIBUTE_OVERRIDE_CONTAINER__ATTRIBUTE_OVERRIDES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES;
default: return -1;
}
}
- if (baseClass == XmlChangeTrackingHolder.class)
+ if (baseClass == XmlFetchGroupContainer_2_1.class)
{
switch (baseFeatureID)
{
- case EclipseLinkOrmPackage.XML_CHANGE_TRACKING_HOLDER__CHANGE_TRACKING: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CHANGE_TRACKING;
+ case EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS;
default: return -1;
}
}
- if (baseClass == XmlCacheHolder.class)
+ if (baseClass == XmlGeneratorContainer.class)
{
switch (baseFeatureID)
{
- case EclipseLinkOrmPackage.XML_CACHE_HOLDER__CACHE: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE;
- case EclipseLinkOrmPackage.XML_CACHE_HOLDER__EXISTENCE_CHECKING: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING;
+ case OrmPackage.XML_GENERATOR_CONTAINER__SEQUENCE_GENERATOR: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR;
+ case OrmPackage.XML_GENERATOR_CONTAINER__TABLE_GENERATOR: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR;
default: return -1;
}
}
- if (baseClass == XmlConvertersHolder.class)
+ if (baseClass == XmlQueryContainer.class)
{
switch (baseFeatureID)
{
- case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__CONVERTERS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CONVERTERS;
- case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS;
- case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS;
- case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS;
+ case OrmPackage.XML_QUERY_CONTAINER__NAMED_QUERIES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES;
+ case OrmPackage.XML_QUERY_CONTAINER__NAMED_NATIVE_QUERIES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES;
default: return -1;
}
}
- if (baseClass == XmlPropertyContainer.class)
+ if (baseClass == org.eclipse.jpt.eclipselink.core.resource.orm.XmlQueryContainer.class)
{
switch (baseFeatureID)
{
- case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES;
+ case EclipseLinkOrmPackage.XML_QUERY_CONTAINER__NAMED_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES;
default: return -1;
}
}
- if (baseClass == XmlMappedSuperclass_1_1.class)
+ if (baseClass == XmlMappedSuperclass_2_1.class)
{
switch (baseFeatureID)
{
- case EclipseLinkOrmV1_1Package.XML_MAPPED_SUPERCLASS_11__PRIMARY_KEY: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY;
+ case EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS;
+ case EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS;
default: return -1;
}
}
- if (baseClass == XmlCacheable_2_0.class)
+ if (baseClass == XmlReadOnly.class)
{
switch (baseFeatureID)
{
- case OrmV2_0Package.XML_CACHEABLE_20__CACHEABLE: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE;
+ case EclipseLinkOrmPackage.XML_READ_ONLY__READ_ONLY: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY;
default: return -1;
}
}
- if (baseClass == XmlMappedSuperclass_2_0.class)
+ if (baseClass == XmlCustomizerHolder.class)
{
switch (baseFeatureID)
{
- case EclipseLinkOrmV2_0Package.XML_MAPPED_SUPERCLASS_20__CACHE_INTERCEPTOR: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR;
+ case EclipseLinkOrmPackage.XML_CUSTOMIZER_HOLDER__CUSTOMIZER: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlChangeTrackingHolder.class)
+ {
+ switch (baseFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_CHANGE_TRACKING_HOLDER__CHANGE_TRACKING: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CHANGE_TRACKING;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlCacheHolder.class)
+ {
+ switch (baseFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_CACHE_HOLDER__CACHE: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE;
+ case EclipseLinkOrmPackage.XML_CACHE_HOLDER__EXISTENCE_CHECKING: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlConvertersHolder.class)
+ {
+ switch (baseFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__CONVERTERS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CONVERTERS;
+ case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS;
+ case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS;
+ case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlPropertyContainer.class)
+ {
+ switch (baseFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES;
default: return -1;
}
}
@@ -1571,12 +2273,12 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (readOnly: ");
+ result.append(" (cacheable: ");
+ result.append(cacheable);
+ result.append(", readOnly: ");
result.append(readOnly);
result.append(", existenceChecking: ");
result.append(existenceChecking);
- result.append(", cacheable: ");
- result.append(cacheable);
result.append(", excludeDefaultMappings: ");
result.append(excludeDefaultMappings);
result.append(')');
@@ -1620,6 +2322,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
buildOptimisticLockingTranslator(),
buildCacheTranslator(),
buildCacheInterceptorTranslator(),
+ buildFetchGroupsTranslator(),
buildConverterTranslator(),
buildTypeConverterTranslator(),
buildObjectTypeConverterTranslator(),
@@ -1627,6 +2330,13 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
buildCopyPolicyTranslator(),
buildInstantiationCoypPolicyTranslator(),
buildCloneCopyPolicyTranslator(),
+ buildSequenceGeneratorTranslator(),
+ buildTableGeneratorTranslator(),
+ buildNamedQueryTranslator(),
+ buildNamedNativeQueryTranslator(),
+ buildNamedStoredProcedureQueryTranslator(),
+ buildSqlResultSetMappingTranslator(),
+ buildQueryRedirectorsTranslator(),
buildExcludeDefaultListenersTranslator(),
buildExcludeSuperclassListenersTranslator(),
buildEntityListenersTranslator(),
@@ -1638,8 +2348,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
buildPostUpdateTranslator(),
buildPostLoadTranslator(),
buildPropertyTranslator(),
- Attributes.buildTranslator()
- };
+ buildAttributeOverrideTranslator(),
+ buildAssociationOverrideTranslator(),
+ Attributes.buildTranslator()};
}
protected static Translator buildCacheableTranslator() {
@@ -1682,6 +2393,10 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
return XmlCacheInterceptor.buildTranslator(EclipseLink2_0.CACHE_INTERCEPTOR, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlMappedSuperclass_2_0_CacheInterceptor());
}
+ protected static Translator buildFetchGroupsTranslator() {
+ return XmlFetchGroup.buildTranslator(EclipseLink2_1.FETCH_GROUP, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchGroupContainer_2_1_FetchGroups());
+ }
+
protected static Translator buildConverterTranslator() {
return XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_Converters());
}
@@ -1710,7 +2425,43 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
return XmlCloneCopyPolicy.buildTranslator(EclipseLink.CLONE_COPY_POLICY, EclipseLinkOrmPackage.eINSTANCE.getXmlMappedSuperclass_CloneCopyPolicy());
}
+ protected static Translator buildSequenceGeneratorTranslator() {
+ return XmlSequenceGenerator.buildTranslator(JPA.SEQUENCE_GENERATOR, OrmPackage.eINSTANCE.getXmlGeneratorContainer_SequenceGenerator());
+ }
+
+ protected static Translator buildTableGeneratorTranslator() {
+ return XmlTableGenerator.buildTranslator(JPA.TABLE_GENERATOR, OrmPackage.eINSTANCE.getXmlGeneratorContainer_TableGenerator());
+ }
+
+ protected static Translator buildNamedQueryTranslator() {
+ return XmlNamedQuery.buildTranslator(JPA.NAMED_QUERY, OrmPackage.eINSTANCE.getXmlQueryContainer_NamedQueries());
+ }
+
+ protected static Translator buildNamedNativeQueryTranslator() {
+ return XmlNamedNativeQuery.buildTranslator(JPA.NAMED_NATIVE_QUERY, OrmPackage.eINSTANCE.getXmlQueryContainer_NamedNativeQueries());
+ }
+
+ protected static Translator buildNamedStoredProcedureQueryTranslator() {
+ return XmlNamedStoredProcedureQuery.buildTranslator(EclipseLink.NAMED_STORED_PROCEDURE_QUERY, EclipseLinkOrmPackage.eINSTANCE.getXmlQueryContainer_NamedStoredProcedureQueries());
+ }
+
+ protected static Translator buildSqlResultSetMappingTranslator() {
+ return SqlResultSetMapping.buildTranslator(JPA.SQL_RESULT_SET_MAPPING, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlMappedSuperclass_2_1_SqlResultSetMappings());
+ }
+
+ protected static Translator buildQueryRedirectorsTranslator() {
+ return XmlQueryRedirectors.buildTranslator(EclipseLink2_0.QUERY_REDIRECTORS, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlMappedSuperclass_2_1_QueryRedirectors());
+ }
+
protected static Translator buildPropertyTranslator() {
return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
}
+
+ protected static Translator buildAttributeOverrideTranslator() {
+ return XmlAttributeOverride.buildTranslator(JPA.ATTRIBUTE_OVERRIDE, OrmPackage.eINSTANCE.getXmlAttributeOverrideContainer_AttributeOverrides());
+ }
+
+ protected static Translator buildAssociationOverrideTranslator() {
+ return XmlAssociationOverride.buildTranslator(JPA.ASSOCIATION_OVERRIDE, OrmPackage.eINSTANCE.getXmlAssociationOverrideContainer_AssociationOverrides());
+ }
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPrimaryKey.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPrimaryKey.java
index 72841065f0..4c73e6e7f8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPrimaryKey.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPrimaryKey.java
@@ -28,6 +28,10 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.EclipseLink1_1;
import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package;
import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1;
import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -40,7 +44,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1_1
+public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1_1, XmlPrimaryKey_2_1
{
/**
* changed this to null and removed the generated flag so emf won't generate over it
@@ -69,6 +73,26 @@ public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1
protected EList<XmlColumn> columns;
/**
+ * The default value of the '{@link #getCacheKeyType() <em>Cache Key Type</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getCacheKeyType()
+ * @generated
+ * @ordered
+ */
+ protected static final CacheKeyType_2_1 CACHE_KEY_TYPE_EDEFAULT = CacheKeyType_2_1.ID_VALUE;
+
+ /**
+ * The cached value of the '{@link #getCacheKeyType() <em>Cache Key Type</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getCacheKeyType()
+ * @generated
+ * @ordered
+ */
+ protected CacheKeyType_2_1 cacheKeyType = CACHE_KEY_TYPE_EDEFAULT;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -151,6 +175,44 @@ public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1
}
/**
+ * Returns the value of the '<em><b>Cache Key Type</b></em>' attribute.
+ * The literals are from the enumeration {@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Cache Key Type</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Cache Key Type</em>' attribute.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1
+ * @see #setCacheKeyType(CacheKeyType_2_1)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrimaryKey_2_1_CacheKeyType()
+ * @model
+ * @generated
+ */
+ public CacheKeyType_2_1 getCacheKeyType()
+ {
+ return cacheKeyType;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrimaryKey#getCacheKeyType <em>Cache Key Type</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Cache Key Type</em>' attribute.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1
+ * @see #getCacheKeyType()
+ * @generated
+ */
+ public void setCacheKeyType(CacheKeyType_2_1 newCacheKeyType)
+ {
+ CacheKeyType_2_1 oldCacheKeyType = cacheKeyType;
+ cacheKeyType = newCacheKeyType == null ? CACHE_KEY_TYPE_EDEFAULT : newCacheKeyType;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_PRIMARY_KEY__CACHE_KEY_TYPE, oldCacheKeyType, cacheKeyType));
+ }
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -180,6 +242,8 @@ public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1
return getValidation();
case EclipseLinkOrmPackage.XML_PRIMARY_KEY__COLUMNS:
return getColumns();
+ case EclipseLinkOrmPackage.XML_PRIMARY_KEY__CACHE_KEY_TYPE:
+ return getCacheKeyType();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -202,6 +266,9 @@ public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1
getColumns().clear();
getColumns().addAll((Collection<? extends XmlColumn>)newValue);
return;
+ case EclipseLinkOrmPackage.XML_PRIMARY_KEY__CACHE_KEY_TYPE:
+ setCacheKeyType((CacheKeyType_2_1)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -222,6 +289,9 @@ public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1
case EclipseLinkOrmPackage.XML_PRIMARY_KEY__COLUMNS:
getColumns().clear();
return;
+ case EclipseLinkOrmPackage.XML_PRIMARY_KEY__CACHE_KEY_TYPE:
+ setCacheKeyType(CACHE_KEY_TYPE_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -240,6 +310,8 @@ public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1
return validation != VALIDATION_EDEFAULT;
case EclipseLinkOrmPackage.XML_PRIMARY_KEY__COLUMNS:
return columns != null && !columns.isEmpty();
+ case EclipseLinkOrmPackage.XML_PRIMARY_KEY__CACHE_KEY_TYPE:
+ return cacheKeyType != CACHE_KEY_TYPE_EDEFAULT;
}
return super.eIsSet(featureID);
}
@@ -250,6 +322,44 @@ public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1
* @generated
*/
@Override
+ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlPrimaryKey_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_PRIMARY_KEY__CACHE_KEY_TYPE: return EclipseLinkOrmV2_1Package.XML_PRIMARY_KEY_21__CACHE_KEY_TYPE;
+ default: return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlPrimaryKey_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case EclipseLinkOrmV2_1Package.XML_PRIMARY_KEY_21__CACHE_KEY_TYPE: return EclipseLinkOrmPackage.XML_PRIMARY_KEY__CACHE_KEY_TYPE;
+ default: return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
public String toString()
{
if (eIsProxy()) return super.toString();
@@ -257,6 +367,8 @@ public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1
StringBuffer result = new StringBuffer(super.toString());
result.append(" (validation: ");
result.append(validation);
+ result.append(", cacheKeyType: ");
+ result.append(cacheKeyType);
result.append(')');
return result.toString();
}
@@ -275,6 +387,7 @@ public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
buildValidationTranslator(),
+ buildCacheKeyTypeTranslator(),
buildColumnTranslator()
};
}
@@ -283,6 +396,10 @@ public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1
return new Translator(EclipseLink1_1.PRIMARY_KEY__VALIDATION, EclipseLinkOrmV1_1Package.eINSTANCE.getXmlPrimaryKey_1_1_Validation(), Translator.DOM_ATTRIBUTE);
}
+ protected static Translator buildCacheKeyTypeTranslator() {
+ return new Translator(EclipseLink2_1.CACHE_KEY_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlPrimaryKey_2_1_CacheKeyType(), Translator.DOM_ATTRIBUTE);
+ }
+
protected static Translator buildColumnTranslator() {
return XmlColumn.buildTranslator(EclipseLink1_1.PRIMARY_KEY__COLUMN, EclipseLinkOrmV1_1Package.eINSTANCE.getXmlPrimaryKey_1_1_Columns());
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlQueryRedirectors.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlQueryRedirectors.java
index de7b431ce3..b6af0dbf07 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlQueryRedirectors.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlQueryRedirectors.java
@@ -10,15 +10,11 @@
package org.eclipse.jpt.eclipselink.core.resource.orm;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
-
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLink2_0;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlReturnInsert.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlReturnInsert.java
new file mode 100644
index 0000000000..18d3866627
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlReturnInsert.java
@@ -0,0 +1,211 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jpt.eclipselink.core.resource.orm;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1;
+import org.eclipse.wst.common.internal.emf.resource.Translator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Return Insert</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReturnInsert()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlReturnInsert extends AbstractJpaEObject implements XmlReturnInsert_2_1
+{
+ /**
+ * The default value of the '{@link #getReturnOnly() <em>Return Only</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getReturnOnly()
+ * @generated
+ * @ordered
+ */
+ protected static final Boolean RETURN_ONLY_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getReturnOnly() <em>Return Only</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getReturnOnly()
+ * @generated
+ * @ordered
+ */
+ protected Boolean returnOnly = RETURN_ONLY_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected XmlReturnInsert()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return EclipseLinkOrmPackage.Literals.XML_RETURN_INSERT;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Return Only</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Return Only</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Return Only</em>' attribute.
+ * @see #setReturnOnly(Boolean)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReturnInsert_2_1_ReturnOnly()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
+ * @generated
+ */
+ public Boolean getReturnOnly()
+ {
+ return returnOnly;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlReturnInsert#getReturnOnly <em>Return Only</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Return Only</em>' attribute.
+ * @see #getReturnOnly()
+ * @generated
+ */
+ public void setReturnOnly(Boolean newReturnOnly)
+ {
+ Boolean oldReturnOnly = returnOnly;
+ returnOnly = newReturnOnly;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_RETURN_INSERT__RETURN_ONLY, oldReturnOnly, returnOnly));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case EclipseLinkOrmPackage.XML_RETURN_INSERT__RETURN_ONLY:
+ return getReturnOnly();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case EclipseLinkOrmPackage.XML_RETURN_INSERT__RETURN_ONLY:
+ setReturnOnly((Boolean)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case EclipseLinkOrmPackage.XML_RETURN_INSERT__RETURN_ONLY:
+ setReturnOnly(RETURN_ONLY_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case EclipseLinkOrmPackage.XML_RETURN_INSERT__RETURN_ONLY:
+ return RETURN_ONLY_EDEFAULT == null ? returnOnly != null : !RETURN_ONLY_EDEFAULT.equals(returnOnly);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (returnOnly: ");
+ result.append(returnOnly);
+ result.append(')');
+ return result.toString();
+ }
+
+
+ // ********** translators **********
+
+ public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
+ return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
+ }
+
+ private static Translator[] buildTranslatorChildren() {
+ return new Translator[] {
+ buildReturnOnlyTranslator()};
+ }
+
+ protected static Translator buildReturnOnlyTranslator() {
+ return new Translator(EclipseLink2_1.RETURN_ONLY, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlReturnInsert_2_1_ReturnOnly());
+ }
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java
index 5a3d9de1cf..e1113a096d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java
@@ -21,6 +21,7 @@ import org.eclipse.jpt.core.resource.orm.OrmPackage;
import org.eclipse.jpt.core.resource.xml.CommonPackage;
import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
/**
* <!-- begin-user-doc -->
@@ -310,16 +311,19 @@ public class EclipseLinkOrmV1_1Package extends EPackageImpl
// Obtain or create and register interdependencies
EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) instanceof EclipseLinkOrmPackage ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) : EclipseLinkOrmPackage.eINSTANCE);
EclipseLinkOrmV2_0Package theEclipseLinkOrmV2_0Package = (EclipseLinkOrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) instanceof EclipseLinkOrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) : EclipseLinkOrmV2_0Package.eINSTANCE);
+ EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) instanceof EclipseLinkOrmV2_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) : EclipseLinkOrmV2_1Package.eINSTANCE);
// Create package meta-data objects
theEclipseLinkOrmV1_1Package.createPackageContents();
theEclipseLinkOrmPackage.createPackageContents();
theEclipseLinkOrmV2_0Package.createPackageContents();
+ theEclipseLinkOrmV2_1Package.createPackageContents();
// Initialize created meta-data
theEclipseLinkOrmV1_1Package.initializePackageContents();
theEclipseLinkOrmPackage.initializePackageContents();
theEclipseLinkOrmV2_0Package.initializePackageContents();
+ theEclipseLinkOrmV2_1Package.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theEclipseLinkOrmV1_1Package.freeze();
@@ -555,7 +559,7 @@ public class EclipseLinkOrmV1_1Package extends EPackageImpl
initEReference(getXmlBasic_1_1_GeneratedValue(), theOrmPackage.getXmlGeneratedValue(), null, "generatedValue", null, 0, 1, XmlBasic_1_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlEntity_1_1EClass, XmlEntity_1_1.class, "XmlEntity_1_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlEntity_1_1_PrimaryKey(), this.getXmlPrimaryKey_1_1(), null, "primaryKey", null, 0, 1, XmlEntity_1_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_1_1_PrimaryKey(), theEclipseLinkOrmPackage.getXmlPrimaryKey(), null, "primaryKey", null, 0, 1, XmlEntity_1_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlMappedSuperclass_1_1EClass, XmlMappedSuperclass_1_1.class, "XmlMappedSuperclass_1_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getXmlMappedSuperclass_1_1_PrimaryKey(), theEclipseLinkOrmPackage.getXmlPrimaryKey(), null, "primaryKey", null, 0, 1, XmlMappedSuperclass_1_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v1_1/XmlEntity_1_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v1_1/XmlEntity_1_1.java
index 7d35f8b44d..30c8f0af03 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v1_1/XmlEntity_1_1.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v1_1/XmlEntity_1_1.java
@@ -12,6 +12,7 @@
package org.eclipse.jpt.eclipselink.core.resource.orm.v1_1;
import org.eclipse.jpt.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrimaryKey;
/**
* <!-- begin-user-doc -->
@@ -41,12 +42,12 @@ public interface XmlEntity_1_1 extends JpaEObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Primary Key</em>' containment reference.
- * @see #setPrimaryKey(XmlPrimaryKey_1_1)
+ * @see #setPrimaryKey(XmlPrimaryKey)
* @see org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlEntity_1_1_PrimaryKey()
* @model containment="true"
* @generated
*/
- XmlPrimaryKey_1_1 getPrimaryKey();
+ XmlPrimaryKey getPrimaryKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.XmlEntity_1_1#getPrimaryKey <em>Primary Key</em>}' containment reference.
@@ -56,6 +57,6 @@ public interface XmlEntity_1_1 extends JpaEObject
* @see #getPrimaryKey()
* @generated
*/
- void setPrimaryKey(XmlPrimaryKey_1_1 value);
+ void setPrimaryKey(XmlPrimaryKey value);
} // XmlEntity_1_1
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java
index e70d2f93a8..d80fc7090d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java
@@ -22,6 +22,7 @@ import org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package;
import org.eclipse.jpt.core.resource.xml.CommonPackage;
import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
/**
* <!-- begin-user-doc -->
@@ -827,16 +828,19 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
// Obtain or create and register interdependencies
EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) instanceof EclipseLinkOrmPackage ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) : EclipseLinkOrmPackage.eINSTANCE);
EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) instanceof EclipseLinkOrmV1_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) : EclipseLinkOrmV1_1Package.eINSTANCE);
+ EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) instanceof EclipseLinkOrmV2_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) : EclipseLinkOrmV2_1Package.eINSTANCE);
// Create package meta-data objects
theEclipseLinkOrmV2_0Package.createPackageContents();
theEclipseLinkOrmPackage.createPackageContents();
theEclipseLinkOrmV1_1Package.createPackageContents();
+ theEclipseLinkOrmV2_1Package.createPackageContents();
// Initialize created meta-data
theEclipseLinkOrmV2_0Package.initializePackageContents();
theEclipseLinkOrmPackage.initializePackageContents();
theEclipseLinkOrmV1_1Package.initializePackageContents();
+ theEclipseLinkOrmV2_1Package.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theEclipseLinkOrmV2_0Package.freeze();
@@ -1332,8 +1336,8 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
initEClass(xmlElementCollection_2_0EClass, XmlElementCollection_2_0.class, "XmlElementCollection_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(xmlEntity_2_0EClass, XmlEntity_2_0.class, "XmlEntity_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlEntity_2_0_CacheInterceptor(), this.getXmlCacheInterceptor_2_0(), null, "cacheInterceptor", null, 0, 1, XmlEntity_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntity_2_0_QueryRedirectors(), this.getXmlQueryRedirectors_2_0(), null, "queryRedirectors", null, 0, 1, XmlEntity_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_2_0_CacheInterceptor(), theEclipseLinkOrmPackage.getXmlCacheInterceptor(), null, "cacheInterceptor", null, 0, 1, XmlEntity_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_2_0_QueryRedirectors(), theEclipseLinkOrmPackage.getXmlQueryRedirectors(), null, "queryRedirectors", null, 0, 1, XmlEntity_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlManyToMany_2_0EClass, XmlManyToMany_2_0.class, "XmlManyToMany_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1341,7 +1345,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
initEReference(getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides(), theOrmPackage.getXmlAssociationOverride(), null, "mapKeyAssociationOverrides", null, 0, -1, XmlMapKeyAssociationOverrideContainer_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlMappedSuperclass_2_0EClass, XmlMappedSuperclass_2_0.class, "XmlMappedSuperclass_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlMappedSuperclass_2_0_CacheInterceptor(), this.getXmlCacheInterceptor_2_0(), null, "cacheInterceptor", null, 0, 1, XmlMappedSuperclass_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlMappedSuperclass_2_0_CacheInterceptor(), theEclipseLinkOrmPackage.getXmlCacheInterceptor(), null, "cacheInterceptor", null, 0, 1, XmlMappedSuperclass_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlOneToMany_2_0EClass, XmlOneToMany_2_0.class, "XmlOneToMany_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/OrderCorrectionType_2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/OrderCorrectionType_2_0.java
index e0a5dd1c75..b662585100 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/OrderCorrectionType_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/OrderCorrectionType_2_0.java
@@ -13,7 +13,6 @@ package org.eclipse.jpt.eclipselink.core.resource.orm.v2_0;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-
import org.eclipse.emf.common.util.Enumerator;
/**
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java
index df41f45fac..0c1240d2cc 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java
@@ -9,6 +9,9 @@
******************************************************************************/
package org.eclipse.jpt.eclipselink.core.resource.orm.v2_0;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlCacheInterceptor;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlQueryRedirectors;
+
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Xml Entity2 0</b></em>'.
@@ -43,12 +46,12 @@ public interface XmlEntity_2_0 extends org.eclipse.jpt.core.resource.orm.v2_0.Xm
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Cache Interceptor</em>' containment reference.
- * @see #setCacheInterceptor(XmlCacheInterceptor_2_0)
+ * @see #setCacheInterceptor(XmlCacheInterceptor)
* @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity_2_0_CacheInterceptor()
* @model containment="true"
* @generated
*/
- XmlCacheInterceptor_2_0 getCacheInterceptor();
+ XmlCacheInterceptor getCacheInterceptor();
/**
* Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getCacheInterceptor <em>Cache Interceptor</em>}' containment reference.
@@ -58,7 +61,7 @@ public interface XmlEntity_2_0 extends org.eclipse.jpt.core.resource.orm.v2_0.Xm
* @see #getCacheInterceptor()
* @generated
*/
- void setCacheInterceptor(XmlCacheInterceptor_2_0 value);
+ void setCacheInterceptor(XmlCacheInterceptor value);
/**
* Returns the value of the '<em><b>Query Redirectors</b></em>' containment reference.
@@ -69,12 +72,12 @@ public interface XmlEntity_2_0 extends org.eclipse.jpt.core.resource.orm.v2_0.Xm
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Query Redirectors</em>' containment reference.
- * @see #setQueryRedirectors(XmlQueryRedirectors_2_0)
+ * @see #setQueryRedirectors(XmlQueryRedirectors)
* @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity_2_0_QueryRedirectors()
* @model containment="true"
* @generated
*/
- XmlQueryRedirectors_2_0 getQueryRedirectors();
+ XmlQueryRedirectors getQueryRedirectors();
/**
* Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getQueryRedirectors <em>Query Redirectors</em>}' containment reference.
@@ -84,6 +87,6 @@ public interface XmlEntity_2_0 extends org.eclipse.jpt.core.resource.orm.v2_0.Xm
* @see #getQueryRedirectors()
* @generated
*/
- void setQueryRedirectors(XmlQueryRedirectors_2_0 value);
+ void setQueryRedirectors(XmlQueryRedirectors value);
} // XmlEntity2_0
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java
index 9fe379e680..05dfc02c39 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java
@@ -11,9 +11,7 @@
package org.eclipse.jpt.eclipselink.core.resource.orm.v2_0;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
-
import org.eclipse.jpt.core.resource.xml.JpaEObject;
/**
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java
index 7d26f6cdf5..a1c8bd351f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java
@@ -10,6 +10,7 @@
package org.eclipse.jpt.eclipselink.core.resource.orm.v2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlCacheInterceptor;
/**
* <!-- begin-user-doc -->
@@ -45,12 +46,12 @@ public interface XmlMappedSuperclass_2_0 extends XmlCacheable_2_0
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Cache Interceptor</em>' containment reference.
- * @see #setCacheInterceptor(XmlCacheInterceptor_2_0)
+ * @see #setCacheInterceptor(XmlCacheInterceptor)
* @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMappedSuperclass_2_0_CacheInterceptor()
* @model containment="true"
* @generated
*/
- XmlCacheInterceptor_2_0 getCacheInterceptor();
+ XmlCacheInterceptor getCacheInterceptor();
/**
* Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0#getCacheInterceptor <em>Cache Interceptor</em>}' containment reference.
@@ -60,6 +61,6 @@ public interface XmlMappedSuperclass_2_0 extends XmlCacheable_2_0
* @see #getCacheInterceptor()
* @generated
*/
- void setCacheInterceptor(XmlCacheInterceptor_2_0 value);
+ void setCacheInterceptor(XmlCacheInterceptor value);
} // XmlMappedSuperclass_2_0
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/CacheKeyType_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/CacheKeyType_2_1.java
new file mode 100644
index 0000000000..3683b9e4eb
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/CacheKeyType_2_1.java
@@ -0,0 +1,258 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Cache Key Type 21</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getCacheKeyType_2_1()
+ * @model
+ * @generated
+ */
+public enum CacheKeyType_2_1 implements Enumerator
+{
+ /**
+ * The '<em><b>ID VALUE</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #ID_VALUE_VALUE
+ * @generated
+ * @ordered
+ */
+ ID_VALUE(0, "ID_VALUE", "ID_VALUE"),
+
+ /**
+ * The '<em><b>CACHE KEY</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #CACHE_KEY_VALUE
+ * @generated
+ * @ordered
+ */
+ CACHE_KEY(1, "CACHE_KEY", "CACHE_KEY"),
+
+ /**
+ * The '<em><b>AUTO</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #AUTO_VALUE
+ * @generated
+ * @ordered
+ */
+ AUTO(2, "AUTO", "AUTO");
+
+ /**
+ * The '<em><b>ID VALUE</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>ID VALUE</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @see #ID_VALUE
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int ID_VALUE_VALUE = 0;
+
+ /**
+ * The '<em><b>CACHE KEY</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>CACHE KEY</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @see #CACHE_KEY
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int CACHE_KEY_VALUE = 1;
+
+ /**
+ * The '<em><b>AUTO</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>AUTO</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @see #AUTO
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int AUTO_VALUE = 2;
+
+ /**
+ * An array of all the '<em><b>Cache Key Type 21</b></em>' enumerators.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static final CacheKeyType_2_1[] VALUES_ARRAY =
+ new CacheKeyType_2_1[]
+ {
+ ID_VALUE,
+ CACHE_KEY,
+ AUTO,
+ };
+
+ /**
+ * A public read-only list of all the '<em><b>Cache Key Type 21</b></em>' enumerators.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final List<CacheKeyType_2_1> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+ /**
+ * Returns the '<em><b>Cache Key Type 21</b></em>' literal with the specified literal value.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static CacheKeyType_2_1 get(String literal)
+ {
+ for (int i = 0; i < VALUES_ARRAY.length; ++i)
+ {
+ CacheKeyType_2_1 result = VALUES_ARRAY[i];
+ if (result.toString().equals(literal))
+ {
+ return result;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the '<em><b>Cache Key Type 21</b></em>' literal with the specified name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static CacheKeyType_2_1 getByName(String name)
+ {
+ for (int i = 0; i < VALUES_ARRAY.length; ++i)
+ {
+ CacheKeyType_2_1 result = VALUES_ARRAY[i];
+ if (result.getName().equals(name))
+ {
+ return result;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the '<em><b>Cache Key Type 21</b></em>' literal with the specified integer value.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static CacheKeyType_2_1 get(int value)
+ {
+ switch (value)
+ {
+ case ID_VALUE_VALUE: return ID_VALUE;
+ case CACHE_KEY_VALUE: return CACHE_KEY;
+ case AUTO_VALUE: return AUTO;
+ }
+ return null;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private final int value;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private final String name;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private final String literal;
+
+ /**
+ * Only this class can construct instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private CacheKeyType_2_1(int value, String name, String literal)
+ {
+ this.value = value;
+ this.name = name;
+ this.literal = literal;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public int getValue()
+ {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getLiteral()
+ {
+ return literal;
+ }
+
+ /**
+ * Returns the literal value of the enumerator, which is its string representation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ return literal;
+ }
+
+} //CacheKeyType_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java
index 7bee6129ea..b1a6c7db4b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java
@@ -19,4 +19,15 @@ public interface EclipseLink2_1
String SCHEMA_NAMESPACE = EclipseLink.SCHEMA_NAMESPACE;
String SCHEMA_LOCATION = "http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_2_1.xsd";
String SCHEMA_VERSION = "2.1";
+
+
+ // EclipseLink 2.1 specific nodes
+
+ String ATTRIBUTE = "attribute";
+ String CACHE_KEY_TYPE = "cache-key-type";
+ String CLASS_EXTRACTOR = "class-extractor";
+ String FETCH_GROUP = "fetch-group";
+ String RETURN_INSERT = "return-insert";
+ String RETURN_ONLY = "return-only";
+ String RETURN_UPDATE = "return-update";
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Factory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Factory.java
new file mode 100644
index 0000000000..e5b91ca2e7
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Factory.java
@@ -0,0 +1,166 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package
+ * @generated
+ */
+public class EclipseLinkOrmV2_1Factory extends EFactoryImpl
+{
+ /**
+ * The singleton instance of the factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EclipseLinkOrmV2_1Factory eINSTANCE = init();
+
+ /**
+ * Creates the default factory implementation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static EclipseLinkOrmV2_1Factory init()
+ {
+ try
+ {
+ EclipseLinkOrmV2_1Factory theEclipseLinkOrmV2_1Factory = (EclipseLinkOrmV2_1Factory)EPackage.Registry.INSTANCE.getEFactory("jpt.eclipselink.orm.v2_1.xmi");
+ if (theEclipseLinkOrmV2_1Factory != null)
+ {
+ return theEclipseLinkOrmV2_1Factory;
+ }
+ }
+ catch (Exception exception)
+ {
+ EcorePlugin.INSTANCE.log(exception);
+ }
+ return new EclipseLinkOrmV2_1Factory();
+ }
+
+ /**
+ * Creates an instance of the factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EclipseLinkOrmV2_1Factory()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public EObject create(EClass eClass)
+ {
+ switch (eClass.getClassifierID())
+ {
+ default:
+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object createFromString(EDataType eDataType, String initialValue)
+ {
+ switch (eDataType.getClassifierID())
+ {
+ case EclipseLinkOrmV2_1Package.CACHE_KEY_TYPE_21:
+ return createCacheKeyType_2_1FromString(eDataType, initialValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String convertToString(EDataType eDataType, Object instanceValue)
+ {
+ switch (eDataType.getClassifierID())
+ {
+ case EclipseLinkOrmV2_1Package.CACHE_KEY_TYPE_21:
+ return convertCacheKeyType_2_1ToString(eDataType, instanceValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CacheKeyType_2_1 createCacheKeyType_2_1FromString(EDataType eDataType, String initialValue)
+ {
+ CacheKeyType_2_1 result = CacheKeyType_2_1.get(initialValue);
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+ return result;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String convertCacheKeyType_2_1ToString(EDataType eDataType, Object instanceValue)
+ {
+ return instanceValue == null ? null : instanceValue.toString();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EclipseLinkOrmV2_1Package getEclipseLinkOrmV2_1Package()
+ {
+ return (EclipseLinkOrmV2_1Package)getEPackage();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @deprecated
+ * @generated
+ */
+ @Deprecated
+ public static EclipseLinkOrmV2_1Package getPackage()
+ {
+ return EclipseLinkOrmV2_1Package.eINSTANCE;
+ }
+
+} //EclipseLinkOrmV2_1Factory
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java
new file mode 100644
index 0000000000..0ff4348062
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java
@@ -0,0 +1,1195 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
+import org.eclipse.jpt.core.resource.orm.OrmPackage;
+import org.eclipse.jpt.core.resource.xml.CommonPackage;
+import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Factory
+ * @model kind="package"
+ * @generated
+ */
+public class EclipseLinkOrmV2_1Package extends EPackageImpl
+{
+ /**
+ * The package name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final String eNAME = "v2_1";
+
+ /**
+ * The package namespace URI.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final String eNS_URI = "jpt.eclipselink.orm.v2_1.xmi";
+
+ /**
+ * The package namespace name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final String eNS_PREFIX = "org.eclipse.jpt.eclipselink.core.resource.orm.v2_1";
+
+ /**
+ * The singleton instance of the package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EclipseLinkOrmV2_1Package eINSTANCE = org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package.init();
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1 <em>Xml Basic 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBasic_2_1()
+ * @generated
+ */
+ public static final int XML_BASIC_21 = 0;
+
+ /**
+ * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_BASIC_21__SEQUENCE_GENERATOR = EclipseLinkOrmV1_1Package.XML_BASIC_11__SEQUENCE_GENERATOR;
+
+ /**
+ * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_BASIC_21__TABLE_GENERATOR = EclipseLinkOrmV1_1Package.XML_BASIC_11__TABLE_GENERATOR;
+
+ /**
+ * The feature id for the '<em><b>Generated Value</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_BASIC_21__GENERATED_VALUE = EclipseLinkOrmV1_1Package.XML_BASIC_11__GENERATED_VALUE;
+
+ /**
+ * The feature id for the '<em><b>Return Insert</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_BASIC_21__RETURN_INSERT = EclipseLinkOrmV1_1Package.XML_BASIC_11_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Return Update</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_BASIC_21__RETURN_UPDATE = EclipseLinkOrmV1_1Package.XML_BASIC_11_FEATURE_COUNT + 1;
+
+ /**
+ * The number of structural features of the '<em>Xml Basic 21</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_BASIC_21_FEATURE_COUNT = EclipseLinkOrmV1_1Package.XML_BASIC_11_FEATURE_COUNT + 2;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1 <em>Xml Fetch Group Container 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroupContainer_2_1()
+ * @generated
+ */
+ public static final int XML_FETCH_GROUP_CONTAINER_21 = 4;
+
+ /**
+ * The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS = 0;
+
+ /**
+ * The number of structural features of the '<em>Xml Fetch Group Container 21</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FETCH_GROUP_CONTAINER_21_FEATURE_COUNT = 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1 <em>Xml Entity 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntity_2_1()
+ * @generated
+ */
+ public static final int XML_ENTITY_21 = 1;
+
+ /**
+ * The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ENTITY_21__FETCH_GROUPS = XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS;
+
+ /**
+ * The feature id for the '<em><b>Class Extractor</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ENTITY_21__CLASS_EXTRACTOR = XML_FETCH_GROUP_CONTAINER_21_FEATURE_COUNT + 0;
+
+ /**
+ * The number of structural features of the '<em>Xml Entity 21</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ENTITY_21_FEATURE_COUNT = XML_FETCH_GROUP_CONTAINER_21_FEATURE_COUNT + 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1 <em>Xml Fetch Attribute 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchAttribute_2_1()
+ * @generated
+ */
+ public static final int XML_FETCH_ATTRIBUTE_21 = 2;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FETCH_ATTRIBUTE_21__NAME = 0;
+
+ /**
+ * The number of structural features of the '<em>Xml Fetch Attribute 21</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FETCH_ATTRIBUTE_21_FEATURE_COUNT = 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1 <em>Xml Fetch Group 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroup_2_1()
+ * @generated
+ */
+ public static final int XML_FETCH_GROUP_21 = 3;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FETCH_GROUP_21__NAME = 0;
+
+ /**
+ * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FETCH_GROUP_21__ATTRIBUTES = 1;
+
+ /**
+ * The number of structural features of the '<em>Xml Fetch Group 21</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FETCH_GROUP_21_FEATURE_COUNT = 2;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1 <em>Xml Mapped Superclass 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlMappedSuperclass_2_1()
+ * @generated
+ */
+ public static final int XML_MAPPED_SUPERCLASS_21 = 5;
+
+ /**
+ * The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS_21__ASSOCIATION_OVERRIDES = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER__ASSOCIATION_OVERRIDES;
+
+ /**
+ * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS_21__ATTRIBUTE_OVERRIDES = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS_21__FETCH_GROUPS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS_21__SEQUENCE_GENERATOR = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 2;
+
+ /**
+ * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS_21__TABLE_GENERATOR = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 3;
+
+ /**
+ * The feature id for the '<em><b>Named Queries</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS_21__NAMED_QUERIES = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 4;
+
+ /**
+ * The feature id for the '<em><b>Named Native Queries</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS_21__NAMED_NATIVE_QUERIES = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 5;
+
+ /**
+ * The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS_21__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 6;
+
+ /**
+ * The feature id for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 7;
+
+ /**
+ * The feature id for the '<em><b>Query Redirectors</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 8;
+
+ /**
+ * The number of structural features of the '<em>Xml Mapped Superclass 21</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS_21_FEATURE_COUNT = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 9;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1 <em>Xml Return Insert 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlReturnInsert_2_1()
+ * @generated
+ */
+ public static final int XML_RETURN_INSERT_21 = 6;
+
+ /**
+ * The feature id for the '<em><b>Return Only</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_RETURN_INSERT_21__RETURN_ONLY = 0;
+
+ /**
+ * The number of structural features of the '<em>Xml Return Insert 21</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_RETURN_INSERT_21_FEATURE_COUNT = 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1 <em>Xml Primary Key 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPrimaryKey_2_1()
+ * @generated
+ */
+ public static final int XML_PRIMARY_KEY_21 = 7;
+
+ /**
+ * The feature id for the '<em><b>Cache Key Type</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_PRIMARY_KEY_21__CACHE_KEY_TYPE = 0;
+
+ /**
+ * The number of structural features of the '<em>Xml Primary Key 21</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_PRIMARY_KEY_21_FEATURE_COUNT = 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1 <em>Cache Key Type 21</em>}' enum.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getCacheKeyType_2_1()
+ * @generated
+ */
+ public static final int CACHE_KEY_TYPE_21 = 8;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass xmlBasic_2_1EClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass xmlEntity_2_1EClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass xmlFetchAttribute_2_1EClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass xmlFetchGroup_2_1EClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass xmlFetchGroupContainer_2_1EClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass xmlMappedSuperclass_2_1EClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass xmlReturnInsert_2_1EClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass xmlPrimaryKey_2_1EClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EEnum cacheKeyType_2_1EEnum = null;
+
+ /**
+ * Creates an instance of the model <b>Package</b>, registered with
+ * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * package URI value.
+ * <p>Note: the correct way to create the package is via the static
+ * factory method {@link #init init()}, which also performs
+ * initialization of the package, or returns the registered package,
+ * if one already exists.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.ecore.EPackage.Registry
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#eNS_URI
+ * @see #init()
+ * @generated
+ */
+ private EclipseLinkOrmV2_1Package()
+ {
+ super(eNS_URI, EclipseLinkOrmV2_1Factory.eINSTANCE);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static boolean isInited = false;
+
+ /**
+ * 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 EclipseLinkOrmV2_1Package#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
+ * @see #createPackageContents()
+ * @see #initializePackageContents()
+ * @generated
+ */
+ public static EclipseLinkOrmV2_1Package init()
+ {
+ if (isInited) return (EclipseLinkOrmV2_1Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI);
+
+ // Obtain or create and register package
+ EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EclipseLinkOrmV2_1Package ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EclipseLinkOrmV2_1Package());
+
+ isInited = true;
+
+ // Initialize simple dependencies
+ OrmPackage.eINSTANCE.eClass();
+ CommonPackage.eINSTANCE.eClass();
+ XMLTypePackage.eINSTANCE.eClass();
+
+ // Obtain or create and register interdependencies
+ EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) instanceof EclipseLinkOrmPackage ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) : EclipseLinkOrmPackage.eINSTANCE);
+ EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) instanceof EclipseLinkOrmV1_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) : EclipseLinkOrmV1_1Package.eINSTANCE);
+ EclipseLinkOrmV2_0Package theEclipseLinkOrmV2_0Package = (EclipseLinkOrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) instanceof EclipseLinkOrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) : EclipseLinkOrmV2_0Package.eINSTANCE);
+
+ // Create package meta-data objects
+ theEclipseLinkOrmV2_1Package.createPackageContents();
+ theEclipseLinkOrmPackage.createPackageContents();
+ theEclipseLinkOrmV1_1Package.createPackageContents();
+ theEclipseLinkOrmV2_0Package.createPackageContents();
+
+ // Initialize created meta-data
+ theEclipseLinkOrmV2_1Package.initializePackageContents();
+ theEclipseLinkOrmPackage.initializePackageContents();
+ theEclipseLinkOrmV1_1Package.initializePackageContents();
+ theEclipseLinkOrmV2_0Package.initializePackageContents();
+
+ // Mark meta-data to indicate it can't be changed
+ theEclipseLinkOrmV2_1Package.freeze();
+
+
+ // Update the registry and return the package
+ EPackage.Registry.INSTANCE.put(EclipseLinkOrmV2_1Package.eNS_URI, theEclipseLinkOrmV2_1Package);
+ return theEclipseLinkOrmV2_1Package;
+ }
+
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1 <em>Xml Basic 21</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Basic 21</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1
+ * @generated
+ */
+ public EClass getXmlBasic_2_1()
+ {
+ return xmlBasic_2_1EClass;
+ }
+
+ /**
+ * Returns the meta object for the containment reference '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnInsert <em>Return Insert</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference '<em>Return Insert</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnInsert()
+ * @see #getXmlBasic_2_1()
+ * @generated
+ */
+ public EReference getXmlBasic_2_1_ReturnInsert()
+ {
+ return (EReference)xmlBasic_2_1EClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnUpdate <em>Return Update</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Return Update</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnUpdate()
+ * @see #getXmlBasic_2_1()
+ * @generated
+ */
+ public EAttribute getXmlBasic_2_1_ReturnUpdate()
+ {
+ return (EAttribute)xmlBasic_2_1EClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1 <em>Xml Entity 21</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Entity 21</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1
+ * @generated
+ */
+ public EClass getXmlEntity_2_1()
+ {
+ return xmlEntity_2_1EClass;
+ }
+
+ /**
+ * Returns the meta object for the containment reference '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getClassExtractor <em>Class Extractor</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference '<em>Class Extractor</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getClassExtractor()
+ * @see #getXmlEntity_2_1()
+ * @generated
+ */
+ public EReference getXmlEntity_2_1_ClassExtractor()
+ {
+ return (EReference)xmlEntity_2_1EClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1 <em>Xml Fetch Attribute 21</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Fetch Attribute 21</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1
+ * @generated
+ */
+ public EClass getXmlFetchAttribute_2_1()
+ {
+ return xmlFetchAttribute_2_1EClass;
+ }
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1#getName <em>Name</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Name</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1#getName()
+ * @see #getXmlFetchAttribute_2_1()
+ * @generated
+ */
+ public EAttribute getXmlFetchAttribute_2_1_Name()
+ {
+ return (EAttribute)xmlFetchAttribute_2_1EClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1 <em>Xml Fetch Group 21</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Fetch Group 21</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1
+ * @generated
+ */
+ public EClass getXmlFetchGroup_2_1()
+ {
+ return xmlFetchGroup_2_1EClass;
+ }
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getName <em>Name</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Name</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getName()
+ * @see #getXmlFetchGroup_2_1()
+ * @generated
+ */
+ public EAttribute getXmlFetchGroup_2_1_Name()
+ {
+ return (EAttribute)xmlFetchGroup_2_1EClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getAttributes <em>Attributes</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference list '<em>Attributes</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getAttributes()
+ * @see #getXmlFetchGroup_2_1()
+ * @generated
+ */
+ public EReference getXmlFetchGroup_2_1_Attributes()
+ {
+ return (EReference)xmlFetchGroup_2_1EClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1 <em>Xml Fetch Group Container 21</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Fetch Group Container 21</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1
+ * @generated
+ */
+ public EClass getXmlFetchGroupContainer_2_1()
+ {
+ return xmlFetchGroupContainer_2_1EClass;
+ }
+
+ /**
+ * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1#getFetchGroups <em>Fetch Groups</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference list '<em>Fetch Groups</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1#getFetchGroups()
+ * @see #getXmlFetchGroupContainer_2_1()
+ * @generated
+ */
+ public EReference getXmlFetchGroupContainer_2_1_FetchGroups()
+ {
+ return (EReference)xmlFetchGroupContainer_2_1EClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1 <em>Xml Mapped Superclass 21</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Mapped Superclass 21</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1
+ * @generated
+ */
+ public EClass getXmlMappedSuperclass_2_1()
+ {
+ return xmlMappedSuperclass_2_1EClass;
+ }
+
+ /**
+ * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference list '<em>Sql Result Set Mappings</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getSqlResultSetMappings()
+ * @see #getXmlMappedSuperclass_2_1()
+ * @generated
+ */
+ public EReference getXmlMappedSuperclass_2_1_SqlResultSetMappings()
+ {
+ return (EReference)xmlMappedSuperclass_2_1EClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * Returns the meta object for the containment reference '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getQueryRedirectors <em>Query Redirectors</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference '<em>Query Redirectors</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getQueryRedirectors()
+ * @see #getXmlMappedSuperclass_2_1()
+ * @generated
+ */
+ public EReference getXmlMappedSuperclass_2_1_QueryRedirectors()
+ {
+ return (EReference)xmlMappedSuperclass_2_1EClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1 <em>Xml Return Insert 21</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Return Insert 21</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1
+ * @generated
+ */
+ public EClass getXmlReturnInsert_2_1()
+ {
+ return xmlReturnInsert_2_1EClass;
+ }
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1#getReturnOnly <em>Return Only</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Return Only</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1#getReturnOnly()
+ * @see #getXmlReturnInsert_2_1()
+ * @generated
+ */
+ public EAttribute getXmlReturnInsert_2_1_ReturnOnly()
+ {
+ return (EAttribute)xmlReturnInsert_2_1EClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1 <em>Xml Primary Key 21</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Primary Key 21</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1
+ * @generated
+ */
+ public EClass getXmlPrimaryKey_2_1()
+ {
+ return xmlPrimaryKey_2_1EClass;
+ }
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1#getCacheKeyType <em>Cache Key Type</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Cache Key Type</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1#getCacheKeyType()
+ * @see #getXmlPrimaryKey_2_1()
+ * @generated
+ */
+ public EAttribute getXmlPrimaryKey_2_1_CacheKeyType()
+ {
+ return (EAttribute)xmlPrimaryKey_2_1EClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * Returns the meta object for enum '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1 <em>Cache Key Type 21</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for enum '<em>Cache Key Type 21</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1
+ * @generated
+ */
+ public EEnum getCacheKeyType_2_1()
+ {
+ return cacheKeyType_2_1EEnum;
+ }
+
+ /**
+ * Returns the factory that creates the instances of the model.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the factory that creates the instances of the model.
+ * @generated
+ */
+ public EclipseLinkOrmV2_1Factory getEclipseLinkOrmV2_1Factory()
+ {
+ return (EclipseLinkOrmV2_1Factory)getEFactoryInstance();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private boolean isCreated = false;
+
+ /**
+ * Creates the meta-model objects for the package. This method is
+ * guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void createPackageContents()
+ {
+ if (isCreated) return;
+ isCreated = true;
+
+ // Create classes and their features
+ xmlBasic_2_1EClass = createEClass(XML_BASIC_21);
+ createEReference(xmlBasic_2_1EClass, XML_BASIC_21__RETURN_INSERT);
+ createEAttribute(xmlBasic_2_1EClass, XML_BASIC_21__RETURN_UPDATE);
+
+ xmlEntity_2_1EClass = createEClass(XML_ENTITY_21);
+ createEReference(xmlEntity_2_1EClass, XML_ENTITY_21__CLASS_EXTRACTOR);
+
+ xmlFetchAttribute_2_1EClass = createEClass(XML_FETCH_ATTRIBUTE_21);
+ createEAttribute(xmlFetchAttribute_2_1EClass, XML_FETCH_ATTRIBUTE_21__NAME);
+
+ xmlFetchGroup_2_1EClass = createEClass(XML_FETCH_GROUP_21);
+ createEAttribute(xmlFetchGroup_2_1EClass, XML_FETCH_GROUP_21__NAME);
+ createEReference(xmlFetchGroup_2_1EClass, XML_FETCH_GROUP_21__ATTRIBUTES);
+
+ xmlFetchGroupContainer_2_1EClass = createEClass(XML_FETCH_GROUP_CONTAINER_21);
+ createEReference(xmlFetchGroupContainer_2_1EClass, XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS);
+
+ xmlMappedSuperclass_2_1EClass = createEClass(XML_MAPPED_SUPERCLASS_21);
+ createEReference(xmlMappedSuperclass_2_1EClass, XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS);
+ createEReference(xmlMappedSuperclass_2_1EClass, XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS);
+
+ xmlReturnInsert_2_1EClass = createEClass(XML_RETURN_INSERT_21);
+ createEAttribute(xmlReturnInsert_2_1EClass, XML_RETURN_INSERT_21__RETURN_ONLY);
+
+ xmlPrimaryKey_2_1EClass = createEClass(XML_PRIMARY_KEY_21);
+ createEAttribute(xmlPrimaryKey_2_1EClass, XML_PRIMARY_KEY_21__CACHE_KEY_TYPE);
+
+ // Create enums
+ cacheKeyType_2_1EEnum = createEEnum(CACHE_KEY_TYPE_21);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private boolean isInitialized = false;
+
+ /**
+ * Complete the initialization of the package and its meta-model. This
+ * method is guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void initializePackageContents()
+ {
+ if (isInitialized) return;
+ isInitialized = true;
+
+ // Initialize package
+ setName(eNAME);
+ setNsPrefix(eNS_PREFIX);
+ setNsURI(eNS_URI);
+
+ // Obtain other dependent packages
+ EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI);
+ EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI);
+ XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
+ OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
+
+ // Create type parameters
+
+ // Set bounds for type parameters
+
+ // Add supertypes to classes
+ xmlBasic_2_1EClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlBasic_1_1());
+ xmlEntity_2_1EClass.getESuperTypes().add(this.getXmlFetchGroupContainer_2_1());
+ xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlAssociationOverrideContainer());
+ xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlAttributeOverrideContainer());
+ xmlMappedSuperclass_2_1EClass.getESuperTypes().add(this.getXmlFetchGroupContainer_2_1());
+ xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlGeneratorContainer());
+ xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlQueryContainer());
+ xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlQueryContainer());
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(xmlBasic_2_1EClass, XmlBasic_2_1.class, "XmlBasic_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getXmlBasic_2_1_ReturnInsert(), theEclipseLinkOrmPackage.getXmlReturnInsert(), null, "returnInsert", null, 0, 1, XmlBasic_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getXmlBasic_2_1_ReturnUpdate(), theXMLTypePackage.getBooleanObject(), "returnUpdate", null, 0, 1, XmlBasic_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(xmlEntity_2_1EClass, XmlEntity_2_1.class, "XmlEntity_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getXmlEntity_2_1_ClassExtractor(), theOrmPackage.getXmlClassReference(), null, "classExtractor", null, 0, 1, XmlEntity_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(xmlFetchAttribute_2_1EClass, XmlFetchAttribute_2_1.class, "XmlFetchAttribute_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlFetchAttribute_2_1_Name(), ecorePackage.getEString(), "name", null, 0, 1, XmlFetchAttribute_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(xmlFetchGroup_2_1EClass, XmlFetchGroup_2_1.class, "XmlFetchGroup_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlFetchGroup_2_1_Name(), ecorePackage.getEString(), "name", null, 0, 1, XmlFetchGroup_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlFetchGroup_2_1_Attributes(), theEclipseLinkOrmPackage.getXmlFetchAttribute(), null, "attributes", null, 0, -1, XmlFetchGroup_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(xmlFetchGroupContainer_2_1EClass, XmlFetchGroupContainer_2_1.class, "XmlFetchGroupContainer_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getXmlFetchGroupContainer_2_1_FetchGroups(), theEclipseLinkOrmPackage.getXmlFetchGroup(), null, "fetchGroups", null, 0, -1, XmlFetchGroupContainer_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(xmlMappedSuperclass_2_1EClass, XmlMappedSuperclass_2_1.class, "XmlMappedSuperclass_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getXmlMappedSuperclass_2_1_SqlResultSetMappings(), theOrmPackage.getSqlResultSetMapping(), null, "sqlResultSetMappings", null, 0, -1, XmlMappedSuperclass_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlMappedSuperclass_2_1_QueryRedirectors(), theEclipseLinkOrmPackage.getXmlQueryRedirectors(), null, "queryRedirectors", null, 0, 1, XmlMappedSuperclass_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(xmlReturnInsert_2_1EClass, XmlReturnInsert_2_1.class, "XmlReturnInsert_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlReturnInsert_2_1_ReturnOnly(), theXMLTypePackage.getBooleanObject(), "returnOnly", null, 0, 1, XmlReturnInsert_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(xmlPrimaryKey_2_1EClass, XmlPrimaryKey_2_1.class, "XmlPrimaryKey_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlPrimaryKey_2_1_CacheKeyType(), this.getCacheKeyType_2_1(), "cacheKeyType", null, 0, 1, XmlPrimaryKey_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ // Initialize enums and add enum literals
+ initEEnum(cacheKeyType_2_1EEnum, CacheKeyType_2_1.class, "CacheKeyType_2_1");
+ addEEnumLiteral(cacheKeyType_2_1EEnum, CacheKeyType_2_1.ID_VALUE);
+ addEEnumLiteral(cacheKeyType_2_1EEnum, CacheKeyType_2_1.CACHE_KEY);
+ addEEnumLiteral(cacheKeyType_2_1EEnum, CacheKeyType_2_1.AUTO);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * Defines literals for the meta objects that represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public interface Literals
+ {
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1 <em>Xml Basic 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBasic_2_1()
+ * @generated
+ */
+ public static final EClass XML_BASIC_21 = eINSTANCE.getXmlBasic_2_1();
+
+ /**
+ * The meta object literal for the '<em><b>Return Insert</b></em>' containment reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EReference XML_BASIC_21__RETURN_INSERT = eINSTANCE.getXmlBasic_2_1_ReturnInsert();
+
+ /**
+ * The meta object literal for the '<em><b>Return Update</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EAttribute XML_BASIC_21__RETURN_UPDATE = eINSTANCE.getXmlBasic_2_1_ReturnUpdate();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1 <em>Xml Entity 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntity_2_1()
+ * @generated
+ */
+ public static final EClass XML_ENTITY_21 = eINSTANCE.getXmlEntity_2_1();
+
+ /**
+ * The meta object literal for the '<em><b>Class Extractor</b></em>' containment reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EReference XML_ENTITY_21__CLASS_EXTRACTOR = eINSTANCE.getXmlEntity_2_1_ClassExtractor();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1 <em>Xml Fetch Attribute 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchAttribute_2_1()
+ * @generated
+ */
+ public static final EClass XML_FETCH_ATTRIBUTE_21 = eINSTANCE.getXmlFetchAttribute_2_1();
+
+ /**
+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EAttribute XML_FETCH_ATTRIBUTE_21__NAME = eINSTANCE.getXmlFetchAttribute_2_1_Name();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1 <em>Xml Fetch Group 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroup_2_1()
+ * @generated
+ */
+ public static final EClass XML_FETCH_GROUP_21 = eINSTANCE.getXmlFetchGroup_2_1();
+
+ /**
+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EAttribute XML_FETCH_GROUP_21__NAME = eINSTANCE.getXmlFetchGroup_2_1_Name();
+
+ /**
+ * The meta object literal for the '<em><b>Attributes</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EReference XML_FETCH_GROUP_21__ATTRIBUTES = eINSTANCE.getXmlFetchGroup_2_1_Attributes();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1 <em>Xml Fetch Group Container 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroupContainer_2_1()
+ * @generated
+ */
+ public static final EClass XML_FETCH_GROUP_CONTAINER_21 = eINSTANCE.getXmlFetchGroupContainer_2_1();
+
+ /**
+ * The meta object literal for the '<em><b>Fetch Groups</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EReference XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS = eINSTANCE.getXmlFetchGroupContainer_2_1_FetchGroups();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1 <em>Xml Mapped Superclass 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlMappedSuperclass_2_1()
+ * @generated
+ */
+ public static final EClass XML_MAPPED_SUPERCLASS_21 = eINSTANCE.getXmlMappedSuperclass_2_1();
+
+ /**
+ * The meta object literal for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EReference XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS = eINSTANCE.getXmlMappedSuperclass_2_1_SqlResultSetMappings();
+
+ /**
+ * The meta object literal for the '<em><b>Query Redirectors</b></em>' containment reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EReference XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS = eINSTANCE.getXmlMappedSuperclass_2_1_QueryRedirectors();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1 <em>Xml Return Insert 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlReturnInsert_2_1()
+ * @generated
+ */
+ public static final EClass XML_RETURN_INSERT_21 = eINSTANCE.getXmlReturnInsert_2_1();
+
+ /**
+ * The meta object literal for the '<em><b>Return Only</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EAttribute XML_RETURN_INSERT_21__RETURN_ONLY = eINSTANCE.getXmlReturnInsert_2_1_ReturnOnly();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1 <em>Xml Primary Key 21</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPrimaryKey_2_1()
+ * @generated
+ */
+ public static final EClass XML_PRIMARY_KEY_21 = eINSTANCE.getXmlPrimaryKey_2_1();
+
+ /**
+ * The meta object literal for the '<em><b>Cache Key Type</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EAttribute XML_PRIMARY_KEY_21__CACHE_KEY_TYPE = eINSTANCE.getXmlPrimaryKey_2_1_CacheKeyType();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1 <em>Cache Key Type 21</em>}' enum.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getCacheKeyType_2_1()
+ * @generated
+ */
+ public static final EEnum CACHE_KEY_TYPE_21 = eINSTANCE.getCacheKeyType_2_1();
+
+ }
+
+} //EclipseLinkOrmV2_1Package
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java
new file mode 100644
index 0000000000..e9ad3cf974
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1;
+
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlReturnInsert;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.XmlBasic_1_1;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Basic 21</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnInsert <em>Return Insert</em>}</li>
+ * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnUpdate <em>Return Update</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBasic_2_1()
+ * @model kind="class" interface="true" abstract="true"
+ * @generated
+ */
+public interface XmlBasic_2_1 extends XmlBasic_1_1
+{
+ /**
+ * Returns the value of the '<em><b>Return Insert</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Return Insert</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Return Insert</em>' containment reference.
+ * @see #setReturnInsert(XmlReturnInsert)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBasic_2_1_ReturnInsert()
+ * @model containment="true"
+ * @generated
+ */
+ XmlReturnInsert getReturnInsert();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnInsert <em>Return Insert</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Return Insert</em>' containment reference.
+ * @see #getReturnInsert()
+ * @generated
+ */
+ void setReturnInsert(XmlReturnInsert value);
+
+ /**
+ * Returns the value of the '<em><b>Return Update</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Return Update</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Return Update</em>' attribute.
+ * @see #setReturnUpdate(Boolean)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBasic_2_1_ReturnUpdate()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
+ * @generated
+ */
+ Boolean getReturnUpdate();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnUpdate <em>Return Update</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Return Update</em>' attribute.
+ * @see #getReturnUpdate()
+ * @generated
+ */
+ void setReturnUpdate(Boolean value);
+
+} // XmlBasic_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java
new file mode 100644
index 0000000000..a1a37a2a41
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1;
+
+import org.eclipse.jpt.core.resource.orm.XmlClassReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Entity 21</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getClassExtractor <em>Class Extractor</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntity_2_1()
+ * @model kind="class" interface="true" abstract="true"
+ * @generated
+ */
+public interface XmlEntity_2_1 extends XmlFetchGroupContainer_2_1
+{
+ /**
+ * Returns the value of the '<em><b>Class Extractor</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Class Extractor</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Class Extractor</em>' containment reference.
+ * @see #setClassExtractor(XmlClassReference)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntity_2_1_ClassExtractor()
+ * @model containment="true"
+ * @generated
+ */
+ XmlClassReference getClassExtractor();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getClassExtractor <em>Class Extractor</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Class Extractor</em>' containment reference.
+ * @see #getClassExtractor()
+ * @generated
+ */
+ void setClassExtractor(XmlClassReference value);
+
+} // XmlEntity_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchAttribute_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchAttribute_2_1.java
new file mode 100644
index 0000000000..3cdecf909f
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchAttribute_2_1.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1;
+
+import org.eclipse.jpt.core.resource.xml.JpaEObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Fetch Attribute 21</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchAttribute_2_1()
+ * @model kind="class" interface="true" abstract="true"
+ * @extends JpaEObject
+ * @generated
+ */
+public interface XmlFetchAttribute_2_1 extends JpaEObject
+{
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchAttribute_2_1_Name()
+ * @model
+ * @generated
+ */
+ String getName();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ void setName(String value);
+
+} // XmlFetchAttribute_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchGroupContainer_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchGroupContainer_2_1.java
new file mode 100644
index 0000000000..a5b68b608f
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchGroupContainer_2_1.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.jpt.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchGroup;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Fetch Group Container 21</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1#getFetchGroups <em>Fetch Groups</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroupContainer_2_1()
+ * @model kind="class" interface="true" abstract="true"
+ * @extends JpaEObject
+ * @generated
+ */
+public interface XmlFetchGroupContainer_2_1 extends JpaEObject
+{
+ /**
+ * Returns the value of the '<em><b>Fetch Groups</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchGroup}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Fetch Groups</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Fetch Groups</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroupContainer_2_1_FetchGroups()
+ * @model containment="true"
+ * @generated
+ */
+ EList<XmlFetchGroup> getFetchGroups();
+
+} // XmlFetchGroupContainer_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java
new file mode 100644
index 0000000000..c97b95c44f
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.jpt.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchAttribute;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Fetch Group 21</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getAttributes <em>Attributes</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroup_2_1()
+ * @model kind="class" interface="true" abstract="true"
+ * @extends JpaEObject
+ * @generated
+ */
+public interface XmlFetchGroup_2_1 extends JpaEObject
+{
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroup_2_1_Name()
+ * @model
+ * @generated
+ */
+ String getName();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ void setName(String value);
+
+ /**
+ * Returns the value of the '<em><b>Attributes</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchAttribute}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Attributes</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Attributes</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroup_2_1_Attributes()
+ * @model containment="true"
+ * @generated
+ */
+ EList<XmlFetchAttribute> getAttributes();
+
+} // XmlFetchGroup_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java
new file mode 100644
index 0000000000..f4c1359388
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.jpt.core.resource.orm.SqlResultSetMapping;
+import org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideContainer;
+import org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideContainer;
+import org.eclipse.jpt.core.resource.orm.XmlGeneratorContainer;
+import org.eclipse.jpt.core.resource.orm.XmlQueryContainer;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlQueryRedirectors;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Mapped Superclass 21</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}</li>
+ * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getQueryRedirectors <em>Query Redirectors</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlMappedSuperclass_2_1()
+ * @model kind="class" interface="true" abstract="true"
+ * @generated
+ */
+public interface XmlMappedSuperclass_2_1 extends XmlAssociationOverrideContainer, XmlAttributeOverrideContainer, XmlFetchGroupContainer_2_1, XmlGeneratorContainer, XmlQueryContainer, org.eclipse.jpt.eclipselink.core.resource.orm.XmlQueryContainer
+{
+ /**
+ * Returns the value of the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Sql Result Set Mappings</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Sql Result Set Mappings</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlMappedSuperclass_2_1_SqlResultSetMappings()
+ * @model containment="true"
+ * @generated
+ */
+ EList<SqlResultSetMapping> getSqlResultSetMappings();
+
+ /**
+ * Returns the value of the '<em><b>Query Redirectors</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Query Redirectors</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Query Redirectors</em>' containment reference.
+ * @see #setQueryRedirectors(XmlQueryRedirectors)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlMappedSuperclass_2_1_QueryRedirectors()
+ * @model containment="true"
+ * @generated
+ */
+ XmlQueryRedirectors getQueryRedirectors();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getQueryRedirectors <em>Query Redirectors</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Query Redirectors</em>' containment reference.
+ * @see #getQueryRedirectors()
+ * @generated
+ */
+ void setQueryRedirectors(XmlQueryRedirectors value);
+
+} // XmlMappedSuperclass_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlPrimaryKey_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlPrimaryKey_2_1.java
new file mode 100644
index 0000000000..fc37246908
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlPrimaryKey_2_1.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1;
+
+import org.eclipse.jpt.core.resource.xml.JpaEObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Primary Key 21</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1#getCacheKeyType <em>Cache Key Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPrimaryKey_2_1()
+ * @model kind="class" interface="true" abstract="true"
+ * @extends JpaEObject
+ * @generated
+ */
+public interface XmlPrimaryKey_2_1 extends JpaEObject
+{
+ /**
+ * Returns the value of the '<em><b>Cache Key Type</b></em>' attribute.
+ * The literals are from the enumeration {@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Cache Key Type</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Cache Key Type</em>' attribute.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1
+ * @see #setCacheKeyType(CacheKeyType_2_1)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPrimaryKey_2_1_CacheKeyType()
+ * @model
+ * @generated
+ */
+ CacheKeyType_2_1 getCacheKeyType();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1#getCacheKeyType <em>Cache Key Type</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Cache Key Type</em>' attribute.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1
+ * @see #getCacheKeyType()
+ * @generated
+ */
+ void setCacheKeyType(CacheKeyType_2_1 value);
+
+} // XmlPrimaryKey_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlReturnInsert_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlReturnInsert_2_1.java
new file mode 100644
index 0000000000..a5b43fdfa0
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlReturnInsert_2_1.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1;
+
+import org.eclipse.jpt.core.resource.xml.JpaEObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Return Insert 21</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1#getReturnOnly <em>Return Only</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlReturnInsert_2_1()
+ * @model kind="class" interface="true" abstract="true"
+ * @extends JpaEObject
+ * @generated
+ */
+public interface XmlReturnInsert_2_1 extends JpaEObject
+{
+ /**
+ * Returns the value of the '<em><b>Return Only</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Return Only</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Return Only</em>' attribute.
+ * @see #setReturnOnly(Boolean)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlReturnInsert_2_1_ReturnOnly()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
+ * @generated
+ */
+ Boolean getReturnOnly();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1#getReturnOnly <em>Return Only</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Return Only</em>' attribute.
+ * @see #getReturnOnly()
+ * @generated
+ */
+ void setReturnOnly(Boolean value);
+
+} // XmlReturnInsert_2_1

Back to the top