Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2011-07-25 07:59:37 -0400
committerkmoore2011-07-25 07:59:37 -0400
commit0c35e363a14cad5bbe29dc6ca599476ad7e323a8 (patch)
tree30fb96af2bd72468b9aa908eab23decdc10af971
parente07ae7a834cf5b60f26163d1a85cc7256783c883 (diff)
downloadwebtools.dali-0c35e363a14cad5bbe29dc6ca599476ad7e323a8.tar.gz
webtools.dali-0c35e363a14cad5bbe29dc6ca599476ad7e323a8.tar.xz
webtools.dali-0c35e363a14cad5bbe29dc6ca599476ad7e323a8.zip
updated eclipselink-orm schema for tenant-discriminator-column mistake - bug 352676
-rw-r--r--common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_3.xsd24
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore14
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java48
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java54
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java54
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminatorColumn.java (renamed from jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminator.java)28
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java106
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminatorColumn_2_3.java (renamed from jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminator_2_3.java)10
13 files changed, 192 insertions, 196 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_3.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_3.xsd
index 3fa1b482d6..ebbc74c604 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_3.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_3.xsd
@@ -652,7 +652,7 @@
minOccurs="0"/>
<xsd:element name="access-methods" type="orm:access-methods"
minOccurs="0"/>
- <xsd:element name="tenant-discriminator" type="orm:tenant-discriminator"
+ <xsd:element name="tenant-discriminator-column" type="orm:tenant-discriminator-column"
minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="converter" type="orm:converter" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="type-converter" type="orm:type-converter" minOccurs="0" maxOccurs="unbounded"/>
@@ -818,7 +818,7 @@
minOccurs="0"/>
<xsd:element name="cascade-persist" type="orm:emptyType"
minOccurs="0"/>
- <xsd:element name="tenant-discriminator" type="orm:tenant-discriminator"
+ <xsd:element name="tenant-discriminator-column" type="orm:tenant-discriminator-column"
minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="entity-listeners" type="orm:entity-listeners"
minOccurs="0"/>
@@ -2217,8 +2217,6 @@
<xsd:element name="batch-fetch" type="orm:batch-fetch" minOccurs="0"/>
<xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="access-methods" type="orm:access-methods" minOccurs="0"/>
-
-
<xsd:element name="noncacheable" type="orm:emptyType" minOccurs="0"/>
<xsd:group ref="orm:partitioning-group"/>
</xsd:sequence>
@@ -3312,7 +3310,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="tenant-discriminator" type="orm:tenant-discriminator" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="tenant-discriminator-column" type="orm:tenant-discriminator-column" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="type" type="orm:multitenant-type"/>
</xsd:complexType>
@@ -5003,23 +5001,22 @@
<!-- **************************************************** -->
- <xsd:complexType name="tenant-discriminator">
+ <xsd:complexType name="tenant-discriminator-column">
<xsd:annotation>
<xsd:documentation>
-
@Target({})
@Retention(RUNTIME)
- public @interface TenantDiscriminator {
+ public @interface TenantDiscriminatorColumn {
/**
- * (Optional) The name of column to be used for the discriminator.
+ * (Optional) The name of column to be used for the tenant discriminator.
*/
- String name() default "eclipselink.tenant-id";
+ String name() default "TENANT_ID";
/**
* (Optional) The name of the context property to apply to the
* tenant discriminator column.
*/
- String contextProperty() default "TENANT_ID";
+ String contextProperty() default "eclipselink.tenant-id";
/**
* (Optional) The type of object/column to use as a class discriminator.
@@ -5053,15 +5050,14 @@
*/
boolean primaryKey() default false;
}
-
</xsd:documentation>
</xsd:annotation>
<xsd:attribute name="name" type="xsd:string"/>
- <xsd:attribute name="column-name" type="xsd:string"/>
+ <xsd:attribute name="context-property" type="xsd:string"/>
<xsd:attribute name="discriminator-type" type="orm:discriminator-type"/>
<xsd:attribute name="column-definition" type="xsd:string"/>
- <xsd:attribute name="table" type="xsd:string"/>
<xsd:attribute name="length" type="xsd:int"/>
+ <xsd:attribute name="table" type="xsd:string"/>
<xsd:attribute name="primary-key" type="xsd:boolean"/>
</xsd:complexType>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel
index 02a5d7593a..08fb91cb63 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel
@@ -250,7 +250,7 @@
<genClasses ecoreClass="eclipselink_orm.ecore#//XmlStructure"/>
<genClasses ecoreClass="eclipselink_orm.ecore#//XmlTable"/>
<genClasses ecoreClass="eclipselink_orm.ecore#//XmlTableGenerator"/>
- <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTenantDiscriminator"/>
+ <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTenantDiscriminatorColumn"/>
<genClasses ecoreClass="eclipselink_orm.ecore#//XmlTimeOfDay">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/hour"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/minute"/>
@@ -552,7 +552,7 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntity_2_3/struct"/>
</genClasses>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/tenantDiscriminators"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/tenantDiscriminatorColumns"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/namedStoredFunctionQueries"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/namedPlsqlStoredFunctionQueries"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/namedPlsqlStoredProcedureQueries"/>
@@ -580,7 +580,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlNamedStoredFunctionQuery_2_3/name"/>
</genClasses>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlPersistenceUnitDefaults_2_3">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlPersistenceUnitDefaults_2_3/tenantDiscriminators"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlPersistenceUnitDefaults_2_3/tenantDiscriminatorColumns"/>
</genClasses>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlPlsqlRecord_2_3">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlPlsqlRecord_2_3/name"/>
@@ -591,8 +591,8 @@
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlStruct_2_3">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlStruct_2_3/name"/>
</genClasses>
- <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlTenantDiscriminator_2_3">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlTenantDiscriminator_2_3/name"/>
+ <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlTenantDiscriminatorColumn_2_3">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlTenantDiscriminatorColumn_2_3/name"/>
</genClasses>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlStructure_2_3"/>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlElementCollection_2_3">
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore
index 90d146e90e..7dbaa6d7bb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore
@@ -252,7 +252,7 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlStructure" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping #//v2_3/XmlStructure_2_3"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlTable" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlTable #//v2_2/XmlTable_2_2"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlTableGenerator" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlTableGenerator #//v2_2/XmlTableGenerator_2_2"/>
- <eClassifiers xsi:type="ecore:EClass" name="XmlTenantDiscriminator" eSuperTypes="#//v2_3/XmlTenantDiscriminator_2_3"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlTenantDiscriminatorColumn" eSuperTypes="#//v2_3/XmlTenantDiscriminatorColumn_2_3"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlTimeOfDay">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="hour" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="minute" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
@@ -694,8 +694,8 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings_2_3" abstract="true"
interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminators"
- upperBound="-1" eType="#//v2_3/XmlTenantDiscriminator_2_3" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminatorColumns"
+ upperBound="-1" eType="#//v2_3/XmlTenantDiscriminatorColumn_2_3" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredFunctionQueries"
upperBound="-1" eType="#//v2_3/XmlNamedStoredFunctionQuery_2_3" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredFunctionQueries"
@@ -740,8 +740,8 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults_2_3" abstract="true"
interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminators"
- upperBound="-1" eType="#//v2_3/XmlTenantDiscriminator_2_3" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminatorColumns"
+ upperBound="-1" eType="#//v2_3/XmlTenantDiscriminatorColumn_2_3" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlPlsqlRecord_2_3" abstract="true"
interface="true">
@@ -754,8 +754,8 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlStruct_2_3" abstract="true" interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlTenantDiscriminator_2_3" abstract="true"
- interface="true">
+ <eClassifiers xsi:type="ecore:EClass" name="XmlTenantDiscriminatorColumn_2_3"
+ abstract="true" interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlStructure_2_3" abstract="true"
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
index e26eed3b78..164897b06a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
@@ -144,7 +144,7 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
case EclipseLinkOrmPackage.XML_STRUCTURE: return (EObject)createXmlStructure();
case EclipseLinkOrmPackage.XML_TABLE: return (EObject)createXmlTable();
case EclipseLinkOrmPackage.XML_TABLE_GENERATOR: return (EObject)createXmlTableGenerator();
- case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR: return (EObject)createXmlTenantDiscriminator();
+ case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN: return (EObject)createXmlTenantDiscriminatorColumn();
case EclipseLinkOrmPackage.XML_TIME_OF_DAY: return (EObject)createXmlTimeOfDay();
case EclipseLinkOrmPackage.XML_TRANSFORMATION: return (EObject)createXmlTransformation();
case EclipseLinkOrmPackage.XML_TRANSIENT: return (EObject)createXmlTransient();
@@ -826,10 +826,10 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
* <!-- end-user-doc -->
* @generated
*/
- public XmlTenantDiscriminator createXmlTenantDiscriminator()
+ public XmlTenantDiscriminatorColumn createXmlTenantDiscriminatorColumn()
{
- XmlTenantDiscriminator xmlTenantDiscriminator = new XmlTenantDiscriminator();
- return xmlTenantDiscriminator;
+ XmlTenantDiscriminatorColumn xmlTenantDiscriminatorColumn = new XmlTenantDiscriminatorColumn();
+ return xmlTenantDiscriminatorColumn;
}
/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
index 3b43ee9aa5..e992ccc54e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
@@ -2944,13 +2944,13 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_ENTITY_MAPPINGS__UNION_PARTITIONING = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 8;
/**
- * The feature id for the '<em><b>Tenant Discriminators</b></em>' containment reference list.
+ * The feature id for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 9;
+ public static final int XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 9;
/**
* The feature id for the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
* <!-- begin-user-doc -->
@@ -5700,13 +5700,13 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Tenant Discriminators</b></em>' containment reference list.
+ * The feature id for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT + 1;
+ public static final int XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT + 1;
/**
* The number of structural features of the '<em>Xml Persistence Unit Defaults</em>' class.
* <!-- begin-user-doc -->
@@ -6476,14 +6476,14 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_TABLE_GENERATOR_FEATURE_COUNT = OrmPackage.XML_TABLE_GENERATOR_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator <em>Xml Tenant Discriminator</em>}' class.
+ * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn <em>Xml Tenant Discriminator Column</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminator()
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn()
* @generated
*/
- public static final int XML_TENANT_DISCRIMINATOR = 78;
+ public static final int XML_TENANT_DISCRIMINATOR_COLUMN = 78;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -6491,15 +6491,15 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_TENANT_DISCRIMINATOR__NAME = EclipseLinkOrmV2_3Package.XML_TENANT_DISCRIMINATOR_23__NAME;
+ public static final int XML_TENANT_DISCRIMINATOR_COLUMN__NAME = EclipseLinkOrmV2_3Package.XML_TENANT_DISCRIMINATOR_COLUMN_23__NAME;
/**
- * The number of structural features of the '<em>Xml Tenant Discriminator</em>' class.
+ * The number of structural features of the '<em>Xml Tenant Discriminator Column</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_TENANT_DISCRIMINATOR_FEATURE_COUNT = EclipseLinkOrmV2_3Package.XML_TENANT_DISCRIMINATOR_23_FEATURE_COUNT + 0;
+ public static final int XML_TENANT_DISCRIMINATOR_COLUMN_FEATURE_COUNT = EclipseLinkOrmV2_3Package.XML_TENANT_DISCRIMINATOR_COLUMN_23_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Hour</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -7454,7 +7454,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
- private EClass xmlTenantDiscriminatorEClass = null;
+ private EClass xmlTenantDiscriminatorColumnEClass = null;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -9766,16 +9766,16 @@ public class EclipseLinkOrmPackage extends EPackageImpl
}
/**
- * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator <em>Xml Tenant Discriminator</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn <em>Xml Tenant Discriminator Column</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Xml Tenant Discriminator</em>'.
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator
+ * @return the meta object for class '<em>Xml Tenant Discriminator Column</em>'.
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn
* @generated
*/
- public EClass getXmlTenantDiscriminator()
+ public EClass getXmlTenantDiscriminatorColumn()
{
- return xmlTenantDiscriminatorEClass;
+ return xmlTenantDiscriminatorColumnEClass;
}
/**
@@ -10433,7 +10433,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
xmlTableGeneratorEClass = createEClass(XML_TABLE_GENERATOR);
- xmlTenantDiscriminatorEClass = createEClass(XML_TENANT_DISCRIMINATOR);
+ xmlTenantDiscriminatorColumnEClass = createEClass(XML_TENANT_DISCRIMINATOR_COLUMN);
xmlTimeOfDayEClass = createEClass(XML_TIME_OF_DAY);
createEAttribute(xmlTimeOfDayEClass, XML_TIME_OF_DAY__HOUR);
@@ -10658,7 +10658,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
xmlTableEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlTable_2_2());
xmlTableGeneratorEClass.getESuperTypes().add(theOrmPackage.getXmlTableGenerator());
xmlTableGeneratorEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlTableGenerator_2_2());
- xmlTenantDiscriminatorEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlTenantDiscriminator_2_3());
+ xmlTenantDiscriminatorColumnEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlTenantDiscriminatorColumn_2_3());
xmlTransformationEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping());
xmlTransformationEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlTransformation_2_1());
xmlTransformationEClass.getESuperTypes().add(this.getXmlAttributeMapping());
@@ -10918,7 +10918,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
initEClass(xmlTableGeneratorEClass, XmlTableGenerator.class, "XmlTableGenerator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEClass(xmlTenantDiscriminatorEClass, XmlTenantDiscriminator.class, "XmlTenantDiscriminator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEClass(xmlTenantDiscriminatorColumnEClass, XmlTenantDiscriminatorColumn.class, "XmlTenantDiscriminatorColumn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(xmlTimeOfDayEClass, XmlTimeOfDay.class, "XmlTimeOfDay", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlTimeOfDay_Hour(), theXMLTypePackage.getIntObject(), "hour", null, 0, 1, XmlTimeOfDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -12377,14 +12377,14 @@ public class EclipseLinkOrmPackage extends EPackageImpl
public static final EClass XML_TABLE_GENERATOR = eINSTANCE.getXmlTableGenerator();
/**
- * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator <em>Xml Tenant Discriminator</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn <em>Xml Tenant Discriminator Column</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminator()
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn()
* @generated
*/
- public static final EClass XML_TENANT_DISCRIMINATOR = eINSTANCE.getXmlTenantDiscriminator();
+ public static final EClass XML_TENANT_DISCRIMINATOR_COLUMN = eINSTANCE.getXmlTenantDiscriminatorColumn();
/**
* The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay <em>Xml Time Of Day</em>}' class.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java
index 404c163daa..db82fc24cc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java
@@ -50,7 +50,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStore
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -168,14 +168,14 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
protected EList<XmlUnionPartitioning_2_2> unionPartitioning;
/**
- * The cached value of the '{@link #getTenantDiscriminators() <em>Tenant Discriminators</em>}' containment reference list.
+ * The cached value of the '{@link #getTenantDiscriminatorColumns() <em>Tenant Discriminator Columns</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getTenantDiscriminators()
+ * @see #getTenantDiscriminatorColumns()
* @generated
* @ordered
*/
- protected EList<XmlTenantDiscriminator_2_3> tenantDiscriminators;
+ protected EList<XmlTenantDiscriminatorColumn_2_3> tenantDiscriminatorColumns;
/**
* The cached value of the '{@link #getNamedStoredFunctionQueries() <em>Named Stored Function Queries</em>}' containment reference list.
@@ -543,26 +543,26 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
}
/**
- * Returns the value of the '<em><b>Tenant Discriminators</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3}.
+ * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Tenant Discriminators</em>' containment reference list isn't clear,
+ * If the meaning of the '<em>Tenant Discriminator Columns</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>Tenant Discriminators</em>' containment reference list.
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_3_TenantDiscriminators()
+ * @return the value of the '<em>Tenant Discriminator Columns</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_3_TenantDiscriminatorColumns()
* @model containment="true"
* @generated
*/
- public EList<XmlTenantDiscriminator_2_3> getTenantDiscriminators()
+ public EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns()
{
- if (tenantDiscriminators == null)
+ if (tenantDiscriminatorColumns == null)
{
- tenantDiscriminators = new EObjectContainmentEList<XmlTenantDiscriminator_2_3>(XmlTenantDiscriminator_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS);
+ tenantDiscriminatorColumns = new EObjectContainmentEList<XmlTenantDiscriminatorColumn_2_3>(XmlTenantDiscriminatorColumn_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS);
}
- return tenantDiscriminators;
+ return tenantDiscriminatorColumns;
}
/**
@@ -823,8 +823,8 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
return ((InternalEList<?>)getHashPartitioning()).basicRemove(otherEnd, msgs);
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING:
return ((InternalEList<?>)getUnionPartitioning()).basicRemove(otherEnd, msgs);
- case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS:
- return ((InternalEList<?>)getTenantDiscriminators()).basicRemove(otherEnd, msgs);
+ case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS:
+ return ((InternalEList<?>)getTenantDiscriminatorColumns()).basicRemove(otherEnd, msgs);
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES:
return ((InternalEList<?>)getNamedStoredFunctionQueries()).basicRemove(otherEnd, msgs);
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
@@ -877,8 +877,8 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
return getHashPartitioning();
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING:
return getUnionPartitioning();
- case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS:
- return getTenantDiscriminators();
+ case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS:
+ return getTenantDiscriminatorColumns();
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES:
return getNamedStoredFunctionQueries();
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
@@ -949,9 +949,9 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
getUnionPartitioning().clear();
getUnionPartitioning().addAll((Collection<? extends XmlUnionPartitioning_2_2>)newValue);
return;
- case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS:
- getTenantDiscriminators().clear();
- getTenantDiscriminators().addAll((Collection<? extends XmlTenantDiscriminator_2_3>)newValue);
+ case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS:
+ getTenantDiscriminatorColumns().clear();
+ getTenantDiscriminatorColumns().addAll((Collection<? extends XmlTenantDiscriminatorColumn_2_3>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES:
getNamedStoredFunctionQueries().clear();
@@ -1034,8 +1034,8 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING:
getUnionPartitioning().clear();
return;
- case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS:
- getTenantDiscriminators().clear();
+ case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS:
+ getTenantDiscriminatorColumns().clear();
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES:
getNamedStoredFunctionQueries().clear();
@@ -1099,8 +1099,8 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
return hashPartitioning != null && !hashPartitioning.isEmpty();
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING:
return unionPartitioning != null && !unionPartitioning.isEmpty();
- case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS:
- return tenantDiscriminators != null && !tenantDiscriminators.isEmpty();
+ case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS:
+ return tenantDiscriminatorColumns != null && !tenantDiscriminatorColumns.isEmpty();
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES:
return namedStoredFunctionQueries != null && !namedStoredFunctionQueries.isEmpty();
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
@@ -1167,7 +1167,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
{
switch (derivedFeatureID)
{
- case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATORS;
+ case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_STORED_FUNCTION_QUERIES;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES;
@@ -1240,7 +1240,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
{
switch (baseFeatureID)
{
- case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATORS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS;
+ case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS;
case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_STORED_FUNCTION_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES;
case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES;
case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES;
@@ -1329,7 +1329,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
buildCatalogTranslator(),
buildAccessTranslator(),
buildAccessMethodsTranslator(),
- XmlTenantDiscriminator.buildTranslator(EclipseLink2_3.TENANT_DISCRIMINATOR, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntityMappings_2_3_TenantDiscriminators()),
+ XmlTenantDiscriminatorColumn.buildTranslator(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntityMappings_2_3_TenantDiscriminatorColumns()),
XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_Converters()),
XmlTypeConverter.buildTranslator(EclipseLink.TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_TypeConverters()),
XmlObjectTypeConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_ObjectTypeConverters()),
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java
index 238c15a4bd..9588a15cca 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java
@@ -27,7 +27,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnit
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -62,14 +62,14 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc
protected XmlAccessMethods accessMethods;
/**
- * The cached value of the '{@link #getTenantDiscriminators() <em>Tenant Discriminators</em>}' containment reference list.
+ * The cached value of the '{@link #getTenantDiscriminatorColumns() <em>Tenant Discriminator Columns</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getTenantDiscriminators()
+ * @see #getTenantDiscriminatorColumns()
* @generated
* @ordered
*/
- protected EList<XmlTenantDiscriminator_2_3> tenantDiscriminators;
+ protected EList<XmlTenantDiscriminatorColumn_2_3> tenantDiscriminatorColumns;
/**
* <!-- begin-user-doc -->
@@ -153,26 +153,26 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc
}
/**
- * Returns the value of the '<em><b>Tenant Discriminators</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3}.
+ * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Tenant Discriminators</em>' containment reference list isn't clear,
+ * If the meaning of the '<em>Tenant Discriminator Columns</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>Tenant Discriminators</em>' containment reference list.
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitDefaults_2_3_TenantDiscriminators()
+ * @return the value of the '<em>Tenant Discriminator Columns</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns()
* @model containment="true"
* @generated
*/
- public EList<XmlTenantDiscriminator_2_3> getTenantDiscriminators()
+ public EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns()
{
- if (tenantDiscriminators == null)
+ if (tenantDiscriminatorColumns == null)
{
- tenantDiscriminators = new EObjectContainmentEList<XmlTenantDiscriminator_2_3>(XmlTenantDiscriminator_2_3.class, this, EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS);
+ tenantDiscriminatorColumns = new EObjectContainmentEList<XmlTenantDiscriminatorColumn_2_3>(XmlTenantDiscriminatorColumn_2_3.class, this, EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS);
}
- return tenantDiscriminators;
+ return tenantDiscriminatorColumns;
}
/**
@@ -187,8 +187,8 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc
{
case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS:
return basicSetAccessMethods(null, msgs);
- case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS:
- return ((InternalEList<?>)getTenantDiscriminators()).basicRemove(otherEnd, msgs);
+ case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS:
+ return ((InternalEList<?>)getTenantDiscriminatorColumns()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -205,8 +205,8 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc
{
case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS:
return getAccessMethods();
- case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS:
- return getTenantDiscriminators();
+ case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS:
+ return getTenantDiscriminatorColumns();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -225,9 +225,9 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc
case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS:
setAccessMethods((XmlAccessMethods)newValue);
return;
- case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS:
- getTenantDiscriminators().clear();
- getTenantDiscriminators().addAll((Collection<? extends XmlTenantDiscriminator_2_3>)newValue);
+ case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS:
+ getTenantDiscriminatorColumns().clear();
+ getTenantDiscriminatorColumns().addAll((Collection<? extends XmlTenantDiscriminatorColumn_2_3>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -246,8 +246,8 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc
case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS:
setAccessMethods((XmlAccessMethods)null);
return;
- case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS:
- getTenantDiscriminators().clear();
+ case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS:
+ getTenantDiscriminatorColumns().clear();
return;
}
super.eUnset(featureID);
@@ -265,8 +265,8 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc
{
case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS:
return accessMethods != null;
- case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS:
- return tenantDiscriminators != null && !tenantDiscriminators.isEmpty();
+ case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS:
+ return tenantDiscriminatorColumns != null && !tenantDiscriminatorColumns.isEmpty();
}
return super.eIsSet(featureID);
}
@@ -298,7 +298,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc
{
switch (derivedFeatureID)
{
- case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS: return EclipseLinkOrmV2_3Package.XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATORS;
+ case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS: return EclipseLinkOrmV2_3Package.XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS;
default: return -1;
}
}
@@ -332,7 +332,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc
{
switch (baseFeatureID)
{
- case EclipseLinkOrmV2_3Package.XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATORS: return EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS;
+ case EclipseLinkOrmV2_3Package.XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS: return EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS;
default: return -1;
}
}
@@ -355,7 +355,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc
buildAccessTranslator(),
buildAccessMethodsTranslator(),
buildCascadePersistTranslator(),
- XmlTenantDiscriminator.buildTranslator(EclipseLink2_3.TENANT_DISCRIMINATOR, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlPersistenceUnitDefaults_2_3_TenantDiscriminators()),
+ XmlTenantDiscriminatorColumn.buildTranslator(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns()),
buildEntityListenersTranslator()
};
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminatorColumn.java
index b4d6ccdd55..56bf34a6c6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminatorColumn.java
@@ -19,7 +19,7 @@ import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -28,11 +28,11 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* <!-- end-user-doc -->
*
*
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminator()
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn()
* @model kind="class"
* @generated
*/
-public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTenantDiscriminator_2_3
+public class XmlTenantDiscriminatorColumn extends AbstractJpaEObject implements XmlTenantDiscriminatorColumn_2_3
{
/**
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -58,7 +58,7 @@ public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTen
* <!-- end-user-doc -->
* @generated
*/
- protected XmlTenantDiscriminator()
+ protected XmlTenantDiscriminatorColumn()
{
super();
}
@@ -71,7 +71,7 @@ public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTen
@Override
protected EClass eStaticClass()
{
- return EclipseLinkOrmPackage.Literals.XML_TENANT_DISCRIMINATOR;
+ return EclipseLinkOrmPackage.Literals.XML_TENANT_DISCRIMINATOR_COLUMN;
}
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
@@ -83,7 +83,7 @@ public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTen
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminator_2_3_Name()
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn_2_3_Name()
* @model dataType="org.eclipse.emf.ecore.xml.type.String"
* @generated
*/
@@ -93,7 +93,7 @@ public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTen
}
/**
- * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
@@ -105,7 +105,7 @@ public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTen
String oldName = name;
name = newName;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR__NAME, oldName, name));
+ eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__NAME, oldName, name));
}
/**
@@ -118,7 +118,7 @@ public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTen
{
switch (featureID)
{
- case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR__NAME:
+ case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__NAME:
return getName();
}
return super.eGet(featureID, resolve, coreType);
@@ -134,7 +134,7 @@ public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTen
{
switch (featureID)
{
- case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR__NAME:
+ case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__NAME:
setName((String)newValue);
return;
}
@@ -151,7 +151,7 @@ public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTen
{
switch (featureID)
{
- case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR__NAME:
+ case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__NAME:
setName(NAME_EDEFAULT);
return;
}
@@ -168,7 +168,7 @@ public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTen
{
switch (featureID)
{
- case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR__NAME:
+ case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
}
return super.eIsSet(featureID);
@@ -197,7 +197,7 @@ public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTen
return new SimpleTranslator(
elementName,
structuralFeature,
- EclipseLinkOrmPackage.eINSTANCE.getXmlTenantDiscriminator(),
+ EclipseLinkOrmPackage.eINSTANCE.getXmlTenantDiscriminatorColumn(),
buildTranslatorChildren());
}
@@ -208,6 +208,6 @@ public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTen
}
protected static Translator buildNameTranslator() {
- return new Translator(EclipseLink2_3.TENANT_DISCRIMINATOR__NAME, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlTenantDiscriminator_2_3_Name(), Translator.DOM_ATTRIBUTE);
+ return new Translator(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__NAME, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlTenantDiscriminatorColumn_2_3_Name(), Translator.DOM_ATTRIBUTE);
}
} // XmlTenantDiscriminator
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java
index 7202ec9323..9a373a47e7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java
@@ -41,8 +41,8 @@ public interface EclipseLink2_3
String STRUCT = "struct";
String STRUCT__NAME = "name";
String STRUCTURE = "structure";
- String TENANT_DISCRIMINATOR = "tenant-discriminator";
- String TENANT_DISCRIMINATOR__NAME = "name";
+ String TENANT_DISCRIMINATOR_COLUMN = "tenant-discriminator-column";
+ String TENANT_DISCRIMINATOR_COLUMN__NAME = "name";
} \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java
index fdf591e3d8..9eff76397d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java
@@ -202,16 +202,6 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
public static final int XML_STRUCT_23 = 13;
/**
- * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3 <em>Xml Tenant Discriminator 23</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminator_2_3()
- * @generated
- */
- public static final int XML_TENANT_DISCRIMINATOR_23 = 14;
-
- /**
* The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3 <em>Xml Attributes 23</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -386,13 +376,13 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
public static final int XML_ENTITY_23_FEATURE_COUNT = 7;
/**
- * The feature id for the '<em><b>Tenant Discriminators</b></em>' containment reference list.
+ * The feature id for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATORS = 0;
+ public static final int XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS = 0;
/**
* The feature id for the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
@@ -584,13 +574,13 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
public static final int XML_NAMED_STORED_FUNCTION_QUERY_23_FEATURE_COUNT = 1;
/**
- * The feature id for the '<em><b>Tenant Discriminators</b></em>' containment reference list.
+ * The feature id for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATORS = 0;
+ public static final int XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS = 0;
/**
* The number of structural features of the '<em>Xml Persistence Unit Defaults 23</em>' class.
@@ -656,22 +646,32 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
public static final int XML_STRUCT_23_FEATURE_COUNT = 1;
/**
+ * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 <em>Xml Tenant Discriminator Column 23</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3()
+ * @generated
+ */
+ public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23 = 14;
+
+ /**
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_TENANT_DISCRIMINATOR_23__NAME = 0;
+ public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23__NAME = 0;
/**
- * The number of structural features of the '<em>Xml Tenant Discriminator 23</em>' class.
+ * The number of structural features of the '<em>Xml Tenant Discriminator Column 23</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_TENANT_DISCRIMINATOR_23_FEATURE_COUNT = 1;
+ public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23_FEATURE_COUNT = 1;
/**
* The number of structural features of the '<em>Xml Structure 23</em>' class.
@@ -809,7 +809,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
- private EClass xmlTenantDiscriminator_2_3EClass = null;
+ private EClass xmlTenantDiscriminatorColumn_2_3EClass = null;
/**
* <!-- begin-user-doc -->
@@ -1340,15 +1340,15 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminators <em>Tenant Discriminators</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminatorColumns <em>Tenant Discriminator Columns</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Tenant Discriminators</em>'.
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminators()
+ * @return the meta object for the containment reference list '<em>Tenant Discriminator Columns</em>'.
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminatorColumns()
* @see #getXmlEntityMappings_2_3()
* @generated
*/
- public EReference getXmlEntityMappings_2_3_TenantDiscriminators()
+ public EReference getXmlEntityMappings_2_3_TenantDiscriminatorColumns()
{
return (EReference)xmlEntityMappings_2_3EClass.getEStructuralFeatures().get(0);
}
@@ -1444,15 +1444,15 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminators <em>Tenant Discriminators</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminatorColumns <em>Tenant Discriminator Columns</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Tenant Discriminators</em>'.
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminators()
+ * @return the meta object for the containment reference list '<em>Tenant Discriminator Columns</em>'.
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminatorColumns()
* @see #getXmlPersistenceUnitDefaults_2_3()
* @generated
*/
- public EReference getXmlPersistenceUnitDefaults_2_3_TenantDiscriminators()
+ public EReference getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns()
{
return (EReference)xmlPersistenceUnitDefaults_2_3EClass.getEStructuralFeatures().get(0);
}
@@ -1546,31 +1546,31 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
/**
- * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3 <em>Xml Tenant Discriminator 23</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 <em>Xml Tenant Discriminator Column 23</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Xml Tenant Discriminator 23</em>'.
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3
+ * @return the meta object for class '<em>Xml Tenant Discriminator Column 23</em>'.
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3
* @generated
*/
- public EClass getXmlTenantDiscriminator_2_3()
+ public EClass getXmlTenantDiscriminatorColumn_2_3()
{
- return xmlTenantDiscriminator_2_3EClass;
+ return xmlTenantDiscriminatorColumn_2_3EClass;
}
/**
- * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3#getName()
- * @see #getXmlTenantDiscriminator_2_3()
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getName()
+ * @see #getXmlTenantDiscriminatorColumn_2_3()
* @generated
*/
- public EAttribute getXmlTenantDiscriminator_2_3_Name()
+ public EAttribute getXmlTenantDiscriminatorColumn_2_3_Name()
{
- return (EAttribute)xmlTenantDiscriminator_2_3EClass.getEStructuralFeatures().get(0);
+ return (EAttribute)xmlTenantDiscriminatorColumn_2_3EClass.getEStructuralFeatures().get(0);
}
@@ -1742,7 +1742,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
createEReference(xmlEntity_2_3EClass, XML_ENTITY_23__STRUCT);
xmlEntityMappings_2_3EClass = createEClass(XML_ENTITY_MAPPINGS_23);
- createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATORS);
+ createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS);
createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__NAMED_STORED_FUNCTION_QUERIES);
createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES);
createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES);
@@ -1770,7 +1770,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
createEAttribute(xmlNamedStoredFunctionQuery_2_3EClass, XML_NAMED_STORED_FUNCTION_QUERY_23__NAME);
xmlPersistenceUnitDefaults_2_3EClass = createEClass(XML_PERSISTENCE_UNIT_DEFAULTS_23);
- createEReference(xmlPersistenceUnitDefaults_2_3EClass, XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATORS);
+ createEReference(xmlPersistenceUnitDefaults_2_3EClass, XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS);
xmlPlsqlRecord_2_3EClass = createEClass(XML_PLSQL_RECORD_23);
createEAttribute(xmlPlsqlRecord_2_3EClass, XML_PLSQL_RECORD_23__NAME);
@@ -1781,8 +1781,8 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
xmlStruct_2_3EClass = createEClass(XML_STRUCT_23);
createEAttribute(xmlStruct_2_3EClass, XML_STRUCT_23__NAME);
- xmlTenantDiscriminator_2_3EClass = createEClass(XML_TENANT_DISCRIMINATOR_23);
- createEAttribute(xmlTenantDiscriminator_2_3EClass, XML_TENANT_DISCRIMINATOR_23__NAME);
+ xmlTenantDiscriminatorColumn_2_3EClass = createEClass(XML_TENANT_DISCRIMINATOR_COLUMN_23);
+ createEAttribute(xmlTenantDiscriminatorColumn_2_3EClass, XML_TENANT_DISCRIMINATOR_COLUMN_23__NAME);
xmlStructure_2_3EClass = createEClass(XML_STRUCTURE_23);
@@ -1849,7 +1849,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
initEReference(getXmlEntity_2_3_Struct(), this.getXmlStruct_2_3(), null, "struct", null, 0, 1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlEntityMappings_2_3EClass, XmlEntityMappings_2_3.class, "XmlEntityMappings_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlEntityMappings_2_3_TenantDiscriminators(), this.getXmlTenantDiscriminator_2_3(), null, "tenantDiscriminators", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_2_3_TenantDiscriminatorColumns(), this.getXmlTenantDiscriminatorColumn_2_3(), null, "tenantDiscriminatorColumns", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntityMappings_2_3_NamedStoredFunctionQueries(), this.getXmlNamedStoredFunctionQuery_2_3(), null, "namedStoredFunctionQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntityMappings_2_3_NamedPlsqlStoredFunctionQueries(), this.getXmlNamedPlsqlStoredFunctionQuery_2_3(), null, "namedPlsqlStoredFunctionQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntityMappings_2_3_NamedPlsqlStoredProcedureQueries(), this.getXmlNamedPlsqlStoredProcedureQuery_2_3(), null, "namedPlsqlStoredProcedureQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1877,7 +1877,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
initEAttribute(getXmlNamedStoredFunctionQuery_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlNamedStoredFunctionQuery_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlPersistenceUnitDefaults_2_3EClass, XmlPersistenceUnitDefaults_2_3.class, "XmlPersistenceUnitDefaults_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlPersistenceUnitDefaults_2_3_TenantDiscriminators(), this.getXmlTenantDiscriminator_2_3(), null, "tenantDiscriminators", null, 0, -1, XmlPersistenceUnitDefaults_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns(), this.getXmlTenantDiscriminatorColumn_2_3(), null, "tenantDiscriminatorColumns", null, 0, -1, XmlPersistenceUnitDefaults_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlPlsqlRecord_2_3EClass, XmlPlsqlRecord_2_3.class, "XmlPlsqlRecord_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlPlsqlRecord_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlPlsqlRecord_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1888,8 +1888,8 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
initEClass(xmlStruct_2_3EClass, XmlStruct_2_3.class, "XmlStruct_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlStruct_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlStruct_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(xmlTenantDiscriminator_2_3EClass, XmlTenantDiscriminator_2_3.class, "XmlTenantDiscriminator_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getXmlTenantDiscriminator_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlTenantDiscriminator_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(xmlTenantDiscriminatorColumn_2_3EClass, XmlTenantDiscriminatorColumn_2_3.class, "XmlTenantDiscriminatorColumn_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlTenantDiscriminatorColumn_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlTenantDiscriminatorColumn_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlStructure_2_3EClass, XmlStructure_2_3.class, "XmlStructure_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -2157,12 +2157,12 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
public static final EClass XML_ENTITY_MAPPINGS_23 = eINSTANCE.getXmlEntityMappings_2_3();
/**
- * The meta object literal for the '<em><b>Tenant Discriminators</b></em>' containment reference list feature.
+ * The meta object literal for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public static final EReference XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATORS = eINSTANCE.getXmlEntityMappings_2_3_TenantDiscriminators();
+ public static final EReference XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS = eINSTANCE.getXmlEntityMappings_2_3_TenantDiscriminatorColumns();
/**
* The meta object literal for the '<em><b>Named Stored Function Queries</b></em>' containment reference list feature.
@@ -2215,12 +2215,12 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
public static final EClass XML_PERSISTENCE_UNIT_DEFAULTS_23 = eINSTANCE.getXmlPersistenceUnitDefaults_2_3();
/**
- * The meta object literal for the '<em><b>Tenant Discriminators</b></em>' containment reference list feature.
+ * The meta object literal for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public static final EReference XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATORS = eINSTANCE.getXmlPersistenceUnitDefaults_2_3_TenantDiscriminators();
+ public static final EReference XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS = eINSTANCE.getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns();
/**
* The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3 <em>Xml Plsql Record 23</em>}' class.
@@ -2277,14 +2277,14 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
public static final EAttribute XML_STRUCT_23__NAME = eINSTANCE.getXmlStruct_2_3_Name();
/**
- * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3 <em>Xml Tenant Discriminator 23</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 <em>Xml Tenant Discriminator Column 23</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminator_2_3()
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3()
* @generated
*/
- public static final EClass XML_TENANT_DISCRIMINATOR_23 = eINSTANCE.getXmlTenantDiscriminator_2_3();
+ public static final EClass XML_TENANT_DISCRIMINATOR_COLUMN_23 = eINSTANCE.getXmlTenantDiscriminatorColumn_2_3();
/**
* The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -2292,7 +2292,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
- public static final EAttribute XML_TENANT_DISCRIMINATOR_23__NAME = eINSTANCE.getXmlTenantDiscriminator_2_3_Name();
+ public static final EAttribute XML_TENANT_DISCRIMINATOR_COLUMN_23__NAME = eINSTANCE.getXmlTenantDiscriminatorColumn_2_3_Name();
/**
* The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3 <em>Xml Attributes 23</em>}' class.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java
index fed46df041..9c1ddf28bd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java
@@ -22,7 +22,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminators <em>Tenant Discriminators</em>}</li>
+ * <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminatorColumns <em>Tenant Discriminator Columns</em>}</li>
* <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedStoredFunctionQueries <em>Named Stored Function Queries</em>}</li>
* <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedPlsqlStoredFunctionQueries <em>Named Plsql Stored Function Queries</em>}</li>
* <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedPlsqlStoredProcedureQueries <em>Named Plsql Stored Procedure Queries</em>}</li>
@@ -39,20 +39,20 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable;
public interface XmlEntityMappings_2_3 extends JpaEObject
{
/**
- * Returns the value of the '<em><b>Tenant Discriminators</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3}.
+ * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Tenant Discriminators</em>' containment reference list isn't clear,
+ * If the meaning of the '<em>Tenant Discriminator Columns</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>Tenant Discriminators</em>' containment reference list.
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntityMappings_2_3_TenantDiscriminators()
+ * @return the value of the '<em>Tenant Discriminator Columns</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntityMappings_2_3_TenantDiscriminatorColumns()
* @model containment="true"
* @generated
*/
- EList<XmlTenantDiscriminator_2_3> getTenantDiscriminators();
+ EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns();
/**
* Returns the value of the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java
index d6ad213ec5..e63726e7f6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java
@@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminators <em>Tenant Discriminators</em>}</li>
+ * <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminatorColumns <em>Tenant Discriminator Columns</em>}</li>
* </ul>
* </p>
*
@@ -33,19 +33,19 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
public interface XmlPersistenceUnitDefaults_2_3 extends JpaEObject
{
/**
- * Returns the value of the '<em><b>Tenant Discriminators</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3}.
+ * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Tenant Discriminators</em>' containment reference list isn't clear,
+ * If the meaning of the '<em>Tenant Discriminator Columns</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>Tenant Discriminators</em>' containment reference list.
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPersistenceUnitDefaults_2_3_TenantDiscriminators()
+ * @return the value of the '<em>Tenant Discriminator Columns</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns()
* @model containment="true"
* @generated
*/
- EList<XmlTenantDiscriminator_2_3> getTenantDiscriminators();
+ EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns();
} // XmlPersistenceUnitDefaults_2_3
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminator_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminatorColumn_2_3.java
index fafa07c321..2585c3fe81 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminator_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminatorColumn_2_3.java
@@ -19,16 +19,16 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getName <em>Name</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminator_2_3()
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3()
* @model kind="class" interface="true" abstract="true"
* @extends JpaEObject
* @generated
*/
-public interface XmlTenantDiscriminator_2_3 extends JpaEObject
+public interface XmlTenantDiscriminatorColumn_2_3 extends JpaEObject
{
/**
@@ -41,14 +41,14 @@ public interface XmlTenantDiscriminator_2_3 extends JpaEObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminator_2_3_Name()
+ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3_Name()
* @model dataType="org.eclipse.emf.ecore.xml.type.String"
* @generated
*/
String getName();
/**
- * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.

Back to the top