more orm/eclipselink ecore model updates to match recent changes. Refactored and added an XmlManagedType interface.v201301300022

15 files changed, 1043 insertions, 887 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel
index 09bd252dd9..4a60752878 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel
@@ -64,6 +64,7 @@
     <genClasses image="false" ecoreClass="orm.ecore#//XmlBaseJoinColumn">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlBaseJoinColumn/referencedColumnName"/>

     </genClasses>

+    <genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlManagedType"/>

     <genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlNamedColumn"/>

     <genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlRelationshipMapping">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//AbstractXmlRelationshipMapping/targetEntity"/>

@@ -236,6 +237,10 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlJoinTableContainer/joinTable"/>

     </genClasses>

     <genClasses ecoreClass="orm.ecore#//Lob"/>

+    <genClasses image="false" ecoreClass="orm.ecore#//XmlManagedType">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlManagedType/className"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlManagedType/description"/>

+    </genClasses>

     <genClasses image="false" ecoreClass="orm.ecore#//XmlManyToMany"/>

     <genClasses image="false" ecoreClass="orm.ecore#//XmlManyToOne"/>

     <genClasses ecoreClass="orm.ecore#//MapKey">

@@ -331,9 +336,7 @@
     </genClasses>

     <genClasses image="false" ecoreClass="orm.ecore#//XmlTransient"/>

     <genClasses image="false" ecoreClass="orm.ecore#//XmlTypeMapping">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlTypeMapping/className"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlTypeMapping/metadataComplete"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlTypeMapping/description"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlTypeMapping/attributes"/>

     </genClasses>

     <genClasses ecoreClass="orm.ecore#//XmlUniqueConstraint">

@@ -481,8 +484,6 @@
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlConvert_2_1/disableConversion"/>

       </genClasses>

       <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlConverter_2_1">

-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlConverter_2_1/description"/>

-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlConverter_2_1/className"/>

         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlConverter_2_1/autoApply"/>

       </genClasses>

       <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlConverterContainer_2_1">

@@ -573,7 +574,7 @@
       </genClasses>

       <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlStoredProcedureParameter_2_1">

         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlStoredProcedureParameter_2_1/description"/>

-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlStoredProcedureParameter_2_1/parameterMode"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlStoredProcedureParameter_2_1/mode"/>

         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlStoredProcedureParameter_2_1/name"/>

         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlStoredProcedureParameter_2_1/className"/>

       </genClasses>

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore b/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore
index 0d4217111e..a9c271509c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore
@@ -36,6 +36,8 @@
       eSuperTypes="#//XmlNamedColumn">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="referencedColumnName" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlManagedType" abstract="true"

+      eSuperTypes="#//XmlManagedType"/>

   <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlNamedColumn" abstract="true"

       eSuperTypes="#//XmlNamedColumn"/>

   <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlRelationshipMapping" abstract="true"

@@ -60,7 +62,7 @@
         eType="#//XmlUniqueConstraint" containment="true" resolveProxies="false"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlTypeMapping" abstract="true"

-      eSuperTypes="#//XmlTypeMapping"/>

+      eSuperTypes="#//AbstractXmlManagedType #//XmlTypeMapping"/>

   <eClassifiers xsi:type="ecore:EClass" name="XmlAccessHolder" abstract="true" interface="true">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="access" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>

   </eClassifiers>

@@ -136,7 +138,7 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="ConstructorResult" eSuperTypes="#//v2_1/ConstructorResult_2_1"/>

   <eClassifiers xsi:type="ecore:EClass" name="XmlConvert" eSuperTypes="#//v2_1/XmlConvert_2_1"/>

-  <eClassifiers xsi:type="ecore:EClass" name="XmlConverter" eSuperTypes="#//v2_1/XmlConverter_2_1"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlConverter" eSuperTypes="#//AbstractXmlManagedType #//v2_1/XmlConverter_2_1"/>

   <eClassifiers xsi:type="ecore:EClass" name="XmlConvertibleMapping" abstract="true"

       interface="true" eSuperTypes="#//v2_1/XmlConvertibleMapping_2_1">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="lob" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>

@@ -280,6 +282,11 @@
         containment="true" resolveProxies="false"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Lob"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlManagedType" abstract="true" interface="true">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany" eSuperTypes="#//AbstractXmlMultiRelationshipMapping #//v2_0/XmlManyToMany_2_0 #//v2_1/XmlManyToMany_2_1"/>

   <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne" eSuperTypes="#//AbstractXmlSingleRelationshipMapping #//v2_1/XmlManyToOne_2_1"/>

   <eClassifiers xsi:type="ecore:EClass" name="MapKey">

@@ -308,7 +315,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="XmlNamedQuery" eSuperTypes="#//XmlQuery #//v2_0/XmlNamedQuery_2_0">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="query" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedStoredProcedureQuery" eSuperTypes="#//XmlQuery #//v2_1/XmlNamedStoredProcedureQuery_2_1"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedStoredProcedureQuery" eSuperTypes="#//v2_1/XmlNamedStoredProcedureQuery_2_1"/>

   <eClassifiers xsi:type="ecore:EClass" name="XmlNullAttributeMapping" abstract="true"

       eSuperTypes="#//AbstractXmlAttributeMapping"/>

   <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany" eSuperTypes="#//AbstractXmlMultiRelationshipMapping #//XmlJoinColumnContainer #//v2_0/XmlOneToMany_2_0 #//v2_1/XmlOneToMany_2_1"/>

@@ -396,11 +403,8 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="XmlTransient" eSuperTypes="#//AbstractXmlAttributeMapping"/>

   <eClassifiers xsi:type="ecore:EClass" name="XmlTypeMapping" abstract="true" interface="true"

-      eSuperTypes="#//XmlAccessHolder">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>

+      eSuperTypes="#//XmlManagedType #//XmlAccessHolder">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="metadataComplete" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" eType="#//Attributes"

         containment="true" resolveProxies="false"/>

   </eClassifiers>

@@ -624,10 +628,7 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="disableConversion" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>

     </eClassifiers>

     <eClassifiers xsi:type="ecore:EClass" name="XmlConverter_2_1" abstract="true"

-        interface="true">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>

+        interface="true" eSuperTypes="#//XmlManagedType">

       <eStructuralFeatures xsi:type="ecore:EAttribute" name="autoApply" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>

     </eClassifiers>

     <eClassifiers xsi:type="ecore:EClass" name="XmlConverterContainer_2_1" abstract="true"

@@ -722,7 +723,7 @@
           eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>

     </eClassifiers>

     <eClassifiers xsi:type="ecore:EClass" name="XmlNamedStoredProcedureQuery_2_1"

-        abstract="true" interface="true">

+        abstract="true" interface="true" eSuperTypes="#//XmlQuery">

       <eStructuralFeatures xsi:type="ecore:EAttribute" name="resultClasses" upperBound="-1"

           eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>

       <eStructuralFeatures xsi:type="ecore:EAttribute" name="resultSetMappings" upperBound="-1"

@@ -774,7 +775,7 @@
     <eClassifiers xsi:type="ecore:EClass" name="XmlStoredProcedureParameter_2_1" abstract="true"

         interface="true">

       <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="parameterMode" eType="#//v2_1/ParameterMode_2_1"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="mode" eType="#//v2_1/ParameterMode_2_1"/>

       <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>

       <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"

           eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlManagedType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlManagedType.java
new file mode 100644
index 0000000000..53ec121f08
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlManagedType.java
@@ -0,0 +1,313 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.jpa.core.resource.orm;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
+import org.eclipse.jpt.common.core.utility.TextRange;
+import org.eclipse.text.edits.ReplaceEdit;
+import org.eclipse.wst.common.internal.emf.resource.Translator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Xml Managed Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlManagedType()
+ * @model kind="class" abstract="true"
+ * @generated
+ */
+public abstract class AbstractXmlManagedType extends EBaseObjectImpl implements XmlManagedType
+{
+	/**
+	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getClassName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CLASS_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getClassName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String className = CLASS_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DESCRIPTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String description = DESCRIPTION_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AbstractXmlManagedType()
+	{
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass()
+	{
+		return OrmPackage.Literals.ABSTRACT_XML_MANAGED_TYPE;
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Class 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>Class Name</em>' attribute.
+	 * @see #setClassName(String)
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManagedType_ClassName()
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+	 * @generated
+	 */
+	public String getClassName()
+	{
+		return className;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType#getClassName <em>Class Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Class Name</em>' attribute.
+	 * @see #getClassName()
+	 * @generated
+	 */
+	public void setClassName(String newClassName)
+	{
+		String oldClassName = className;
+		className = newClassName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME, oldClassName, className));
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Description</em>' attribute.
+	 * @see #setDescription(String)
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManagedType_Description()
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+	 * @generated
+	 */
+	public String getDescription()
+	{
+		return description;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType#getDescription <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Description</em>' attribute.
+	 * @see #getDescription()
+	 * @generated
+	 */
+	public void setDescription(String newDescription)
+	{
+		String oldDescription = description;
+		description = newDescription;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION, oldDescription, description));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType)
+	{
+		switch (featureID)
+		{
+			case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME:
+				return getClassName();
+			case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION:
+				return getDescription();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue)
+	{
+		switch (featureID)
+		{
+			case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME:
+				setClassName((String)newValue);
+				return;
+			case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION:
+				setDescription((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID)
+	{
+		switch (featureID)
+		{
+			case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME:
+				setClassName(CLASS_NAME_EDEFAULT);
+				return;
+			case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION:
+				setDescription(DESCRIPTION_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID)
+	{
+		switch (featureID)
+		{
+			case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME:
+				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
+			case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION:
+				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+		}
+		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(" (className: ");
+		result.append(className);
+		result.append(", description: ");
+		result.append(description);
+		result.append(')');
+		return result.toString();
+	}
+
+
+	public TextRange getClassTextRange() {
+		return getAttributeTextRange(JPA.CLASS);
+	}
+
+
+	// ********** translators **********
+
+	protected static Translator buildDescriptionTranslator() {
+		return new Translator(JPA.DESCRIPTION, OrmPackage.eINSTANCE.getXmlManagedType_Description());
+	}
+	
+	protected static Translator buildClassTranslator() {
+		return new Translator(JPA.CLASS, OrmPackage.eINSTANCE.getXmlManagedType_ClassName(), Translator.DOM_ATTRIBUTE);
+	}
+
+
+	// ********** refactoring **********
+
+	public ReplaceEdit createRenameTypeEdit(IType originalType, String newName) {
+		String originalName = originalType.getTypeQualifiedName();
+		int nameIndex = this.className.lastIndexOf(originalName);
+		int offset = getAttributeNode(JPA.CLASS).getValueRegionStartOffset() + 1; // +1 = opening double quote
+		return new ReplaceEdit(offset + nameIndex, originalName.length(), newName);
+	}
+
+	public ReplaceEdit createRenamePackageEdit(String newPackageName) {
+		int packageLength = this.className.lastIndexOf('.');
+		if (newPackageName == "") {//$NON-NLS-1$
+			//moving to the default package, remove the '.'
+			packageLength++;
+		}
+		if (packageLength == -1) {
+			//moving from the default package or unspecified package
+			packageLength = 0;
+			newPackageName = newPackageName + '.';
+		}
+		int offset = getAttributeNode(JPA.CLASS).getValueRegionStartOffset() + 1; // +1 = opening double quote
+		return new ReplaceEdit(offset, packageLength, newPackageName);
+	}
+
+	// *********** content assist ************
+	
+	protected TextRange getClassNameCodeAssistTextRange() {
+		return getAttributeCodeAssistTextRange(JPA.CLASS);
+	}
+
+	public boolean classNameTouches(int pos) {
+		TextRange textRange = this.getClassNameCodeAssistTextRange();
+		return (textRange != null) && (textRange.touches(pos));
+	}
+} // AbstractXmlManagedType
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTypeMapping.java
index 5f8d393c8e..4bbca77034 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTypeMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -14,10 +14,7 @@ import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -36,7 +33,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class" abstract="true"
  * @generated
  */
-public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements XmlTypeMapping
+public abstract class AbstractXmlTypeMapping extends AbstractXmlManagedType implements XmlTypeMapping
 {
 
 	/**
@@ -60,26 +57,6 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements
 	protected String access = ACCESS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CLASS_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String className = CLASS_NAME_EDEFAULT;
-
-	/**
 	 * The default value of the '{@link #getMetadataComplete() <em>Metadata Complete</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -100,26 +77,6 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements
 	protected Boolean metadataComplete = METADATA_COMPLETE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
 	 * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -151,41 +108,6 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements
 	}
 
 	/**
-	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Class 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>Class Name</em>' attribute.
-	 * @see #setClassName(String)
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTypeMapping_ClassName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getClassName()
-	{
-		return className;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlTypeMapping#getClassName <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Name</em>' attribute.
-	 * @see #getClassName()
-	 * @generated
-	 */
-	public void setClassName(String newClassName)
-	{
-		String oldClassName = className;
-		className = newClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME, oldClassName, className));
-	}
-
-	/**
 	 * Returns the value of the '<em><b>Access</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -256,41 +178,6 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements
 	}
 
 	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTypeMapping_Description()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getDescription()
-	{
-		return description;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlTypeMapping#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	public void setDescription(String newDescription)
-	{
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
 	 * Returns the value of the '<em><b>Attributes</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -378,12 +265,8 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements
 		{
 			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS:
 				return getAccess();
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME:
-				return getClassName();
 			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE:
 				return getMetadataComplete();
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION:
-				return getDescription();
 			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES:
 				return getAttributes();
 		}
@@ -403,15 +286,9 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements
 			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS:
 				setAccess((String)newValue);
 				return;
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME:
-				setClassName((String)newValue);
-				return;
 			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE:
 				setMetadataComplete((Boolean)newValue);
 				return;
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
 			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES:
 				setAttributes((Attributes)newValue);
 				return;
@@ -432,15 +309,9 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements
 			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS:
 				setAccess(ACCESS_EDEFAULT);
 				return;
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME:
-				setClassName(CLASS_NAME_EDEFAULT);
-				return;
 			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE:
 				setMetadataComplete(METADATA_COMPLETE_EDEFAULT);
 				return;
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
 			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES:
 				setAttributes((Attributes)null);
 				return;
@@ -460,12 +331,8 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements
 		{
 			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS:
 				return ACCESS_EDEFAULT == null ? access != null : !ACCESS_EDEFAULT.equals(access);
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME:
-				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
 			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE:
 				return METADATA_COMPLETE_EDEFAULT == null ? metadataComplete != null : !METADATA_COMPLETE_EDEFAULT.equals(metadataComplete);
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
 			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES:
 				return attributes != null;
 		}
@@ -478,6 +345,62 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements
 	 * @generated
 	 */
 	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+	{
+		if (baseClass == XmlAccessHolder.class)
+		{
+			switch (derivedFeatureID)
+			{
+				case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS: return OrmPackage.XML_ACCESS_HOLDER__ACCESS;
+				default: return -1;
+			}
+		}
+		if (baseClass == XmlTypeMapping.class)
+		{
+			switch (derivedFeatureID)
+			{
+				case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE: return OrmPackage.XML_TYPE_MAPPING__METADATA_COMPLETE;
+				case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES: return OrmPackage.XML_TYPE_MAPPING__ATTRIBUTES;
+				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 == XmlAccessHolder.class)
+		{
+			switch (baseFeatureID)
+			{
+				case OrmPackage.XML_ACCESS_HOLDER__ACCESS: return OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS;
+				default: return -1;
+			}
+		}
+		if (baseClass == XmlTypeMapping.class)
+		{
+			switch (baseFeatureID)
+			{
+				case OrmPackage.XML_TYPE_MAPPING__METADATA_COMPLETE: return OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE;
+				case OrmPackage.XML_TYPE_MAPPING__ATTRIBUTES: return OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public String toString()
 	{
 		if (eIsProxy()) return super.toString();
@@ -485,21 +408,13 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (access: ");
 		result.append(access);
-		result.append(", className: ");
-		result.append(className);
 		result.append(", metadataComplete: ");
 		result.append(metadataComplete);
-		result.append(", description: ");
-		result.append(description);
 		result.append(')');
 		return result.toString();
 	}
 	
 
-	public TextRange getClassTextRange() {
-		return getAttributeTextRange(JPA.CLASS);
-	}
-
 	public TextRange getAttributesTextRange() {
 		return getAttributeTextRange(JPA.ATTRIBUTES);
 	}
@@ -510,18 +425,10 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements
 	
 	// ********** translators **********
 	
-	protected static Translator buildClassTranslator() {
-		return new Translator(JPA.CLASS, OrmPackage.eINSTANCE.getXmlTypeMapping_ClassName(), Translator.DOM_ATTRIBUTE);
-	}
-	
 	protected static Translator buildMetadataCompleteTranslator() {
 		return new Translator(JPA.METADATA_COMPLETE, OrmPackage.eINSTANCE.getXmlTypeMapping_MetadataComplete(), Translator.DOM_ATTRIBUTE);
 	}
 	
-	protected static Translator buildDescriptionTranslator() {
-		return new Translator(JPA.DESCRIPTION, OrmPackage.eINSTANCE.getXmlTypeMapping_Description());
-	}
-	
 	protected static Translator buildAttributesTranslator() {
 		return Attributes.buildTranslator();
 	}
@@ -530,39 +437,4 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements
 		return new Translator(JPA.ACCESS, OrmPackage.eINSTANCE.getXmlAccessHolder_Access(), Translator.DOM_ATTRIBUTE);
 	}
 
-
-	// ********** refactoring **********
-
-	public ReplaceEdit createRenameTypeEdit(IType originalType, String newName) {
-		String originalName = originalType.getTypeQualifiedName();
-		int nameIndex = this.className.lastIndexOf(originalName);
-		int offset = getAttributeNode(JPA.CLASS).getValueRegionStartOffset() + 1; // +1 = opening double quote
-		return new ReplaceEdit(offset + nameIndex, originalName.length(), newName);
-	}
-
-	public ReplaceEdit createRenamePackageEdit(String newPackageName) {
-		int packageLength = this.className.lastIndexOf('.');
-		if (newPackageName == "") {//$NON-NLS-1$
-			//moving to the default package, remove the '.'
-			packageLength++;
-		}
-		if (packageLength == -1) {
-			//moving from the default package or unspecified package
-			packageLength = 0;
-			newPackageName = newPackageName + '.';
-		}
-		int offset = getAttributeNode(JPA.CLASS).getValueRegionStartOffset() + 1; // +1 = opening double quote
-		return new ReplaceEdit(offset, packageLength, newPackageName);
-	}
-
-	// *********** content assist ************
-	
-	protected TextRange getClassNameCodeAssistTextRange() {
-		return getAttributeCodeAssistTextRange(JPA.CLASS);
-	}
-
-	public boolean classNameTouches(int pos) {
-		TextRange textRange = this.getClassNameCodeAssistTextRange();
-		return (textRange != null) && (textRange.touches(pos));
-	}
 } // TypeMapping
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
index b3f35a5c98..1820beec7e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
@@ -80,7 +80,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAccessHolder()
 	 * @generated
 	 */
-	public static final int XML_ACCESS_HOLDER = 15;
+	public static final int XML_ACCESS_HOLDER = 16;
 
 	/**
 	 * The feature id for the '<em><b>Access</b></em>' attribute.
@@ -108,7 +108,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAttributeMapping()
 	 * @generated
 	 */
-	public static final int XML_ATTRIBUTE_MAPPING = 16;
+	public static final int XML_ATTRIBUTE_MAPPING = 17;
 
 	/**
 	 * The feature id for the '<em><b>Access</b></em>' attribute.
@@ -301,7 +301,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlNamedColumn()
 	 * @generated
 	 */
-	public static final int ABSTRACT_XML_NAMED_COLUMN = 9;
+	public static final int ABSTRACT_XML_NAMED_COLUMN = 10;
 
 	/**
 	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
@@ -521,7 +521,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlRelationshipMapping()
 	 * @generated
 	 */
-	public static final int ABSTRACT_XML_RELATIONSHIP_MAPPING = 10;
+	public static final int ABSTRACT_XML_RELATIONSHIP_MAPPING = 11;
 
 	/**
 	 * The feature id for the '<em><b>Access</b></em>' attribute.
@@ -842,6 +842,80 @@ public class OrmPackage extends EPackageImpl
 	public static final int XML_BASE_JOIN_COLUMN_FEATURE_COUNT = XML_NAMED_COLUMN_FEATURE_COUNT + 1;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType <em>Xml Managed Type</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManagedType()
+	 * @generated
+	 */
+	public static final int XML_MANAGED_TYPE = 60;
+
+	/**
+	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_MANAGED_TYPE__CLASS_NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_MANAGED_TYPE__DESCRIPTION = 1;
+
+	/**
+	 * The number of structural features of the '<em>Xml Managed Type</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_MANAGED_TYPE_FEATURE_COUNT = 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType <em>Abstract Xml Managed Type</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlManagedType()
+	 * @generated
+	 */
+	public static final int ABSTRACT_XML_MANAGED_TYPE = 9;
+
+	/**
+	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME = XML_MANAGED_TYPE__CLASS_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION = XML_MANAGED_TYPE__DESCRIPTION;
+
+	/**
+	 * The number of structural features of the '<em>Abstract Xml Managed Type</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ABSTRACT_XML_MANAGED_TYPE_FEATURE_COUNT = XML_MANAGED_TYPE_FEATURE_COUNT + 0;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlSingleRelationshipMapping <em>Abstract Xml Single Relationship Mapping</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -849,7 +923,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlSingleRelationshipMapping()
 	 * @generated
 	 */
-	public static final int ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING = 11;
+	public static final int ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING = 12;
 
 	/**
 	 * The feature id for the '<em><b>Access</b></em>' attribute.
@@ -958,7 +1032,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlTable()
 	 * @generated
 	 */
-	public static final int ABSTRACT_XML_TABLE = 13;
+	public static final int ABSTRACT_XML_TABLE = 14;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1013,7 +1087,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTypeMapping()
 	 * @generated
 	 */
-	public static final int XML_TYPE_MAPPING = 98;
+	public static final int XML_TYPE_MAPPING = 100;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlTypeMapping <em>Abstract Xml Type Mapping</em>}' class.
@@ -1023,7 +1097,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlTypeMapping()
 	 * @generated
 	 */
-	public static final int ABSTRACT_XML_TYPE_MAPPING = 14;
+	public static final int ABSTRACT_XML_TYPE_MAPPING = 15;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride <em>Xml Association Override</em>}' class.
@@ -1033,7 +1107,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAssociationOverride()
 	 * @generated
 	 */
-	public static final int XML_ASSOCIATION_OVERRIDE = 17;
+	public static final int XML_ASSOCIATION_OVERRIDE = 18;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverrideContainer <em>Xml Association Override Container</em>}' class.
@@ -1043,7 +1117,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAssociationOverrideContainer()
 	 * @generated
 	 */
-	public static final int XML_ASSOCIATION_OVERRIDE_CONTAINER = 18;
+	public static final int XML_ASSOCIATION_OVERRIDE_CONTAINER = 19;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverride <em>Xml Attribute Override</em>}' class.
@@ -1053,7 +1127,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAttributeOverride()
 	 * @generated
 	 */
-	public static final int XML_ATTRIBUTE_OVERRIDE = 19;
+	public static final int XML_ATTRIBUTE_OVERRIDE = 20;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverrideContainer <em>Xml Attribute Override Container</em>}' class.
@@ -1063,7 +1137,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAttributeOverrideContainer()
 	 * @generated
 	 */
-	public static final int XML_ATTRIBUTE_OVERRIDE_CONTAINER = 20;
+	public static final int XML_ATTRIBUTE_OVERRIDE_CONTAINER = 21;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.Attributes <em>Attributes</em>}' class.
@@ -1073,7 +1147,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAttributes()
 	 * @generated
 	 */
-	public static final int ATTRIBUTES = 21;
+	public static final int ATTRIBUTES = 22;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
@@ -1083,7 +1157,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlBasic()
 	 * @generated
 	 */
-	public static final int XML_BASIC = 22;
+	public static final int XML_BASIC = 23;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.CascadeType <em>Cascade Type</em>}' class.
@@ -1093,7 +1167,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getCascadeType()
 	 * @generated
 	 */
-	public static final int CASCADE_TYPE = 23;
+	public static final int CASCADE_TYPE = 24;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlReferenceTable <em>Abstract Xml Reference Table</em>}' class.
@@ -1103,7 +1177,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlReferenceTable()
 	 * @generated
 	 */
-	public static final int ABSTRACT_XML_REFERENCE_TABLE = 12;
+	public static final int ABSTRACT_XML_REFERENCE_TABLE = 13;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1160,31 +1234,13 @@ public class OrmPackage extends EPackageImpl
 	public static final int ABSTRACT_XML_REFERENCE_TABLE_FEATURE_COUNT = ABSTRACT_XML_TABLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TYPE_MAPPING__ACCESS = XML_ACCESS_HOLDER__ACCESS;
-
-	/**
 	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_TYPE_MAPPING__CLASS_NAME = XML_ACCESS_HOLDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TYPE_MAPPING__METADATA_COMPLETE = XML_ACCESS_HOLDER_FEATURE_COUNT + 1;
+	public static final int ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME = ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -1193,25 +1249,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_TYPE_MAPPING__DESCRIPTION = XML_ACCESS_HOLDER_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TYPE_MAPPING__ATTRIBUTES = XML_ACCESS_HOLDER_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Xml Type Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TYPE_MAPPING_FEATURE_COUNT = XML_ACCESS_HOLDER_FEATURE_COUNT + 4;
+	public static final int ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION = ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION;
 
 	/**
 	 * The feature id for the '<em><b>Access</b></em>' attribute.
@@ -1220,16 +1258,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int ABSTRACT_XML_TYPE_MAPPING__ACCESS = XML_TYPE_MAPPING__ACCESS;
-
-	/**
-	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME = XML_TYPE_MAPPING__CLASS_NAME;
+	public static final int ABSTRACT_XML_TYPE_MAPPING__ACCESS = ABSTRACT_XML_MANAGED_TYPE_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
@@ -1238,16 +1267,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE = XML_TYPE_MAPPING__METADATA_COMPLETE;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION = XML_TYPE_MAPPING__DESCRIPTION;
+	public static final int ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE = ABSTRACT_XML_MANAGED_TYPE_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Attributes</b></em>' containment reference.
@@ -1256,7 +1276,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES = XML_TYPE_MAPPING__ATTRIBUTES;
+	public static final int ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES = ABSTRACT_XML_MANAGED_TYPE_FEATURE_COUNT + 2;
 
 	/**
 	 * The number of structural features of the '<em>Abstract Xml Type Mapping</em>' class.
@@ -1265,7 +1285,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT = XML_TYPE_MAPPING_FEATURE_COUNT + 0;
+	public static final int ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT = ABSTRACT_XML_MANAGED_TYPE_FEATURE_COUNT + 3;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOverride <em>Xml Override</em>}' class.
@@ -1275,7 +1295,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOverride()
 	 * @generated
 	 */
-	public static final int XML_OVERRIDE = 75;
+	public static final int XML_OVERRIDE = 77;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1699,7 +1719,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlClassReference()
 	 * @generated
 	 */
-	public static final int XML_CLASS_REFERENCE = 24;
+	public static final int XML_CLASS_REFERENCE = 25;
 
 	/**
 	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
@@ -1727,7 +1747,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlCollectionTable()
 	 * @generated
 	 */
-	public static final int XML_COLLECTION_TABLE = 25;
+	public static final int XML_COLLECTION_TABLE = 26;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1809,7 +1829,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlColumn()
 	 * @generated
 	 */
-	public static final int XML_COLUMN = 26;
+	public static final int XML_COLUMN = 27;
 
 	/**
 	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
@@ -1918,7 +1938,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getColumnMapping()
 	 * @generated
 	 */
-	public static final int COLUMN_MAPPING = 27;
+	public static final int COLUMN_MAPPING = 28;
 
 	/**
 	 * The feature id for the '<em><b>Column</b></em>' containment reference.
@@ -1946,7 +1966,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getColumnResult()
 	 * @generated
 	 */
-	public static final int COLUMN_RESULT = 28;
+	public static final int COLUMN_RESULT = 29;
 
 	/**
 	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
@@ -1983,7 +2003,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getConstructorResult()
 	 * @generated
 	 */
-	public static final int CONSTRUCTOR_RESULT = 29;
+	public static final int CONSTRUCTOR_RESULT = 30;
 
 	/**
 	 * The feature id for the '<em><b>Target Class</b></em>' attribute.
@@ -2020,7 +2040,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvert()
 	 * @generated
 	 */
-	public static final int XML_CONVERT = 30;
+	public static final int XML_CONVERT = 31;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -2075,25 +2095,25 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConverter()
 	 * @generated
 	 */
-	public static final int XML_CONVERTER = 31;
+	public static final int XML_CONVERTER = 32;
 
 	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_CONVERTER__DESCRIPTION = OrmV2_1Package.XML_CONVERTER_21__DESCRIPTION;
+	public static final int XML_CONVERTER__CLASS_NAME = ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_CONVERTER__CLASS_NAME = OrmV2_1Package.XML_CONVERTER_21__CLASS_NAME;
+	public static final int XML_CONVERTER__DESCRIPTION = ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION;
 
 	/**
 	 * The feature id for the '<em><b>Auto Apply</b></em>' attribute.
@@ -2102,7 +2122,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_CONVERTER__AUTO_APPLY = OrmV2_1Package.XML_CONVERTER_21__AUTO_APPLY;
+	public static final int XML_CONVERTER__AUTO_APPLY = ABSTRACT_XML_MANAGED_TYPE_FEATURE_COUNT + 0;
 
 	/**
 	 * The number of structural features of the '<em>Xml Converter</em>' class.
@@ -2111,7 +2131,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_CONVERTER_FEATURE_COUNT = OrmV2_1Package.XML_CONVERTER_21_FEATURE_COUNT + 0;
+	public static final int XML_CONVERTER_FEATURE_COUNT = ABSTRACT_XML_MANAGED_TYPE_FEATURE_COUNT + 1;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvertibleMapping <em>Xml Convertible Mapping</em>}' class.
@@ -2121,7 +2141,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvertibleMapping()
 	 * @generated
 	 */
-	public static final int XML_CONVERTIBLE_MAPPING = 32;
+	public static final int XML_CONVERTIBLE_MAPPING = 33;
 
 	/**
 	 * The feature id for the '<em><b>Convert</b></em>' containment reference.
@@ -2176,7 +2196,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlDiscriminatorColumn()
 	 * @generated
 	 */
-	public static final int XML_DISCRIMINATOR_COLUMN = 33;
+	public static final int XML_DISCRIMINATOR_COLUMN = 34;
 
 	/**
 	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
@@ -2231,7 +2251,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlElementCollection()
 	 * @generated
 	 */
-	public static final int XML_ELEMENT_COLLECTION = 34;
+	public static final int XML_ELEMENT_COLLECTION = 35;
 
 	/**
 	 * The feature id for the '<em><b>Access</b></em>' attribute.
@@ -2466,43 +2486,43 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEmbeddable()
 	 * @generated
 	 */
-	public static final int XML_EMBEDDABLE = 35;
+	public static final int XML_EMBEDDABLE = 36;
 
 	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
+	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_EMBEDDABLE__ACCESS = ABSTRACT_XML_TYPE_MAPPING__ACCESS;
+	public static final int XML_EMBEDDABLE__CLASS_NAME = ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_EMBEDDABLE__CLASS_NAME = ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME;
+	public static final int XML_EMBEDDABLE__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION;
 
 	/**
-	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
+	 * The feature id for the '<em><b>Access</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_EMBEDDABLE__METADATA_COMPLETE = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE;
+	public static final int XML_EMBEDDABLE__ACCESS = ABSTRACT_XML_TYPE_MAPPING__ACCESS;
 
 	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_EMBEDDABLE__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION;
+	public static final int XML_EMBEDDABLE__METADATA_COMPLETE = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE;
 
 	/**
 	 * The feature id for the '<em><b>Attributes</b></em>' containment reference.
@@ -2530,7 +2550,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEmbedded()
 	 * @generated
 	 */
-	public static final int XML_EMBEDDED = 36;
+	public static final int XML_EMBEDDED = 37;
 
 	/**
 	 * The feature id for the '<em><b>Access</b></em>' attribute.
@@ -2594,7 +2614,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEmbeddedId()
 	 * @generated
 	 */
-	public static final int XML_EMBEDDED_ID = 37;
+	public static final int XML_EMBEDDED_ID = 38;
 
 	/**
 	 * The feature id for the '<em><b>Access</b></em>' attribute.
@@ -2640,43 +2660,43 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEntity()
 	 * @generated
 	 */
-	public static final int XML_ENTITY = 38;
+	public static final int XML_ENTITY = 39;
 
 	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
+	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY__ACCESS = ABSTRACT_XML_TYPE_MAPPING__ACCESS;
+	public static final int XML_ENTITY__CLASS_NAME = ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY__CLASS_NAME = ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME;
+	public static final int XML_ENTITY__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION;
 
 	/**
-	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
+	 * The feature id for the '<em><b>Access</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY__METADATA_COMPLETE = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE;
+	public static final int XML_ENTITY__ACCESS = ABSTRACT_XML_TYPE_MAPPING__ACCESS;
 
 	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION;
+	public static final int XML_ENTITY__METADATA_COMPLETE = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE;
 
 	/**
 	 * The feature id for the '<em><b>Attributes</b></em>' containment reference.
@@ -2974,7 +2994,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEventMethodContainer()
 	 * @generated
 	 */
-	public static final int XML_EVENT_METHOD_CONTAINER = 44;
+	public static final int XML_EVENT_METHOD_CONTAINER = 45;
 
 	/**
 	 * The feature id for the '<em><b>Pre Persist</b></em>' containment reference.
@@ -3056,7 +3076,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEntityListener()
 	 * @generated
 	 */
-	public static final int ENTITY_LISTENER = 39;
+	public static final int ENTITY_LISTENER = 40;
 
 	/**
 	 * The feature id for the '<em><b>Pre Persist</b></em>' containment reference.
@@ -3156,7 +3176,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEntityListeners()
 	 * @generated
 	 */
-	public static final int ENTITY_LISTENERS = 40;
+	public static final int ENTITY_LISTENERS = 41;
 
 	/**
 	 * The feature id for the '<em><b>Entity Listeners</b></em>' containment reference list.
@@ -3184,7 +3204,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEntityMappings()
 	 * @generated
 	 */
-	public static final int XML_ENTITY_MAPPINGS = 41;
+	public static final int XML_ENTITY_MAPPINGS = 42;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.EntityResult <em>Entity Result</em>}' class.
@@ -3194,7 +3214,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEntityResult()
 	 * @generated
 	 */
-	public static final int ENTITY_RESULT = 42;
+	public static final int ENTITY_RESULT = 43;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.EventMethod <em>Event Method</em>}' class.
@@ -3204,7 +3224,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEventMethod()
 	 * @generated
 	 */
-	public static final int EVENT_METHOD = 43;
+	public static final int EVENT_METHOD = 44;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.FieldResult <em>Field Result</em>}' class.
@@ -3214,7 +3234,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getFieldResult()
 	 * @generated
 	 */
-	public static final int FIELD_RESULT = 45;
+	public static final int FIELD_RESULT = 46;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratedValue <em>Xml Generated Value</em>}' class.
@@ -3224,7 +3244,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlGeneratedValue()
 	 * @generated
 	 */
-	public static final int XML_GENERATED_VALUE = 47;
+	public static final int XML_GENERATED_VALUE = 48;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlGenerator <em>Xml Generator</em>}' class.
@@ -3234,7 +3254,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlGenerator()
 	 * @generated
 	 */
-	public static final int XML_GENERATOR = 48;
+	public static final int XML_GENERATOR = 49;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratorContainer <em>Xml Generator Container</em>}' class.
@@ -3244,7 +3264,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlGeneratorContainer()
 	 * @generated
 	 */
-	public static final int XML_GENERATOR_CONTAINER = 49;
+	public static final int XML_GENERATOR_CONTAINER = 50;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlId <em>Xml Id</em>}' class.
@@ -3254,7 +3274,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlId()
 	 * @generated
 	 */
-	public static final int XML_ID = 50;
+	public static final int XML_ID = 51;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.Inheritance <em>Inheritance</em>}' class.
@@ -3264,7 +3284,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getInheritance()
 	 * @generated
 	 */
-	public static final int INHERITANCE = 53;
+	public static final int INHERITANCE = 54;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlJoinColumn <em>Xml Join Column</em>}' class.
@@ -3274,7 +3294,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinColumn()
 	 * @generated
 	 */
-	public static final int XML_JOIN_COLUMN = 54;
+	public static final int XML_JOIN_COLUMN = 55;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlJoinTable <em>Xml Join Table</em>}' class.
@@ -3284,7 +3304,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinTable()
 	 * @generated
 	 */
-	public static final int XML_JOIN_TABLE = 56;
+	public static final int XML_JOIN_TABLE = 57;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.Lob <em>Lob</em>}' class.
@@ -3294,7 +3314,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getLob()
 	 * @generated
 	 */
-	public static final int LOB = 58;
+	public static final int LOB = 59;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
@@ -3304,7 +3324,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManyToMany()
 	 * @generated
 	 */
-	public static final int XML_MANY_TO_MANY = 59;
+	public static final int XML_MANY_TO_MANY = 61;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
@@ -3314,7 +3334,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManyToOne()
 	 * @generated
 	 */
-	public static final int XML_MANY_TO_ONE = 60;
+	public static final int XML_MANY_TO_ONE = 62;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.MapKey <em>Map Key</em>}' class.
@@ -3324,7 +3344,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getMapKey()
 	 * @generated
 	 */
-	public static final int MAP_KEY = 61;
+	public static final int MAP_KEY = 63;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlMappedByMapping <em>Xml Mapped By Mapping</em>}' class.
@@ -3334,7 +3354,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlMappedByMapping()
 	 * @generated
 	 */
-	public static final int XML_MAPPED_BY_MAPPING = 62;
+	public static final int XML_MAPPED_BY_MAPPING = 64;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
@@ -3344,7 +3364,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlMappedSuperclass()
 	 * @generated
 	 */
-	public static final int XML_MAPPED_SUPERCLASS = 63;
+	public static final int XML_MAPPED_SUPERCLASS = 65;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlQuery <em>Xml Query</em>}' class.
@@ -3354,7 +3374,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQuery()
 	 * @generated
 	 */
-	public static final int XML_QUERY = 88;
+	public static final int XML_QUERY = 90;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}' class.
@@ -3364,7 +3384,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedNativeQuery()
 	 * @generated
 	 */
-	public static final int XML_NAMED_NATIVE_QUERY = 67;
+	public static final int XML_NAMED_NATIVE_QUERY = 69;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery <em>Xml Named Query</em>}' class.
@@ -3374,7 +3394,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedQuery()
 	 * @generated
 	 */
-	public static final int XML_NAMED_QUERY = 68;
+	public static final int XML_NAMED_QUERY = 70;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNullAttributeMapping <em>Xml Null Attribute Mapping</em>}' class.
@@ -3384,7 +3404,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNullAttributeMapping()
 	 * @generated
 	 */
-	public static final int XML_NULL_ATTRIBUTE_MAPPING = 70;
+	public static final int XML_NULL_ATTRIBUTE_MAPPING = 72;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
@@ -3394,7 +3414,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToMany()
 	 * @generated
 	 */
-	public static final int XML_ONE_TO_MANY = 71;
+	public static final int XML_ONE_TO_MANY = 73;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
@@ -3404,7 +3424,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToOne()
 	 * @generated
 	 */
-	public static final int XML_ONE_TO_ONE = 72;
+	public static final int XML_ONE_TO_ONE = 74;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOrderColumn <em>Xml Order Column</em>}' class.
@@ -3414,7 +3434,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOrderColumn()
 	 * @generated
 	 */
-	public static final int XML_ORDER_COLUMN = 74;
+	public static final int XML_ORDER_COLUMN = 76;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}' class.
@@ -3424,7 +3444,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlPersistenceUnitDefaults()
 	 * @generated
 	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 76;
+	public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 78;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class.
@@ -3434,7 +3454,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlPersistenceUnitMetadata()
 	 * @generated
 	 */
-	public static final int XML_PERSISTENCE_UNIT_METADATA = 77;
+	public static final int XML_PERSISTENCE_UNIT_METADATA = 79;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PostLoad <em>Post Load</em>}' class.
@@ -3444,7 +3464,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPostLoad()
 	 * @generated
 	 */
-	public static final int POST_LOAD = 79;
+	public static final int POST_LOAD = 81;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PostPersist <em>Post Persist</em>}' class.
@@ -3454,7 +3474,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPostPersist()
 	 * @generated
 	 */
-	public static final int POST_PERSIST = 80;
+	public static final int POST_PERSIST = 82;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PostRemove <em>Post Remove</em>}' class.
@@ -3464,7 +3484,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPostRemove()
 	 * @generated
 	 */
-	public static final int POST_REMOVE = 81;
+	public static final int POST_REMOVE = 83;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PostUpdate <em>Post Update</em>}' class.
@@ -3474,7 +3494,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPostUpdate()
 	 * @generated
 	 */
-	public static final int POST_UPDATE = 82;
+	public static final int POST_UPDATE = 84;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PrePersist <em>Pre Persist</em>}' class.
@@ -3484,7 +3504,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPrePersist()
 	 * @generated
 	 */
-	public static final int PRE_PERSIST = 83;
+	public static final int PRE_PERSIST = 85;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PreRemove <em>Pre Remove</em>}' class.
@@ -3494,7 +3514,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPreRemove()
 	 * @generated
 	 */
-	public static final int PRE_REMOVE = 84;
+	public static final int PRE_REMOVE = 86;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PreUpdate <em>Pre Update</em>}' class.
@@ -3504,7 +3524,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPreUpdate()
 	 * @generated
 	 */
-	public static final int PRE_UPDATE = 85;
+	public static final int PRE_UPDATE = 87;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlPrimaryKeyJoinColumn <em>Xml Primary Key Join Column</em>}' class.
@@ -3514,7 +3534,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumn()
 	 * @generated
 	 */
-	public static final int XML_PRIMARY_KEY_JOIN_COLUMN = 86;
+	public static final int XML_PRIMARY_KEY_JOIN_COLUMN = 88;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlQueryContainer <em>Xml Query Container</em>}' class.
@@ -3524,7 +3544,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQueryContainer()
 	 * @generated
 	 */
-	public static final int XML_QUERY_CONTAINER = 89;
+	public static final int XML_QUERY_CONTAINER = 91;
 
 	/**
 	 * The feature id for the '<em><b>Version</b></em>' attribute.
@@ -3804,7 +3824,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlForeignKey()
 	 * @generated
 	 */
-	public static final int XML_FOREIGN_KEY = 46;
+	public static final int XML_FOREIGN_KEY = 47;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -4057,7 +4077,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlIdClassContainer()
 	 * @generated
 	 */
-	public static final int XML_ID_CLASS_CONTAINER = 51;
+	public static final int XML_ID_CLASS_CONTAINER = 52;
 
 	/**
 	 * The feature id for the '<em><b>Id Class</b></em>' containment reference.
@@ -4085,7 +4105,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlIndex()
 	 * @generated
 	 */
-	public static final int XML_INDEX = 52;
+	public static final int XML_INDEX = 53;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -4239,7 +4259,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinColumnContainer()
 	 * @generated
 	 */
-	public static final int XML_JOIN_COLUMN_CONTAINER = 55;
+	public static final int XML_JOIN_COLUMN_CONTAINER = 56;
 
 	/**
 	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
@@ -4267,7 +4287,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlReferenceTable()
 	 * @generated
 	 */
-	public static final int XML_REFERENCE_TABLE = 78;
+	public static final int XML_REFERENCE_TABLE = 80;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -4367,7 +4387,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinTableContainer()
 	 * @generated
 	 */
-	public static final int XML_JOIN_TABLE_CONTAINER = 57;
+	public static final int XML_JOIN_TABLE_CONTAINER = 58;
 
 	/**
 	 * The feature id for the '<em><b>Join Table</b></em>' containment reference.
@@ -4712,40 +4732,40 @@ public class OrmPackage extends EPackageImpl
 	public static final int XML_MAPPED_BY_MAPPING_FEATURE_COUNT = 1;
 
 	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
+	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_MAPPED_SUPERCLASS__ACCESS = ABSTRACT_XML_TYPE_MAPPING__ACCESS;
+	public static final int XML_MAPPED_SUPERCLASS__CLASS_NAME = ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_MAPPED_SUPERCLASS__CLASS_NAME = ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME;
+	public static final int XML_MAPPED_SUPERCLASS__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION;
 
 	/**
-	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
+	 * The feature id for the '<em><b>Access</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_MAPPED_SUPERCLASS__METADATA_COMPLETE = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE;
+	public static final int XML_MAPPED_SUPERCLASS__ACCESS = ABSTRACT_XML_TYPE_MAPPING__ACCESS;
 
 	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_MAPPED_SUPERCLASS__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION;
+	public static final int XML_MAPPED_SUPERCLASS__METADATA_COMPLETE = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE;
 
 	/**
 	 * The feature id for the '<em><b>Attributes</b></em>' containment reference.
@@ -4809,7 +4829,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedAttributeNode()
 	 * @generated
 	 */
-	public static final int XML_NAMED_ATTRIBUTE_NODE = 64;
+	public static final int XML_NAMED_ATTRIBUTE_NODE = 66;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -4855,7 +4875,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedEntityGraph()
 	 * @generated
 	 */
-	public static final int XML_NAMED_ENTITY_GRAPH = 65;
+	public static final int XML_NAMED_ENTITY_GRAPH = 67;
 
 	/**
 	 * The feature id for the '<em><b>Named Attribute Nodes</b></em>' containment reference list.
@@ -4919,7 +4939,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedSubgraph()
 	 * @generated
 	 */
-	public static final int XML_NAMED_SUBGRAPH = 66;
+	public static final int XML_NAMED_SUBGRAPH = 68;
 
 	/**
 	 * The feature id for the '<em><b>Named Attribute Nodes</b></em>' containment reference list.
@@ -5118,7 +5138,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedStoredProcedureQuery()
 	 * @generated
 	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY = 69;
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY = 71;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -5127,7 +5147,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__DESCRIPTION = XML_QUERY__DESCRIPTION;
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__DESCRIPTION = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__DESCRIPTION;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -5136,7 +5156,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__NAME = XML_QUERY__NAME;
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__NAME = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__NAME;
 
 	/**
 	 * The feature id for the '<em><b>Hints</b></em>' containment reference list.
@@ -5145,7 +5165,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__HINTS = XML_QUERY__HINTS;
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__HINTS = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__HINTS;
 
 	/**
 	 * The feature id for the '<em><b>Result Classes</b></em>' attribute list.
@@ -5154,7 +5174,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES = XML_QUERY_FEATURE_COUNT + 0;
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES;
 
 	/**
 	 * The feature id for the '<em><b>Result Set Mappings</b></em>' attribute list.
@@ -5163,7 +5183,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS = XML_QUERY_FEATURE_COUNT + 1;
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS;
 
 	/**
 	 * The feature id for the '<em><b>Procedure Name</b></em>' attribute.
@@ -5172,7 +5192,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME = XML_QUERY_FEATURE_COUNT + 2;
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME;
 
 	/**
 	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
@@ -5181,7 +5201,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS = XML_QUERY_FEATURE_COUNT + 3;
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS;
 
 	/**
 	 * The number of structural features of the '<em>Xml Named Stored Procedure Query</em>' class.
@@ -5190,7 +5210,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_FEATURE_COUNT = XML_QUERY_FEATURE_COUNT + 4;
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_FEATURE_COUNT = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21_FEATURE_COUNT + 0;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter <em>Xml Stored Procedure Parameter</em>}' class.
@@ -5200,7 +5220,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlStoredProcedureParameter()
 	 * @generated
 	 */
-	public static final int XML_STORED_PROCEDURE_PARAMETER = 94;
+	public static final int XML_STORED_PROCEDURE_PARAMETER = 96;
 
 	/**
 	 * The feature id for the '<em><b>Access</b></em>' attribute.
@@ -5588,7 +5608,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQueryHint()
 	 * @generated
 	 */
-	public static final int XML_QUERY_HINT = 90;
+	public static final int XML_QUERY_HINT = 92;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSecondaryTable <em>Xml Secondary Table</em>}' class.
@@ -5598,7 +5618,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSecondaryTable()
 	 * @generated
 	 */
-	public static final int XML_SECONDARY_TABLE = 91;
+	public static final int XML_SECONDARY_TABLE = 93;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSequenceGenerator <em>Xml Sequence Generator</em>}' class.
@@ -5608,7 +5628,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSequenceGenerator()
 	 * @generated
 	 */
-	public static final int XML_SEQUENCE_GENERATOR = 92;
+	public static final int XML_SEQUENCE_GENERATOR = 94;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTable <em>Xml Table</em>}' class.
@@ -5618,7 +5638,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTable()
 	 * @generated
 	 */
-	public static final int XML_TABLE = 95;
+	public static final int XML_TABLE = 97;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}' class.
@@ -5628,7 +5648,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTableGenerator()
 	 * @generated
 	 */
-	public static final int XML_TABLE_GENERATOR = 96;
+	public static final int XML_TABLE_GENERATOR = 98;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
@@ -5638,7 +5658,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTransient()
 	 * @generated
 	 */
-	public static final int XML_TRANSIENT = 97;
+	public static final int XML_TRANSIENT = 99;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlUniqueConstraint <em>Xml Unique Constraint</em>}' class.
@@ -5648,7 +5668,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlUniqueConstraint()
 	 * @generated
 	 */
-	public static final int XML_UNIQUE_CONSTRAINT = 99;
+	public static final int XML_UNIQUE_CONSTRAINT = 101;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
@@ -5658,7 +5678,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlVersion()
 	 * @generated
 	 */
-	public static final int XML_VERSION = 100;
+	public static final int XML_VERSION = 102;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOrderable <em>Xml Orderable</em>}' class.
@@ -5668,7 +5688,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOrderable()
 	 * @generated
 	 */
-	public static final int XML_ORDERABLE = 73;
+	public static final int XML_ORDERABLE = 75;
 
 	/**
 	 * The feature id for the '<em><b>Order Column</b></em>' containment reference.
@@ -6110,7 +6130,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumnContainer()
 	 * @generated
 	 */
-	public static final int XML_PRIMARY_KEY_JOIN_COLUMN_CONTAINER = 87;
+	public static final int XML_PRIMARY_KEY_JOIN_COLUMN_CONTAINER = 89;
 
 	/**
 	 * The feature id for the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
@@ -6354,7 +6374,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSqlResultSetMapping()
 	 * @generated
 	 */
-	public static final int XML_SQL_RESULT_SET_MAPPING = 93;
+	public static final int XML_SQL_RESULT_SET_MAPPING = 95;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -6420,13 +6440,13 @@ public class OrmPackage extends EPackageImpl
 	public static final int XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION = OrmV2_1Package.XML_STORED_PROCEDURE_PARAMETER_21__DESCRIPTION;
 
 	/**
-	 * The feature id for the '<em><b>Parameter Mode</b></em>' attribute.
+	 * The feature id for the '<em><b>Mode</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE = OrmV2_1Package.XML_STORED_PROCEDURE_PARAMETER_21__PARAMETER_MODE;
+	public static final int XML_STORED_PROCEDURE_PARAMETER__MODE = OrmV2_1Package.XML_STORED_PROCEDURE_PARAMETER_21__MODE;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -6654,6 +6674,60 @@ public class OrmPackage extends EPackageImpl
 	public static final int XML_TRANSIENT_FEATURE_COUNT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
 
 	/**
+	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_TYPE_MAPPING__CLASS_NAME = XML_MANAGED_TYPE__CLASS_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_TYPE_MAPPING__DESCRIPTION = XML_MANAGED_TYPE__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Access</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_TYPE_MAPPING__ACCESS = XML_MANAGED_TYPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_TYPE_MAPPING__METADATA_COMPLETE = XML_MANAGED_TYPE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Attributes</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_TYPE_MAPPING__ATTRIBUTES = XML_MANAGED_TYPE_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Xml Type Mapping</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_TYPE_MAPPING_FEATURE_COUNT = XML_MANAGED_TYPE_FEATURE_COUNT + 3;
+
+	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -6760,7 +6834,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getDiscriminatorType()
 	 * @generated
 	 */
-	public static final int DISCRIMINATOR_TYPE = 101;
+	public static final int DISCRIMINATOR_TYPE = 103;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.EnumType <em>Enum Type</em>}' enum.
@@ -6770,7 +6844,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEnumType()
 	 * @generated
 	 */
-	public static final int ENUM_TYPE = 102;
+	public static final int ENUM_TYPE = 104;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.FetchType <em>Fetch Type</em>}' enum.
@@ -6780,7 +6854,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getFetchType()
 	 * @generated
 	 */
-	public static final int FETCH_TYPE = 103;
+	public static final int FETCH_TYPE = 105;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.GenerationType <em>Generation Type</em>}' enum.
@@ -6790,7 +6864,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getGenerationType()
 	 * @generated
 	 */
-	public static final int GENERATION_TYPE = 104;
+	public static final int GENERATION_TYPE = 106;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.InheritanceType <em>Inheritance Type</em>}' enum.
@@ -6800,7 +6874,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getInheritanceType()
 	 * @generated
 	 */
-	public static final int INHERITANCE_TYPE = 105;
+	public static final int INHERITANCE_TYPE = 107;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.TemporalType <em>Temporal Type</em>}' enum.
@@ -6810,7 +6884,7 @@ public class OrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getTemporalType()
 	 * @generated
 	 */
-	public static final int TEMPORAL_TYPE = 106;
+	public static final int TEMPORAL_TYPE = 108;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6880,6 +6954,13 @@ public class OrmPackage extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass abstractXmlManagedTypeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass abstractXmlNamedColumnEClass = null;
 
 	/**
@@ -7223,6 +7304,13 @@ public class OrmPackage extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass xmlManagedTypeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass xmlManyToManyEClass = null;
 
 	/**
@@ -7932,6 +8020,20 @@ public class OrmPackage extends EPackageImpl
 
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType <em>Abstract Xml Managed Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Abstract Xml Managed Type</em>'.
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType
+	 * @generated
+	 */
+	public EClass getAbstractXmlManagedType()
+	{
+		return abstractXmlManagedTypeEClass;
+	}
+
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlNamedColumn <em>Abstract Xml Named Column</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -9828,6 +9930,50 @@ public class OrmPackage extends EPackageImpl
 	}
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType <em>Xml Managed Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Xml Managed Type</em>'.
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType
+	 * @generated
+	 */
+	public EClass getXmlManagedType()
+	{
+		return xmlManagedTypeEClass;
+	}
+
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType#getClassName <em>Class Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Class Name</em>'.
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType#getClassName()
+	 * @see #getXmlManagedType()
+	 * @generated
+	 */
+	public EAttribute getXmlManagedType_ClassName()
+	{
+		return (EAttribute)xmlManagedTypeEClass.getEStructuralFeatures().get(0);
+	}
+
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType#getDescription <em>Description</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Description</em>'.
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType#getDescription()
+	 * @see #getXmlManagedType()
+	 * @generated
+	 */
+	public EAttribute getXmlManagedType_Description()
+	{
+		return (EAttribute)xmlManagedTypeEClass.getEStructuralFeatures().get(1);
+	}
+
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -10870,20 +11016,6 @@ public class OrmPackage extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getClassName <em>Class Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Class Name</em>'.
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getClassName()
-	 * @see #getXmlTypeMapping()
-	 * @generated
-	 */
-	public EAttribute getXmlTypeMapping_ClassName()
-	{
-		return (EAttribute)xmlTypeMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getMetadataComplete <em>Metadata Complete</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -10894,21 +11026,7 @@ public class OrmPackage extends EPackageImpl
 	 */
 	public EAttribute getXmlTypeMapping_MetadataComplete()
 	{
-		return (EAttribute)xmlTypeMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getDescription()
-	 * @see #getXmlTypeMapping()
-	 * @generated
-	 */
-	public EAttribute getXmlTypeMapping_Description()
-	{
-		return (EAttribute)xmlTypeMappingEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)xmlTypeMappingEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -10922,7 +11040,7 @@ public class OrmPackage extends EPackageImpl
 	 */
 	public EReference getXmlTypeMapping_Attributes()
 	{
-		return (EReference)xmlTypeMappingEClass.getEStructuralFeatures().get(3);
+		return (EReference)xmlTypeMappingEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -11133,6 +11251,8 @@ public class OrmPackage extends EPackageImpl
 		xmlBaseJoinColumnEClass = createEClass(XML_BASE_JOIN_COLUMN);
 		createEAttribute(xmlBaseJoinColumnEClass, XML_BASE_JOIN_COLUMN__REFERENCED_COLUMN_NAME);
 
+		abstractXmlManagedTypeEClass = createEClass(ABSTRACT_XML_MANAGED_TYPE);
+
 		abstractXmlNamedColumnEClass = createEClass(ABSTRACT_XML_NAMED_COLUMN);
 
 		abstractXmlRelationshipMappingEClass = createEClass(ABSTRACT_XML_RELATIONSHIP_MAPPING);
@@ -11322,6 +11442,10 @@ public class OrmPackage extends EPackageImpl
 
 		lobEClass = createEClass(LOB);
 
+		xmlManagedTypeEClass = createEClass(XML_MANAGED_TYPE);
+		createEAttribute(xmlManagedTypeEClass, XML_MANAGED_TYPE__CLASS_NAME);
+		createEAttribute(xmlManagedTypeEClass, XML_MANAGED_TYPE__DESCRIPTION);
+
 		xmlManyToManyEClass = createEClass(XML_MANY_TO_MANY);
 
 		xmlManyToOneEClass = createEClass(XML_MANY_TO_ONE);
@@ -11438,9 +11562,7 @@ public class OrmPackage extends EPackageImpl
 		xmlTransientEClass = createEClass(XML_TRANSIENT);
 
 		xmlTypeMappingEClass = createEClass(XML_TYPE_MAPPING);
-		createEAttribute(xmlTypeMappingEClass, XML_TYPE_MAPPING__CLASS_NAME);
 		createEAttribute(xmlTypeMappingEClass, XML_TYPE_MAPPING__METADATA_COMPLETE);
-		createEAttribute(xmlTypeMappingEClass, XML_TYPE_MAPPING__DESCRIPTION);
 		createEReference(xmlTypeMappingEClass, XML_TYPE_MAPPING__ATTRIBUTES);
 
 		xmlUniqueConstraintEClass = createEClass(XML_UNIQUE_CONSTRAINT);
@@ -11511,6 +11633,7 @@ public class OrmPackage extends EPackageImpl
 		abstractXmlMultiRelationshipMappingEClass.getESuperTypes().add(theOrmV2_0Package.getXmlMultiRelationshipMapping_2_0());
 		xmlBaseDiscriminatorColumnEClass.getESuperTypes().add(this.getXmlNamedColumn());
 		xmlBaseJoinColumnEClass.getESuperTypes().add(this.getXmlNamedColumn());
+		abstractXmlManagedTypeEClass.getESuperTypes().add(this.getXmlManagedType());
 		abstractXmlNamedColumnEClass.getESuperTypes().add(this.getXmlNamedColumn());
 		abstractXmlRelationshipMappingEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
 		abstractXmlSingleRelationshipMappingEClass.getESuperTypes().add(this.getAbstractXmlRelationshipMapping());
@@ -11519,6 +11642,7 @@ public class OrmPackage extends EPackageImpl
 		abstractXmlSingleRelationshipMappingEClass.getESuperTypes().add(theOrmV2_0Package.getXmlSingleRelationshipMapping_2_0());
 		abstractXmlReferenceTableEClass.getESuperTypes().add(this.getAbstractXmlTable());
 		abstractXmlReferenceTableEClass.getESuperTypes().add(this.getXmlReferenceTable());
+		abstractXmlTypeMappingEClass.getESuperTypes().add(this.getAbstractXmlManagedType());
 		abstractXmlTypeMappingEClass.getESuperTypes().add(this.getXmlTypeMapping());
 		xmlAttributeMappingEClass.getESuperTypes().add(theOrmV2_0Package.getXmlAttributeMapping_2_0());
 		xmlAssociationOverrideEClass.getESuperTypes().add(this.getXmlOverride());
@@ -11539,6 +11663,7 @@ public class OrmPackage extends EPackageImpl
 		columnResultEClass.getESuperTypes().add(theOrmV2_1Package.getColumnResult_2_1());
 		constructorResultEClass.getESuperTypes().add(theOrmV2_1Package.getConstructorResult_2_1());
 		xmlConvertEClass.getESuperTypes().add(theOrmV2_1Package.getXmlConvert_2_1());
+		xmlConverterEClass.getESuperTypes().add(this.getAbstractXmlManagedType());
 		xmlConverterEClass.getESuperTypes().add(theOrmV2_1Package.getXmlConverter_2_1());
 		xmlConvertibleMappingEClass.getESuperTypes().add(theOrmV2_1Package.getXmlConvertibleMapping_2_1());
 		xmlDiscriminatorColumnEClass.getESuperTypes().add(this.getAbstractXmlBaseDiscriminatorColumn());
@@ -11590,7 +11715,6 @@ public class OrmPackage extends EPackageImpl
 		xmlNamedNativeQueryEClass.getESuperTypes().add(this.getXmlQuery());
 		xmlNamedQueryEClass.getESuperTypes().add(this.getXmlQuery());
 		xmlNamedQueryEClass.getESuperTypes().add(theOrmV2_0Package.getXmlNamedQuery_2_0());
-		xmlNamedStoredProcedureQueryEClass.getESuperTypes().add(this.getXmlQuery());
 		xmlNamedStoredProcedureQueryEClass.getESuperTypes().add(theOrmV2_1Package.getXmlNamedStoredProcedureQuery_2_1());
 		xmlNullAttributeMappingEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
 		xmlOneToManyEClass.getESuperTypes().add(this.getAbstractXmlMultiRelationshipMapping());
@@ -11632,6 +11756,7 @@ public class OrmPackage extends EPackageImpl
 		xmlTableGeneratorEClass.getESuperTypes().add(this.getXmlGenerator());
 		xmlTableGeneratorEClass.getESuperTypes().add(theOrmV2_1Package.getXmlTableGenerator_2_1());
 		xmlTransientEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
+		xmlTypeMappingEClass.getESuperTypes().add(this.getXmlManagedType());
 		xmlTypeMappingEClass.getESuperTypes().add(this.getXmlAccessHolder());
 		xmlUniqueConstraintEClass.getESuperTypes().add(theOrmV2_0Package.getXmlUniqueConstraint_2_0());
 		xmlVersionEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
@@ -11668,6 +11793,8 @@ public class OrmPackage extends EPackageImpl
 		initEClass(xmlBaseJoinColumnEClass, XmlBaseJoinColumn.class, "XmlBaseJoinColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getXmlBaseJoinColumn_ReferencedColumnName(), theXMLTypePackage.getString(), "referencedColumnName", null, 0, 1, XmlBaseJoinColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(abstractXmlManagedTypeEClass, AbstractXmlManagedType.class, "AbstractXmlManagedType", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
 		initEClass(abstractXmlNamedColumnEClass, AbstractXmlNamedColumn.class, "AbstractXmlNamedColumn", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(abstractXmlRelationshipMappingEClass, AbstractXmlRelationshipMapping.class, "AbstractXmlRelationshipMapping", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -11857,6 +11984,10 @@ public class OrmPackage extends EPackageImpl
 
 		initEClass(lobEClass, Lob.class, "Lob", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
+		initEClass(xmlManagedTypeEClass, XmlManagedType.class, "XmlManagedType", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getXmlManagedType_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, XmlManagedType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getXmlManagedType_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlManagedType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		initEClass(xmlManyToManyEClass, XmlManyToMany.class, "XmlManyToMany", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(xmlManyToOneEClass, XmlManyToOne.class, "XmlManyToOne", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -11973,9 +12104,7 @@ public class OrmPackage extends EPackageImpl
 		initEClass(xmlTransientEClass, XmlTransient.class, "XmlTransient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(xmlTypeMappingEClass, XmlTypeMapping.class, "XmlTypeMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlTypeMapping_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, XmlTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getXmlTypeMapping_MetadataComplete(), theXMLTypePackage.getBooleanObject(), "metadataComplete", null, 0, 1, XmlTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlTypeMapping_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getXmlTypeMapping_Attributes(), this.getAttributes(), null, "attributes", null, 0, 1, XmlTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(xmlUniqueConstraintEClass, XmlUniqueConstraint.class, "XmlUniqueConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -12210,6 +12339,16 @@ public class OrmPackage extends EPackageImpl
 		public static final EAttribute XML_BASE_JOIN_COLUMN__REFERENCED_COLUMN_NAME = eINSTANCE.getXmlBaseJoinColumn_ReferencedColumnName();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType <em>Abstract Xml Managed Type</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType
+		 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlManagedType()
+		 * @generated
+		 */
+		public static final EClass ABSTRACT_XML_MANAGED_TYPE = eINSTANCE.getAbstractXmlManagedType();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlNamedColumn <em>Abstract Xml Named Column</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -13412,6 +13551,32 @@ public class OrmPackage extends EPackageImpl
 		public static final EClass LOB = eINSTANCE.getLob();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType <em>Xml Managed Type</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType
+		 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManagedType()
+		 * @generated
+		 */
+		public static final EClass XML_MANAGED_TYPE = eINSTANCE.getXmlManagedType();
+
+		/**
+		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public static final EAttribute XML_MANAGED_TYPE__CLASS_NAME = eINSTANCE.getXmlManagedType_ClassName();
+
+		/**
+		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public static final EAttribute XML_MANAGED_TYPE__DESCRIPTION = eINSTANCE.getXmlManagedType_Description();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -14100,14 +14265,6 @@ public class OrmPackage extends EPackageImpl
 		public static final EClass XML_TYPE_MAPPING = eINSTANCE.getXmlTypeMapping();
 
 		/**
-		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TYPE_MAPPING__CLASS_NAME = eINSTANCE.getXmlTypeMapping_ClassName();
-
-		/**
 		 * The meta object literal for the '<em><b>Metadata Complete</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -14116,14 +14273,6 @@ public class OrmPackage extends EPackageImpl
 		public static final EAttribute XML_TYPE_MAPPING__METADATA_COMPLETE = eINSTANCE.getXmlTypeMapping_MetadataComplete();
 
 		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TYPE_MAPPING__DESCRIPTION = eINSTANCE.getXmlTypeMapping_Description();
-
-		/**
 		 * The meta object literal for the '<em><b>Attributes</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java
index 60cff490d4..86d33c7f8a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java
@@ -18,7 +18,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 import org.eclipse.jpt.common.core.internal.utility.translators.BooleanTranslator;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
@@ -40,49 +39,9 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1
+public class XmlConverter extends AbstractXmlManagedType implements XmlConverter_2_1
 {
 	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CLASS_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String className = CLASS_NAME_EDEFAULT;
-
-	/**
 	 * The default value of the '{@link #getAutoApply() <em>Auto Apply</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -124,76 +83,6 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1
 	}
 
 	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConverter_2_1_Description()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getDescription()
-	{
-		return description;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	public void setDescription(String newDescription)
-	{
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_CONVERTER__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Class 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>Class Name</em>' attribute.
-	 * @see #setClassName(String)
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConverter_2_1_ClassName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getClassName()
-	{
-		return className;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter#getClassName <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Name</em>' attribute.
-	 * @see #getClassName()
-	 * @generated
-	 */
-	public void setClassName(String newClassName)
-	{
-		String oldClassName = className;
-		className = newClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_CONVERTER__CLASS_NAME, oldClassName, className));
-	}
-
-	/**
 	 * Returns the value of the '<em><b>Auto Apply</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -238,10 +127,6 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1
 	{
 		switch (featureID)
 		{
-			case OrmPackage.XML_CONVERTER__DESCRIPTION:
-				return getDescription();
-			case OrmPackage.XML_CONVERTER__CLASS_NAME:
-				return getClassName();
 			case OrmPackage.XML_CONVERTER__AUTO_APPLY:
 				return getAutoApply();
 		}
@@ -258,12 +143,6 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1
 	{
 		switch (featureID)
 		{
-			case OrmPackage.XML_CONVERTER__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case OrmPackage.XML_CONVERTER__CLASS_NAME:
-				setClassName((String)newValue);
-				return;
 			case OrmPackage.XML_CONVERTER__AUTO_APPLY:
 				setAutoApply((Boolean)newValue);
 				return;
@@ -281,12 +160,6 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1
 	{
 		switch (featureID)
 		{
-			case OrmPackage.XML_CONVERTER__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case OrmPackage.XML_CONVERTER__CLASS_NAME:
-				setClassName(CLASS_NAME_EDEFAULT);
-				return;
 			case OrmPackage.XML_CONVERTER__AUTO_APPLY:
 				setAutoApply(AUTO_APPLY_EDEFAULT);
 				return;
@@ -304,10 +177,6 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1
 	{
 		switch (featureID)
 		{
-			case OrmPackage.XML_CONVERTER__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case OrmPackage.XML_CONVERTER__CLASS_NAME:
-				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
 			case OrmPackage.XML_CONVERTER__AUTO_APPLY:
 				return AUTO_APPLY_EDEFAULT == null ? autoApply != null : !AUTO_APPLY_EDEFAULT.equals(autoApply);
 		}
@@ -320,16 +189,50 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1
 	 * @generated
 	 */
 	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+	{
+		if (baseClass == XmlConverter_2_1.class)
+		{
+			switch (derivedFeatureID)
+			{
+				case OrmPackage.XML_CONVERTER__AUTO_APPLY: return OrmV2_1Package.XML_CONVERTER_21__AUTO_APPLY;
+				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 == XmlConverter_2_1.class)
+		{
+			switch (baseFeatureID)
+			{
+				case OrmV2_1Package.XML_CONVERTER_21__AUTO_APPLY: return OrmPackage.XML_CONVERTER__AUTO_APPLY;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public String toString()
 	{
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", className: ");
-		result.append(className);
-		result.append(", autoApply: ");
+		result.append(" (autoApply: ");
 		result.append(autoApply);
 		result.append(')');
 		return result.toString();
@@ -358,13 +261,5 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1
 	protected static Translator buildAutoApplyTranslator() {
 		return new BooleanTranslator(JPA2_1.AUTO_APPLY, OrmV2_1Package.eINSTANCE.getXmlConverter_2_1_AutoApply(), Translator.DOM_ATTRIBUTE);
 	}
-	
-	protected static Translator buildDescriptionTranslator() {
-		return new Translator(JPA.DESCRIPTION, OrmV2_1Package.eINSTANCE.getXmlConverter_2_1_Description());
-	}
-	
-	protected static Translator buildClassTranslator() {
-		return new Translator(JPA.CLASS, OrmV2_1Package.eINSTANCE.getXmlConverter_2_1_ClassName(), Translator.DOM_ATTRIBUTE);
-	}
 
 } // XmlConverter
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManagedType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManagedType.java
new file mode 100644
index 0000000000..11858b238f
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManagedType.java
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.jpa.core.resource.orm;
+
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.utility.TextRange;
+import org.eclipse.text.edits.ReplaceEdit;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Managed Type</b></em>'.
+ * 
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType#getClassName <em>Class Name</em>}</li>
+ *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType#getDescription <em>Description</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManagedType()
+ * @model kind="class" interface="true" abstract="true"
+ * @extends EBaseObject
+ * @generated
+ */
+public interface XmlManagedType extends EBaseObject
+{
+	/**
+	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Class 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>Class Name</em>' attribute.
+	 * @see #setClassName(String)
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManagedType_ClassName()
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+	 * @generated
+	 */
+	String getClassName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType#getClassName <em>Class Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Class Name</em>' attribute.
+	 * @see #getClassName()
+	 * @generated
+	 */
+	void setClassName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Description</em>' attribute.
+	 * @see #setDescription(String)
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManagedType_Description()
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+	 * @generated
+	 */
+	String getDescription();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType#getDescription <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Description</em>' attribute.
+	 * @see #getDescription()
+	 * @generated
+	 */
+	void setDescription(String value);
+
+
+	TextRange getClassTextRange();
+
+	// ********** refactoring **********
+
+	ReplaceEdit createRenameTypeEdit(IType originalType, String newName);
+
+	ReplaceEdit createRenamePackageEdit(String newName);
+
+
+	// ********** content assist *********
+
+	boolean classNameTouches(int pos);
+
+} // XmlManagedType
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java
index aee536752f..13978551c0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java
@@ -53,7 +53,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements XmlQuery, XmlNamedStoredProcedureQuery_2_1
+public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements XmlNamedStoredProcedureQuery_2_1
 {
 	/**
 	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
@@ -528,50 +528,6 @@ public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements Xml
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlNamedStoredProcedureQuery_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES;
-				case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS;
-				case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME;
-				case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS;
-				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 == XmlNamedStoredProcedureQuery_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES;
-				case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS;
-				case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME;
-				case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
 	public String toString()
 	{
 		if (eIsProxy()) return super.toString();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlStoredProcedureParameter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlStoredProcedureParameter.java
index 198842f06e..be716cf004 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlStoredProcedureParameter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlStoredProcedureParameter.java
@@ -64,24 +64,24 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS
 	protected String description = DESCRIPTION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getParameterMode() <em>Parameter Mode</em>}' attribute.
+	 * The default value of the '{@link #getMode() <em>Mode</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getParameterMode()
+	 * @see #getMode()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final ParameterMode_2_1 PARAMETER_MODE_EDEFAULT = ParameterMode_2_1.IN;
+	protected static final ParameterMode_2_1 MODE_EDEFAULT = ParameterMode_2_1.IN;
 
 	/**
-	 * The cached value of the '{@link #getParameterMode() <em>Parameter Mode</em>}' attribute.
+	 * The cached value of the '{@link #getMode() <em>Mode</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getParameterMode()
+	 * @see #getMode()
 	 * @generated
 	 * @ordered
 	 */
-	protected ParameterMode_2_1 parameterMode = PARAMETER_MODE_EDEFAULT;
+	protected ParameterMode_2_1 mode = MODE_EDEFAULT;
 
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -180,41 +180,41 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS
 	}
 
 	/**
-	 * Returns the value of the '<em><b>Parameter Mode</b></em>' attribute.
+	 * Returns the value of the '<em><b>Mode</b></em>' attribute.
 	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Parameter Mode</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Mode</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parameter Mode</em>' attribute.
+	 * @return the value of the '<em>Mode</em>' attribute.
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1
-	 * @see #setParameterMode(ParameterMode_2_1)
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlStoredProcedureParameter_2_1_ParameterMode()
+	 * @see #setMode(ParameterMode_2_1)
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlStoredProcedureParameter_2_1_Mode()
 	 * @model
 	 * @generated
 	 */
-	public ParameterMode_2_1 getParameterMode()
+	public ParameterMode_2_1 getMode()
 	{
-		return parameterMode;
+		return mode;
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter#getParameterMode <em>Parameter Mode</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter#getMode <em>Mode</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parameter Mode</em>' attribute.
+	 * @param value the new value of the '<em>Mode</em>' attribute.
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1
-	 * @see #getParameterMode()
+	 * @see #getMode()
 	 * @generated
 	 */
-	public void setParameterMode(ParameterMode_2_1 newParameterMode)
+	public void setMode(ParameterMode_2_1 newMode)
 	{
-		ParameterMode_2_1 oldParameterMode = parameterMode;
-		parameterMode = newParameterMode == null ? PARAMETER_MODE_EDEFAULT : newParameterMode;
+		ParameterMode_2_1 oldMode = mode;
+		mode = newMode == null ? MODE_EDEFAULT : newMode;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE, oldParameterMode, parameterMode));
+			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_STORED_PROCEDURE_PARAMETER__MODE, oldMode, mode));
 	}
 
 	/**
@@ -299,8 +299,8 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS
 		{
 			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION:
 				return getDescription();
-			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE:
-				return getParameterMode();
+			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__MODE:
+				return getMode();
 			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME:
 				return getName();
 			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__CLASS_NAME:
@@ -322,8 +322,8 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS
 			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION:
 				setDescription((String)newValue);
 				return;
-			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE:
-				setParameterMode((ParameterMode_2_1)newValue);
+			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__MODE:
+				setMode((ParameterMode_2_1)newValue);
 				return;
 			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME:
 				setName((String)newValue);
@@ -348,8 +348,8 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS
 			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION:
 				setDescription(DESCRIPTION_EDEFAULT);
 				return;
-			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE:
-				setParameterMode(PARAMETER_MODE_EDEFAULT);
+			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__MODE:
+				setMode(MODE_EDEFAULT);
 				return;
 			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME:
 				setName(NAME_EDEFAULT);
@@ -373,8 +373,8 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS
 		{
 			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION:
 				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE:
-				return parameterMode != PARAMETER_MODE_EDEFAULT;
+			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__MODE:
+				return mode != MODE_EDEFAULT;
 			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 			case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__CLASS_NAME:
@@ -396,8 +396,8 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (description: ");
 		result.append(description);
-		result.append(", parameterMode: ");
-		result.append(parameterMode);
+		result.append(", mode: ");
+		result.append(mode);
 		result.append(", name: ");
 		result.append(name);
 		result.append(", className: ");
@@ -422,8 +422,8 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS
 		return new Translator[] {
 			buildNameTranslator(),
 			buildClassTranslator(),
+			buildModeTranslator(),
 			buildDescriptionTranslator(),
-			buildParameterModeTranslator(),
 		};
 	}
 
@@ -439,7 +439,7 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS
 		return new Translator(JPA.DESCRIPTION, OrmV2_1Package.eINSTANCE.getXmlStoredProcedureParameter_2_1_Description());
 	}
 
-	protected static Translator buildParameterModeTranslator() {
-		return new Translator(JPA2_1.PARAMETER_MODE, OrmV2_1Package.eINSTANCE.getXmlStoredProcedureParameter_2_1_ParameterMode());
+	protected static Translator buildModeTranslator() {
+		return new Translator(JPA2_1.MODE, OrmV2_1Package.eINSTANCE.getXmlStoredProcedureParameter_2_1_Mode(), Translator.DOM_ATTRIBUTE);
 	}
 } // XmlStoredProcedureParameter
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTypeMapping.java
index 79c3414c8d..528b1bd4e2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTypeMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2013 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.
@@ -9,9 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm;
 
-import org.eclipse.jdt.core.IType;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.text.edits.ReplaceEdit;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,9 +26,7 @@ import org.eclipse.text.edits.ReplaceEdit;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getClassName <em>Class Name</em>}</li>
  *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getMetadataComplete <em>Metadata Complete</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getAttributes <em>Attributes</em>}</li>
  * </ul>
  * </p>
@@ -39,35 +35,9 @@ import org.eclipse.text.edits.ReplaceEdit;
  * @model kind="class" interface="true" abstract="true"
  * @generated
  */
-public interface XmlTypeMapping extends XmlAccessHolder
+public interface XmlTypeMapping extends XmlManagedType, XmlAccessHolder
 {
 	/**
-	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Class 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>Class Name</em>' attribute.
-	 * @see #setClassName(String)
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTypeMapping_ClassName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	String getClassName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getClassName <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Name</em>' attribute.
-	 * @see #getClassName()
-	 * @generated
-	 */
-	void setClassName(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Metadata Complete</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -94,32 +64,6 @@ public interface XmlTypeMapping extends XmlAccessHolder
 	void setMetadataComplete(Boolean value);
 
 	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTypeMapping_Description()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Attributes</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -144,8 +88,6 @@ public interface XmlTypeMapping extends XmlAccessHolder
 	 * @generated
 	 */
 	void setAttributes(Attributes value);
-	
-	TextRange getClassTextRange();
 
 	TextRange getAttributesTextRange();
 	
@@ -154,14 +96,4 @@ public interface XmlTypeMapping extends XmlAccessHolder
 	//TODO not happy with this, or the corresponding one in XmlAttributeMapping
 	String getMappingKey();
 
-
-	// ********** refactoring **********
-
-	ReplaceEdit createRenameTypeEdit(IType originalType, String newName);
-
-	ReplaceEdit createRenamePackageEdit(String newName);
-
-	// ********** content assist *********
-
-	boolean classNameTouches(int pos);
 } // XmlTypeMapping
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java
index 63bae07b62..aee2d764a0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java
@@ -281,22 +281,22 @@ public class OrmV2_1Package extends EPackageImpl
 	public static final int XML_CONVERTER_21 = 5;
 
 	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_CONVERTER_21__DESCRIPTION = 0;
+	public static final int XML_CONVERTER_21__CLASS_NAME = OrmPackage.XML_MANAGED_TYPE__CLASS_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_CONVERTER_21__CLASS_NAME = 1;
+	public static final int XML_CONVERTER_21__DESCRIPTION = OrmPackage.XML_MANAGED_TYPE__DESCRIPTION;
 
 	/**
 	 * The feature id for the '<em><b>Auto Apply</b></em>' attribute.
@@ -305,7 +305,7 @@ public class OrmV2_1Package extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_CONVERTER_21__AUTO_APPLY = 2;
+	public static final int XML_CONVERTER_21__AUTO_APPLY = OrmPackage.XML_MANAGED_TYPE_FEATURE_COUNT + 0;
 
 	/**
 	 * The number of structural features of the '<em>Xml Converter 21</em>' class.
@@ -314,7 +314,7 @@ public class OrmV2_1Package extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_CONVERTER_21_FEATURE_COUNT = 3;
+	public static final int XML_CONVERTER_21_FEATURE_COUNT = OrmPackage.XML_MANAGED_TYPE_FEATURE_COUNT + 1;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverterContainer_2_1 <em>Xml Converter Container 21</em>}' class.
@@ -988,13 +988,40 @@ public class OrmV2_1Package extends EPackageImpl
 	public static final int XML_NAMED_ENTITY_GRAPH_21_FEATURE_COUNT = 5;
 
 	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__DESCRIPTION = OrmPackage.XML_QUERY__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__NAME = OrmPackage.XML_QUERY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Hints</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__HINTS = OrmPackage.XML_QUERY__HINTS;
+
+	/**
 	 * The feature id for the '<em><b>Result Classes</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES = 0;
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES = OrmPackage.XML_QUERY_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Result Set Mappings</b></em>' attribute list.
@@ -1003,7 +1030,7 @@ public class OrmV2_1Package extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS = 1;
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS = OrmPackage.XML_QUERY_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Procedure Name</b></em>' attribute.
@@ -1012,7 +1039,7 @@ public class OrmV2_1Package extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME = 2;
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME = OrmPackage.XML_QUERY_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
@@ -1021,7 +1048,7 @@ public class OrmV2_1Package extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS = 3;
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS = OrmPackage.XML_QUERY_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of structural features of the '<em>Xml Named Stored Procedure Query 21</em>' class.
@@ -1030,7 +1057,7 @@ public class OrmV2_1Package extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21_FEATURE_COUNT = 4;
+	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21_FEATURE_COUNT = OrmPackage.XML_QUERY_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>Named Attribute Nodes</b></em>' containment reference list.
@@ -1177,13 +1204,13 @@ public class OrmV2_1Package extends EPackageImpl
 	public static final int XML_STORED_PROCEDURE_PARAMETER_21__DESCRIPTION = 0;
 
 	/**
-	 * The feature id for the '<em><b>Parameter Mode</b></em>' attribute.
+	 * The feature id for the '<em><b>Mode</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_STORED_PROCEDURE_PARAMETER_21__PARAMETER_MODE = 1;
+	public static final int XML_STORED_PROCEDURE_PARAMETER_21__MODE = 1;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1803,34 +1830,6 @@ public class OrmV2_1Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getDescription()
-	 * @see #getXmlConverter_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlConverter_2_1_Description()
-	{
-		return (EAttribute)xmlConverter_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getClassName <em>Class Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Class Name</em>'.
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getClassName()
-	 * @see #getXmlConverter_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlConverter_2_1_ClassName()
-	{
-		return (EAttribute)xmlConverter_2_1EClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getAutoApply <em>Auto Apply</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1841,7 +1840,7 @@ public class OrmV2_1Package extends EPackageImpl
 	 */
 	public EAttribute getXmlConverter_2_1_AutoApply()
 	{
-		return (EAttribute)xmlConverter_2_1EClass.getEStructuralFeatures().get(2);
+		return (EAttribute)xmlConverter_2_1EClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -2640,15 +2639,15 @@ public class OrmV2_1Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getParameterMode <em>Parameter Mode</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getMode <em>Mode</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Parameter Mode</em>'.
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getParameterMode()
+	 * @return the meta object for the attribute '<em>Mode</em>'.
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getMode()
 	 * @see #getXmlStoredProcedureParameter_2_1()
 	 * @generated
 	 */
-	public EAttribute getXmlStoredProcedureParameter_2_1_ParameterMode()
+	public EAttribute getXmlStoredProcedureParameter_2_1_Mode()
 	{
 		return (EAttribute)xmlStoredProcedureParameter_2_1EClass.getEStructuralFeatures().get(1);
 	}
@@ -3043,8 +3042,6 @@ public class OrmV2_1Package extends EPackageImpl
 		createEAttribute(xmlConvert_2_1EClass, XML_CONVERT_21__DISABLE_CONVERSION);
 
 		xmlConverter_2_1EClass = createEClass(XML_CONVERTER_21);
-		createEAttribute(xmlConverter_2_1EClass, XML_CONVERTER_21__DESCRIPTION);
-		createEAttribute(xmlConverter_2_1EClass, XML_CONVERTER_21__CLASS_NAME);
 		createEAttribute(xmlConverter_2_1EClass, XML_CONVERTER_21__AUTO_APPLY);
 
 		xmlConverterContainer_2_1EClass = createEClass(XML_CONVERTER_CONTAINER_21);
@@ -3134,7 +3131,7 @@ public class OrmV2_1Package extends EPackageImpl
 
 		xmlStoredProcedureParameter_2_1EClass = createEClass(XML_STORED_PROCEDURE_PARAMETER_21);
 		createEAttribute(xmlStoredProcedureParameter_2_1EClass, XML_STORED_PROCEDURE_PARAMETER_21__DESCRIPTION);
-		createEAttribute(xmlStoredProcedureParameter_2_1EClass, XML_STORED_PROCEDURE_PARAMETER_21__PARAMETER_MODE);
+		createEAttribute(xmlStoredProcedureParameter_2_1EClass, XML_STORED_PROCEDURE_PARAMETER_21__MODE);
 		createEAttribute(xmlStoredProcedureParameter_2_1EClass, XML_STORED_PROCEDURE_PARAMETER_21__NAME);
 		createEAttribute(xmlStoredProcedureParameter_2_1EClass, XML_STORED_PROCEDURE_PARAMETER_21__CLASS_NAME);
 
@@ -3177,15 +3174,18 @@ public class OrmV2_1Package extends EPackageImpl
 
 		// Obtain other dependent packages
 		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
+		xmlConverter_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlManagedType());
 		xmlEntity_2_1EClass.getESuperTypes().add(this.getXmlQueryContainer_2_1());
 		xmlEntityMappings_2_1EClass.getESuperTypes().add(this.getXmlConverterContainer_2_1());
 		xmlEntityMappings_2_1EClass.getESuperTypes().add(this.getXmlQueryContainer_2_1());
+		xmlNamedStoredProcedureQuery_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlQuery());
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(columnResult_2_1EClass, ColumnResult_2_1.class, "ColumnResult_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -3209,8 +3209,6 @@ public class OrmV2_1Package extends EPackageImpl
 		initEAttribute(getXmlConvert_2_1_DisableConversion(), theXMLTypePackage.getBooleanObject(), "disableConversion", null, 0, 1, XmlConvert_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(xmlConverter_2_1EClass, XmlConverter_2_1.class, "XmlConverter_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlConverter_2_1_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlConverter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlConverter_2_1_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, XmlConverter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getXmlConverter_2_1_AutoApply(), theXMLTypePackage.getBooleanObject(), "autoApply", null, 0, 1, XmlConverter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(xmlConverterContainer_2_1EClass, XmlConverterContainer_2_1.class, "XmlConverterContainer_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -3300,7 +3298,7 @@ public class OrmV2_1Package extends EPackageImpl
 
 		initEClass(xmlStoredProcedureParameter_2_1EClass, XmlStoredProcedureParameter_2_1.class, "XmlStoredProcedureParameter_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getXmlStoredProcedureParameter_2_1_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlStoredProcedureParameter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlStoredProcedureParameter_2_1_ParameterMode(), this.getParameterMode_2_1(), "parameterMode", null, 0, 1, XmlStoredProcedureParameter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getXmlStoredProcedureParameter_2_1_Mode(), this.getParameterMode_2_1(), "mode", null, 0, 1, XmlStoredProcedureParameter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getXmlStoredProcedureParameter_2_1_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlStoredProcedureParameter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getXmlStoredProcedureParameter_2_1_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, XmlStoredProcedureParameter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -3476,22 +3474,6 @@ public class OrmV2_1Package extends EPackageImpl
 		public static final EClass XML_CONVERTER_21 = eINSTANCE.getXmlConverter_2_1();
 
 		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CONVERTER_21__DESCRIPTION = eINSTANCE.getXmlConverter_2_1_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CONVERTER_21__CLASS_NAME = eINSTANCE.getXmlConverter_2_1_ClassName();
-
-		/**
 		 * The meta object literal for the '<em><b>Auto Apply</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -3962,12 +3944,12 @@ public class OrmV2_1Package extends EPackageImpl
 		public static final EAttribute XML_STORED_PROCEDURE_PARAMETER_21__DESCRIPTION = eINSTANCE.getXmlStoredProcedureParameter_2_1_Description();
 
 		/**
-		 * The meta object literal for the '<em><b>Parameter Mode</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Mode</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		public static final EAttribute XML_STORED_PROCEDURE_PARAMETER_21__PARAMETER_MODE = eINSTANCE.getXmlStoredProcedureParameter_2_1_ParameterMode();
+		public static final EAttribute XML_STORED_PROCEDURE_PARAMETER_21__MODE = eINSTANCE.getXmlStoredProcedureParameter_2_1_Mode();
 
 		/**
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverter_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverter_2_1.java
index 7a819a04c0..442c2f12b2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverter_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverter_2_1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 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.
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
 
+import org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType;
 import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
@@ -25,72 +26,17 @@ import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getClassName <em>Class Name</em>}</li>
  *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getAutoApply <em>Auto Apply</em>}</li>
  * </ul>
  * </p>
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlConverter_2_1()
  * @model kind="class" interface="true" abstract="true"
- * @extends EBaseObject
  * @generated
  */
-public interface XmlConverter_2_1 extends EBaseObject
+public interface XmlConverter_2_1 extends XmlManagedType
 {
 	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlConverter_2_1_Description()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Class 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>Class Name</em>' attribute.
-	 * @see #setClassName(String)
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlConverter_2_1_ClassName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	String getClassName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getClassName <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Name</em>' attribute.
-	 * @see #getClassName()
-	 * @generated
-	 */
-	void setClassName(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Auto Apply</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedStoredProcedureQuery_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedStoredProcedureQuery_2_1.java
index d814ffcb54..bb406283a3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedStoredProcedureQuery_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedStoredProcedureQuery_2_1.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlQuery;
 import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
@@ -35,10 +36,9 @@ import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlNamedStoredProcedureQuery_2_1()
  * @model kind="class" interface="true" abstract="true"
- * @extends EBaseObject
  * @generated
  */
-public interface XmlNamedStoredProcedureQuery_2_1 extends EBaseObject
+public interface XmlNamedStoredProcedureQuery_2_1 extends XmlQuery
 {
 	/**
 	 * Returns the value of the '<em><b>Result Classes</b></em>' attribute list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlStoredProcedureParameter_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlStoredProcedureParameter_2_1.java
index 6e0025f1b4..5c01c22d9c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlStoredProcedureParameter_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlStoredProcedureParameter_2_1.java
@@ -26,7 +26,7 @@ import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
  * The following features are supported:
  * <ul>
  *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getParameterMode <em>Parameter Mode</em>}</li>
+ *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getMode <em>Mode</em>}</li>
  *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getClassName <em>Class Name</em>}</li>
  * </ul>
@@ -66,33 +66,33 @@ public interface XmlStoredProcedureParameter_2_1 extends EBaseObject
 	void setDescription(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Parameter Mode</b></em>' attribute.
+	 * Returns the value of the '<em><b>Mode</b></em>' attribute.
 	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Parameter Mode</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Mode</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parameter Mode</em>' attribute.
+	 * @return the value of the '<em>Mode</em>' attribute.
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1
-	 * @see #setParameterMode(ParameterMode_2_1)
-	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlStoredProcedureParameter_2_1_ParameterMode()
+	 * @see #setMode(ParameterMode_2_1)
+	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlStoredProcedureParameter_2_1_Mode()
 	 * @model
 	 * @generated
 	 */
-	ParameterMode_2_1 getParameterMode();
+	ParameterMode_2_1 getMode();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getParameterMode <em>Parameter Mode</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getMode <em>Mode</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parameter Mode</em>' attribute.
+	 * @param value the new value of the '<em>Mode</em>' attribute.
 	 * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1
-	 * @see #getParameterMode()
+	 * @see #getMode()
 	 * @generated
 	 */
-	void setParameterMode(ParameterMode_2_1 value);
+	void setMode(ParameterMode_2_1 value);
 
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/JPA2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/JPA2_1.java
index 71fda2fda1..002b311670 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/JPA2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/JPA2_1.java
@@ -55,7 +55,7 @@ public interface JPA2_1
 	String NAMED_ENTITY_GRAPH = "named-entity-graph";
 	String NAMED_STORED_PROCEDURE_QUERY = "named-stored-procedure-query";
 	String PARAMETER = "parameter";
-	String PARAMETER_MODE = "parameter-mode";
+	String MODE = "mode";
 	String PROCEDURE_NAME = "procedure-name";
 	String PRIMARY_KEY_FOREIGN_KEY = "primary-key-foreign-key";
 	String RESULT_CLASS = "result-class";