Initial oxm resource model

396 files changed, 37789 insertions, 3976 deletions

diff --git a/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF
index f99ebc7944..c358a6c051 100644
--- a/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF
@@ -17,49 +17,35 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jem.util;bundle-version="[2.1.100,3.0.0)",
  org.eclipse.jpt.common.utility;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.100,2.0.0)",
  org.eclipse.jst.j2ee;bundle-version="[1.1.200,2.0.0)",
+ org.eclipse.jst.j2ee.core;bundle-version="[1.2.200,2.0.0)",
  org.eclipse.pde.core;bundle-version="[3.6.0,4.0.0)";resolution:=optional,
  org.eclipse.text;bundle-version="[3.5.100,4.0.0)",
  org.eclipse.wst.common.emf;bundle-version="[1.1.200,2.0.0)",
+ org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.101,2.0.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.wst.sse.core;bundle-version="[1.1.700,2.0.0)",
+ org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.700,2.0.0)"
 Import-Package: com.ibm.icu.text;version="4.0.1"
 Dali-Comment: We friend 'internal.utility' to all non-EclipseLink, non-test bundles
 Export-Package: org.eclipse.jpt.common.core,
  org.eclipse.jpt.common.core.gen,
- org.eclipse.jpt.common.core.internal;
-  x-friends:="org.eclipse.jpt.jaxb.core,
-   org.eclipse.jpt.jpa.core",
- org.eclipse.jpt.common.core.internal.content;
-  x-friends:="org.eclipse.jpt.jaxb.core,
-   org.eclipse.jpt.jpa.core",
- org.eclipse.jpt.common.core.internal.gen;
-  x-friends:="org.eclipse.jpt.jaxb.core,
-   org.eclipse.jpt.jpa.core",
- org.eclipse.jpt.common.core.internal.libprov;
-  x-friends:="org.eclipse.jpt.jaxb.core,
-   org.eclipse.jpt.jpa.core",
- org.eclipse.jpt.common.core.internal.libval;
-  x-friends:="org.eclipse.jpt.jaxb.core,
-  org.eclipse.jpt.jpa.core",
- org.eclipse.jpt.common.core.internal.operations;
-  x-friends:="org.eclipse.jpt.jaxb.core,
-  org.eclipse.jpt.jpa.core",
- org.eclipse.jpt.common.core.internal.resource;
-  x-friends:="org.eclipse.jpt.jaxb.core,
-  org.eclipse.jpt.jpa.core",
- org.eclipse.jpt.common.core.internal.resource.java;
-  x-friends:="org.eclipse.jpt.jaxb.core,
-  org.eclipse.jpt.jpa.core",
- org.eclipse.jpt.common.core.internal.resource.java.binary;
-  x-friends:="org.eclipse.jpt.jaxb.core,
-  org.eclipse.jpt.jpa.core",
- org.eclipse.jpt.common.core.internal.resource.java.source;
-  x-friends:="org.eclipse.jpt.jaxb.core,
-  org.eclipse.jpt.jpa.core",
+ org.eclipse.jpt.common.core.internal;x-friends:="org.eclipse.jpt.jaxb.core,org.eclipse.jpt.jpa.core",
+ org.eclipse.jpt.common.core.internal.content;x-friends:="org.eclipse.jpt.jaxb.core,org.eclipse.jpt.jpa.core",
+ org.eclipse.jpt.common.core.internal.gen;x-friends:="org.eclipse.jpt.jaxb.core,org.eclipse.jpt.jpa.core",
+ org.eclipse.jpt.common.core.internal.libprov;x-friends:="org.eclipse.jpt.jaxb.core,org.eclipse.jpt.jpa.core",
+ org.eclipse.jpt.common.core.internal.libval;x-friends:="org.eclipse.jpt.jaxb.core,org.eclipse.jpt.jpa.core",
+ org.eclipse.jpt.common.core.internal.operations;x-friends:="org.eclipse.jpt.jaxb.core,org.eclipse.jpt.jpa.core",
+ org.eclipse.jpt.common.core.internal.resource;x-friends:="org.eclipse.jpt.jaxb.core,org.eclipse.jpt.jpa.core",
+ org.eclipse.jpt.common.core.internal.resource.java;x-friends:="org.eclipse.jpt.jaxb.core,org.eclipse.jpt.jpa.core",
+ org.eclipse.jpt.common.core.internal.resource.java.binary;x-friends:="org.eclipse.jpt.jaxb.core,org.eclipse.jpt.jpa.core",
+ org.eclipse.jpt.common.core.internal.resource.java.source;x-friends:="org.eclipse.jpt.jaxb.core,org.eclipse.jpt.jpa.core",
+ org.eclipse.jpt.common.core.internal.resource.xml;x-friends:="org.eclipse.jpt.jaxb.core,org.eclipse.jpt.jpa.core",
  org.eclipse.jpt.common.core.internal.utility;
   x-friends:="org.eclipse.jpt.common.ui,
    org.eclipse.jpt.jaxb.core,
@@ -69,19 +55,14 @@ Export-Package: org.eclipse.jpt.common.core,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.gen,
    org.eclipse.jpt.jpa.ui",
- org.eclipse.jpt.common.core.internal.utility.command;
-  x-friends:="org.eclipse.jpt.jaxb.core,
-  org.eclipse.jpt.jpa.core",
- org.eclipse.jpt.common.core.internal.utility.jdt;
-  x-friends:="org.eclipse.jpt.jaxb.core,
-  org.eclipse.jpt.jpa.core",
- org.eclipse.jpt.common.core.internal.utility.translators;
-  x-friends:="org.eclipse.jpt.jaxb.core,
-  org.eclipse.jpt.jpa.core",
+ org.eclipse.jpt.common.core.internal.utility.command;x-friends:="org.eclipse.jpt.jaxb.core,org.eclipse.jpt.jpa.core",
+ org.eclipse.jpt.common.core.internal.utility.jdt;x-friends:="org.eclipse.jpt.jaxb.core,org.eclipse.jpt.jpa.core",
+ org.eclipse.jpt.common.core.internal.utility.translators;x-friends:="org.eclipse.jpt.jaxb.core,org.eclipse.jpt.jpa.core",
  org.eclipse.jpt.common.core.libprov,
  org.eclipse.jpt.common.core.libval,
  org.eclipse.jpt.common.core.resource,
  org.eclipse.jpt.common.core.resource.java,
+ org.eclipse.jpt.common.core.resource.xml,
  org.eclipse.jpt.common.core.utility,
  org.eclipse.jpt.common.core.utility.command,
  org.eclipse.jpt.common.core.utility.jdt
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/DaliEmfFormatter.xml b/common/plugins/org.eclipse.jpt.common.core/model/DaliEmfFormatter.xml
index 147065a21f..147065a21f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/DaliEmfFormatter.xml
+++ b/common/plugins/org.eclipse.jpt.common.core/model/DaliEmfFormatter.xml
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/common.ecore b/common/plugins/org.eclipse.jpt.common.core/model/common.ecore
index fd130656f3..5c57f5c1e1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/common.ecore
+++ b/common/plugins/org.eclipse.jpt.common.core/model/common.ecore
@@ -1,14 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="xml"
-    nsURI="jpt.common.xmi" nsPrefix="org.eclipse.jpt.jpa.core.resource.xml">
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractJpaRootEObject" abstract="true"
-      eSuperTypes="#//JpaRootEObject"/>
-  <eClassifiers xsi:type="ecore:EClass" name="JpaRootEObject" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="schemaLocation" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="xml" nsURI="jpt.common.xmi" nsPrefix="org.eclipse.jpt.jpa.core.resource.xml">

+  <eClassifiers xsi:type="ecore:EClass" name="ERootObjectImpl" abstract="true" eSuperTypes="#//ERootObject"/>

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

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

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

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

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/common/plugins/org.eclipse.jpt.common.core/model/commonResourceModels.genmodel b/common/plugins/org.eclipse.jpt.common.core/model/commonResourceModels.genmodel
new file mode 100644
index 0000000000..871c40227a
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.core/model/commonResourceModels.genmodel
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jpt.common.core/src" creationCommands="false"

+    creationIcons="false" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.jpt.common.core"

+    modelName="Core" editPluginClass="" editorPluginClass="" updateClasspath="false"

+    rootExtendsInterface="org.eclipse.jpt.common.core.resource.xml.EBaseObject" rootExtendsClass="org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl"

+    suppressInterfaces="true" testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"

+    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.jpt.common.core.edit"

+    editorPluginID="org.eclipse.jpt.common.core.edit" testsPluginID="org.eclipse.jpt.common.core.edit">

+  <foreignModel>common.ecore</foreignModel>

+  <genPackages prefix="Common" basePackage="org.eclipse.jpt.common.core.resource"

+      disposableProviderFactory="true" adapterFactory="false" ecorePackage="common.ecore#/">

+    <genClasses image="false" ecoreClass="common.ecore#//ERootObjectImpl"/>

+    <genClasses image="false" ecoreClass="common.ecore#//ERootObject">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//ERootObject/version"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//ERootObject/schemaLocation"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/xml/AbstractJpaXmlResourceProvider.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/xml/AbstractJptXmlResourceProvider.java
index 08662fefd0..ac9f709e79 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/xml/AbstractJpaXmlResourceProvider.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/xml/AbstractJptXmlResourceProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.jpa.core.internal.resource.xml;
+package org.eclipse.jpt.common.core.internal.resource.xml;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -33,10 +33,10 @@ import org.eclipse.jem.util.emf.workbench.FlexibleProjectResourceSet;
 import org.eclipse.jem.util.emf.workbench.IEMFContextContributor;
 import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
 import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
+import org.eclipse.jpt.common.core.internal.plugin.JptCommonCorePlugin;
 import org.eclipse.jpt.common.core.resource.ProjectResourceLocator;
-import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResourceProvider;
+import org.eclipse.jpt.common.core.resource.xml.JpaXmlResourceProvider;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
 import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
 import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateInputProvider;
@@ -54,14 +54,14 @@ import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateVa
  * @version 2.3
  * @since 2.2
  */
-public abstract class AbstractJpaXmlResourceProvider
+public abstract class AbstractJptXmlResourceProvider
 	implements JpaXmlResourceProvider, IEMFContextContributor, ResourceStateInputProvider, ResourceStateValidator
 {
 	protected IProject project;
 	
 	protected URI fileUri;
 	
-	protected JpaXmlResource resource;
+	protected JptXmlResource resource;
 	
 	protected IContentType contentType;
 	
@@ -76,7 +76,7 @@ public abstract class AbstractJpaXmlResourceProvider
 	 * In either case, {@link #buildFileUri(IPath)} will attempt to build an absolutely pathed 
 	 * URI for the given path.
 	 */
-	public AbstractJpaXmlResourceProvider(IProject project, IPath resourcePath, IContentType contentType) {
+	public AbstractJptXmlResourceProvider(IProject project, IPath resourcePath, IContentType contentType) {
 		super();
 		this.project = project;
 		this.fileUri = buildFileUri(resourcePath);
@@ -107,9 +107,9 @@ public abstract class AbstractJpaXmlResourceProvider
 	 * this will return a stub resource.  You must call #createResource() to 
 	 * create the file on the file system.
 	 */
-	public JpaXmlResource getXmlResource() {
+	public JptXmlResource getXmlResource() {
 		if (this.resource == null) {
-			JpaXmlResource newResource = (JpaXmlResource) WorkbenchResourceHelper.getOrCreateResource(this.fileUri, getResourceSet());
+			JptXmlResource newResource = (JptXmlResource) WorkbenchResourceHelper.getOrCreateResource(this.fileUri, getResourceSet());
 			if (newResource == null) {
 				//ResourceSet "isReleasing", deleting the project causes this
 				return null;
@@ -126,16 +126,16 @@ public abstract class AbstractJpaXmlResourceProvider
 		return this.resource;
 	}
 	
-	protected JpaXmlResource createResourceAndLoad() {
+	protected JptXmlResource createResourceAndLoad() {
 		this.resource = createResource();
 		this.loadResource();
 		return this.resource;
 	}
 	
-	protected JpaXmlResource createResource() {
+	protected JptXmlResource createResource() {
 		Resource.Factory resourceFactory = 
 			WTPResourceFactoryRegistry.INSTANCE.getFactory(this.fileUri, this.contentType.getDefaultDescription());
-		return (JpaXmlResource) getResourceSet().createResource(this.fileUri, resourceFactory);		
+		return (JptXmlResource) getResourceSet().createResource(this.fileUri, resourceFactory);		
 	}
 	
 	protected void loadResource() {
@@ -143,7 +143,7 @@ public abstract class AbstractJpaXmlResourceProvider
 			this.resource.load(((ProjectResourceSet) getResourceSet()).getLoadOptions());
 		}
 		catch (IOException e) {
-			JptJpaCorePlugin.instance().logError(e);
+			JptCommonCorePlugin.instance().logError(e);
 		}
 	}
 	
@@ -158,17 +158,17 @@ public abstract class AbstractJpaXmlResourceProvider
 				this.resource.saveIfNecessary(); //this writes out the file
 			}
 			catch (Exception e) {
-				JptJpaCorePlugin.instance().logError(e);
+				JptCommonCorePlugin.instance().logError(e);
 			}
 		}
 	}
 	
 	/**
-	 * This will actually create the underlying file and the JpaXmlResource that corresponds to it.
+	 * This will actually create the underlying file and the JptXmlResource that corresponds to it.
 	 * It also populates the root of the file.
 	 * @param config - A configuration object used to specify options for creation of the resource
 	 */
-	public JpaXmlResource createFileAndResource(Object config, IProgressMonitor monitor) throws CoreException {
+	public JptXmlResource createFileAndResource(Object config, IProgressMonitor monitor) throws CoreException {
 		IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		IWorkspaceRunnable runnable = new CreateFileAndResourceWorkspaceRunnable(config);
 		workspace.run(runnable, this.project, IWorkspace.AVOID_UPDATE, monitor);
@@ -184,7 +184,7 @@ public abstract class AbstractJpaXmlResourceProvider
 			this.config = config;
 		}
 		public void run(IProgressMonitor monitor) {
-			AbstractJpaXmlResourceProvider.this.createResourceAndUnderlyingFile(this.config);
+			AbstractJptXmlResourceProvider.this.createResourceAndUnderlyingFile(this.config);
 		}
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/CommonFactory.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/CommonFactory.java
index 335de1d84a..254d60e239 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/CommonFactory.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/CommonFactory.java
@@ -9,7 +9,7 @@
  *  	Oracle - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.jpt.jpa.core.resource.xml;
+package org.eclipse.jpt.common.core.resource.xml;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
  * 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 -->
- * @see org.eclipse.jpt.jpa.core.resource.xml.CommonPackage
+ * @see org.eclipse.jpt.common.core.resource.xml.CommonPackage
  * @generated
  */
 public class CommonFactory extends EFactoryImpl
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/CommonPackage.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/CommonPackage.java
index b633baded5..62860008af 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/CommonPackage.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/CommonPackage.java
@@ -9,17 +9,12 @@
  *  	Oracle - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.jpt.jpa.core.resource.xml;
+package org.eclipse.jpt.common.core.resource.xml;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
-import org.eclipse.jpt.jpa.core.resource.persistence.PersistencePackage;
-import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.PersistenceV2_0Package;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,7 +32,7 @@ import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.PersistenceV2_0Package
  * 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 -->
- * @see org.eclipse.jpt.jpa.core.resource.xml.CommonFactory
+ * @see org.eclipse.jpt.common.core.resource.xml.CommonFactory
  * @model kind="package"
  * @generated
  */
@@ -73,17 +68,17 @@ public class CommonPackage extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final CommonPackage eINSTANCE = org.eclipse.jpt.jpa.core.resource.xml.CommonPackage.init();
+	public static final CommonPackage eINSTANCE = org.eclipse.jpt.common.core.resource.xml.CommonPackage.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject <em>Jpa Root EObject</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.common.core.resource.xml.ERootObject <em>ERoot Object</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject
-	 * @see org.eclipse.jpt.jpa.core.resource.xml.CommonPackage#getJpaRootEObject()
+	 * @see org.eclipse.jpt.common.core.resource.xml.ERootObject
+	 * @see org.eclipse.jpt.common.core.resource.xml.CommonPackage#getERootObject()
 	 * @generated
 	 */
-	public static final int JPA_ROOT_EOBJECT = 1;
+	public static final int EROOT_OBJECT = 1;
 
 	/**
 	 * The feature id for the '<em><b>Version</b></em>' attribute.
@@ -92,7 +87,7 @@ public class CommonPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int JPA_ROOT_EOBJECT__VERSION = 0;
+	public static final int EROOT_OBJECT__VERSION = 0;
 
 	/**
 	 * The feature id for the '<em><b>Schema Location</b></em>' attribute.
@@ -101,26 +96,26 @@ public class CommonPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int JPA_ROOT_EOBJECT__SCHEMA_LOCATION = 1;
+	public static final int EROOT_OBJECT__SCHEMA_LOCATION = 1;
 
 	/**
-	 * The number of structural features of the '<em>Jpa Root EObject</em>' class.
+	 * The number of structural features of the '<em>ERoot Object</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int JPA_ROOT_EOBJECT_FEATURE_COUNT = 2;
+	public static final int EROOT_OBJECT_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaRootEObject <em>Abstract Jpa Root EObject</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.common.core.resource.xml.ERootObjectImpl <em>ERoot Object Impl</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaRootEObject
-	 * @see org.eclipse.jpt.jpa.core.resource.xml.CommonPackage#getAbstractJpaRootEObject()
+	 * @see org.eclipse.jpt.common.core.resource.xml.ERootObjectImpl
+	 * @see org.eclipse.jpt.common.core.resource.xml.CommonPackage#getERootObjectImpl()
 	 * @generated
 	 */
-	public static final int ABSTRACT_JPA_ROOT_EOBJECT = 0;
+	public static final int EROOT_OBJECT_IMPL = 0;
 
 	/**
 	 * The feature id for the '<em><b>Version</b></em>' attribute.
@@ -129,7 +124,7 @@ public class CommonPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int ABSTRACT_JPA_ROOT_EOBJECT__VERSION = JPA_ROOT_EOBJECT__VERSION;
+	public static final int EROOT_OBJECT_IMPL__VERSION = EROOT_OBJECT__VERSION;
 
 	/**
 	 * The feature id for the '<em><b>Schema Location</b></em>' attribute.
@@ -138,30 +133,30 @@ public class CommonPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int ABSTRACT_JPA_ROOT_EOBJECT__SCHEMA_LOCATION = JPA_ROOT_EOBJECT__SCHEMA_LOCATION;
+	public static final int EROOT_OBJECT_IMPL__SCHEMA_LOCATION = EROOT_OBJECT__SCHEMA_LOCATION;
 
 	/**
-	 * The number of structural features of the '<em>Abstract Jpa Root EObject</em>' class.
+	 * The number of structural features of the '<em>ERoot Object Impl</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT = JPA_ROOT_EOBJECT_FEATURE_COUNT + 0;
+	public static final int EROOT_OBJECT_IMPL_FEATURE_COUNT = EROOT_OBJECT_FEATURE_COUNT + 0;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass abstractJpaRootEObjectEClass = null;
+	private EClass eRootObjectImplEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass jpaRootEObjectEClass = null;
+	private EClass eRootObjectEClass = null;
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
@@ -174,7 +169,7 @@ public class CommonPackage extends EPackageImpl
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jpt.jpa.core.resource.xml.CommonPackage#eNS_URI
+	 * @see org.eclipse.jpt.common.core.resource.xml.CommonPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
@@ -211,28 +206,11 @@ public class CommonPackage extends EPackageImpl
 
 		isInited = true;
 
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		OrmPackage theOrmPackage = (OrmPackage)(EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI) instanceof OrmPackage ? EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI) : OrmPackage.eINSTANCE);
-		OrmV2_0Package theOrmV2_0Package = (OrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(OrmV2_0Package.eNS_URI) instanceof OrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(OrmV2_0Package.eNS_URI) : OrmV2_0Package.eINSTANCE);
-		PersistencePackage thePersistencePackage = (PersistencePackage)(EPackage.Registry.INSTANCE.getEPackage(PersistencePackage.eNS_URI) instanceof PersistencePackage ? EPackage.Registry.INSTANCE.getEPackage(PersistencePackage.eNS_URI) : PersistencePackage.eINSTANCE);
-		PersistenceV2_0Package thePersistenceV2_0Package = (PersistenceV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(PersistenceV2_0Package.eNS_URI) instanceof PersistenceV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(PersistenceV2_0Package.eNS_URI) : PersistenceV2_0Package.eINSTANCE);
-
 		// Create package meta-data objects
 		theCommonPackage.createPackageContents();
-		theOrmPackage.createPackageContents();
-		theOrmV2_0Package.createPackageContents();
-		thePersistencePackage.createPackageContents();
-		thePersistenceV2_0Package.createPackageContents();
 
 		// Initialize created meta-data
 		theCommonPackage.initializePackageContents();
-		theOrmPackage.initializePackageContents();
-		theOrmV2_0Package.initializePackageContents();
-		thePersistencePackage.initializePackageContents();
-		thePersistenceV2_0Package.initializePackageContents();
 
 		// Mark meta-data to indicate it can't be changed
 		theCommonPackage.freeze();
@@ -245,58 +223,60 @@ public class CommonPackage extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaRootEObject <em>Abstract Jpa Root EObject</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.common.core.resource.xml.ERootObjectImpl <em>ERoot Object Impl</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract Jpa Root EObject</em>'.
-	 * @see org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaRootEObject
+	 * @return the meta object for class '<em>ERoot Object Impl</em>'.
+	 * @see org.eclipse.jpt.common.core.resource.xml.ERootObjectImpl
 	 * @generated
 	 */
-	public EClass getAbstractJpaRootEObject()
+	public EClass getERootObjectImpl()
 	{
-		return abstractJpaRootEObjectEClass;
+		return eRootObjectImplEClass;
 	}
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject <em>Jpa Root EObject</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.common.core.resource.xml.ERootObject <em>ERoot Object</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Jpa Root EObject</em>'.
-	 * @see org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject
+	 * @return the meta object for class '<em>ERoot Object</em>'.
+	 * @see org.eclipse.jpt.common.core.resource.xml.ERootObject
 	 * @generated
 	 */
-	public EClass getJpaRootEObject()
+	public EClass getERootObject()
 	{
-		return jpaRootEObjectEClass;
+		return eRootObjectEClass;
 	}
 
+
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject#getVersion <em>Version</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.common.core.resource.xml.ERootObject#getVersion <em>Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject#getVersion()
-	 * @see #getJpaRootEObject()
+	 * @see org.eclipse.jpt.common.core.resource.xml.ERootObject#getVersion()
+	 * @see #getERootObject()
 	 * @generated
 	 */
-	public EAttribute getJpaRootEObject_Version()
+	public EAttribute getERootObject_Version()
 	{
-		return (EAttribute)jpaRootEObjectEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)eRootObjectEClass.getEStructuralFeatures().get(0);
 	}
 
+
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject#getSchemaLocation <em>Schema Location</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.common.core.resource.xml.ERootObject#getSchemaLocation <em>Schema Location</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Schema Location</em>'.
-	 * @see org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject#getSchemaLocation()
-	 * @see #getJpaRootEObject()
+	 * @see org.eclipse.jpt.common.core.resource.xml.ERootObject#getSchemaLocation()
+	 * @see #getERootObject()
 	 * @generated
 	 */
-	public EAttribute getJpaRootEObject_SchemaLocation()
+	public EAttribute getERootObject_SchemaLocation()
 	{
-		return (EAttribute)jpaRootEObjectEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)eRootObjectEClass.getEStructuralFeatures().get(1);
 	}
 
 
@@ -332,11 +312,11 @@ public class CommonPackage extends EPackageImpl
 		isCreated = true;
 
 		// Create classes and their features
-		abstractJpaRootEObjectEClass = createEClass(ABSTRACT_JPA_ROOT_EOBJECT);
+		eRootObjectImplEClass = createEClass(EROOT_OBJECT_IMPL);
 
-		jpaRootEObjectEClass = createEClass(JPA_ROOT_EOBJECT);
-		createEAttribute(jpaRootEObjectEClass, JPA_ROOT_EOBJECT__VERSION);
-		createEAttribute(jpaRootEObjectEClass, JPA_ROOT_EOBJECT__SCHEMA_LOCATION);
+		eRootObjectEClass = createEClass(EROOT_OBJECT);
+		createEAttribute(eRootObjectEClass, EROOT_OBJECT__VERSION);
+		createEAttribute(eRootObjectEClass, EROOT_OBJECT__SCHEMA_LOCATION);
 	}
 
 	/**
@@ -368,14 +348,14 @@ public class CommonPackage extends EPackageImpl
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		abstractJpaRootEObjectEClass.getESuperTypes().add(this.getJpaRootEObject());
+		eRootObjectImplEClass.getESuperTypes().add(this.getERootObject());
 
 		// Initialize classes and features; add operations and parameters
-		initEClass(abstractJpaRootEObjectEClass, AbstractJpaRootEObject.class, "AbstractJpaRootEObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(eRootObjectImplEClass, ERootObjectImpl.class, "ERootObjectImpl", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(jpaRootEObjectEClass, JpaRootEObject.class, "JpaRootEObject", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getJpaRootEObject_Version(), ecorePackage.getEString(), "version", null, 1, 1, JpaRootEObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJpaRootEObject_SchemaLocation(), ecorePackage.getEString(), "schemaLocation", null, 1, 1, JpaRootEObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(eRootObjectEClass, ERootObject.class, "ERootObject", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getERootObject_Version(), ecorePackage.getEString(), "version", null, 1, 1, ERootObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getERootObject_SchemaLocation(), ecorePackage.getEString(), "schemaLocation", null, 1, 1, ERootObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		// Create resource
 		createResource(eNS_URI);
@@ -396,24 +376,24 @@ public class CommonPackage extends EPackageImpl
 	public interface Literals
 	{
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaRootEObject <em>Abstract Jpa Root EObject</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.common.core.resource.xml.ERootObjectImpl <em>ERoot Object Impl</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaRootEObject
-		 * @see org.eclipse.jpt.jpa.core.resource.xml.CommonPackage#getAbstractJpaRootEObject()
+		 * @see org.eclipse.jpt.common.core.resource.xml.ERootObjectImpl
+		 * @see org.eclipse.jpt.common.core.resource.xml.CommonPackage#getERootObjectImpl()
 		 * @generated
 		 */
-		public static final EClass ABSTRACT_JPA_ROOT_EOBJECT = eINSTANCE.getAbstractJpaRootEObject();
+		public static final EClass EROOT_OBJECT_IMPL = eINSTANCE.getERootObjectImpl();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject <em>Jpa Root EObject</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.common.core.resource.xml.ERootObject <em>ERoot Object</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject
-		 * @see org.eclipse.jpt.jpa.core.resource.xml.CommonPackage#getJpaRootEObject()
+		 * @see org.eclipse.jpt.common.core.resource.xml.ERootObject
+		 * @see org.eclipse.jpt.common.core.resource.xml.CommonPackage#getERootObject()
 		 * @generated
 		 */
-		public static final EClass JPA_ROOT_EOBJECT = eINSTANCE.getJpaRootEObject();
+		public static final EClass EROOT_OBJECT = eINSTANCE.getERootObject();
 
 		/**
 		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
@@ -421,7 +401,7 @@ public class CommonPackage extends EPackageImpl
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		public static final EAttribute JPA_ROOT_EOBJECT__VERSION = eINSTANCE.getJpaRootEObject_Version();
+		public static final EAttribute EROOT_OBJECT__VERSION = eINSTANCE.getERootObject_Version();
 
 		/**
 		 * The meta object literal for the '<em><b>Schema Location</b></em>' attribute feature.
@@ -429,7 +409,7 @@ public class CommonPackage extends EPackageImpl
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		public static final EAttribute JPA_ROOT_EOBJECT__SCHEMA_LOCATION = eINSTANCE.getJpaRootEObject_SchemaLocation();
+		public static final EAttribute EROOT_OBJECT__SCHEMA_LOCATION = eINSTANCE.getERootObject_SchemaLocation();
 
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/JpaEObject.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/EBaseObject.java
index 97b4dbbb3f..43b65f916d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/JpaEObject.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/EBaseObject.java
@@ -8,7 +8,7 @@
  *     Oracle - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.jpt.jpa.core.resource.xml;
+package org.eclipse.jpt.common.core.resource.xml;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jpt.common.core.utility.TextRange;
@@ -26,7 +26,7 @@ import org.eclipse.text.edits.DeleteEdit;
  * @version 3.0
  * @since 2.2
  */
-public interface JpaEObject
+public interface EBaseObject
 	extends EObject
 {
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/AbstractJpaEObject.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/EBaseObjectImpl.java
index 765994410e..dde1fe11dc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/AbstractJpaEObject.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/EBaseObjectImpl.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.jpa.core.resource.xml;
+package org.eclipse.jpt.common.core.resource.xml;
 
 import java.util.HashSet;
 import java.util.Hashtable;
@@ -38,9 +38,9 @@ import org.w3c.dom.Text;
  * @version 3.0
  * @since 2.2
  */
-public abstract class AbstractJpaEObject
+public abstract class EBaseObjectImpl
 	extends EObjectImpl
-	implements JpaEObject
+	implements EBaseObject
 {
 	protected IDOMNode node;
 	
@@ -48,19 +48,19 @@ public abstract class AbstractJpaEObject
 	 * Sets of "insignificant" feature ids, keyed by class.
 	 * This is built up lazily, as the objects are modified.
 	 */
-	private static final Hashtable<Class<? extends AbstractJpaEObject>, HashSet<Integer>> insignificantFeatureIdSets = new Hashtable<Class<? extends AbstractJpaEObject>, HashSet<Integer>>();
+	private static final Hashtable<Class<? extends EBaseObjectImpl>, HashSet<Integer>> insignificantFeatureIdSets = new Hashtable<Class<? extends EBaseObjectImpl>, HashSet<Integer>>();
 	
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected AbstractJpaEObject() {
+	protected EBaseObjectImpl() {
 		super();
 	}
 
 
-	// ********** JpaEObject implementation **********
+	// ********** EBaseObject implementation **********
 
 	public boolean isUnset() {
 		for (EStructuralFeature feature : this.eClass().getEAllStructuralFeatures()) {
@@ -102,8 +102,8 @@ public abstract class AbstractJpaEObject
 		}
 	}
 
-	protected JpaXmlResource getXmlResource() {
-		return (JpaXmlResource) this.eResource();
+	protected JptXmlResource getXmlResource() {
+		return (JptXmlResource) this.eResource();
 	}
 
 	protected boolean featureIsSignificant(int featureId) {
@@ -339,7 +339,7 @@ public abstract class AbstractJpaEObject
 	protected static class XmlEAdapterList<E extends Object & Adapter>
 		extends EAdapterList<E>
 	{
-		public XmlEAdapterList(AbstractJpaEObject jpaEObject) {
+		public XmlEAdapterList(EBaseObjectImpl jpaEObject) {
 			super(jpaEObject);
 		}
 
@@ -349,7 +349,7 @@ public abstract class AbstractJpaEObject
 			if (newObject instanceof EMF2DOMAdapter) {
 				Object n = ((EMF2DOMAdapter) newObject).getNode();
 				if (n instanceof IDOMNode) {
-					((AbstractJpaEObject) this.notifier).node = (IDOMNode) n;
+					((EBaseObjectImpl) this.notifier).node = (IDOMNode) n;
 				}
 			}
 		}
@@ -357,8 +357,8 @@ public abstract class AbstractJpaEObject
 		@Override
 		protected void didRemove(int index, E oldObject) {
 			if ((oldObject instanceof EMF2DOMAdapter) &&
-					(((EMF2DOMAdapter) oldObject).getNode() == ((AbstractJpaEObject) this.notifier).node)) {
-				((AbstractJpaEObject) this.notifier).node = null;
+					(((EMF2DOMAdapter) oldObject).getNode() == ((EBaseObjectImpl) this.notifier).node)) {
+				((EBaseObjectImpl) this.notifier).node = null;
 			}
 			super.didRemove(index, oldObject);
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/JpaRootEObject.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/ERootObject.java
index 57aa329d20..8f9fec5fbc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/JpaRootEObject.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/ERootObject.java
@@ -9,7 +9,7 @@
  *  	Oracle - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.jpt.jpa.core.resource.xml;
+package org.eclipse.jpt.common.core.resource.xml;
 
 import org.eclipse.jpt.common.core.utility.TextRange;
 
@@ -28,17 +28,17 @@ import org.eclipse.jpt.common.core.utility.TextRange;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject#getVersion <em>Version</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject#getSchemaLocation <em>Schema Location</em>}</li>
+ *   <li>{@link org.eclipse.jpt.common.core.resource.xml.ERootObject#getVersion <em>Version</em>}</li>
+ *   <li>{@link org.eclipse.jpt.common.core.resource.xml.ERootObject#getSchemaLocation <em>Schema Location</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt.jpa.core.resource.xml.CommonPackage#getJpaRootEObject()
+ * @see org.eclipse.jpt.common.core.resource.xml.CommonPackage#getERootObject()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface JpaRootEObject extends JpaEObject
+public interface ERootObject extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Version</b></em>' attribute.
@@ -50,14 +50,14 @@ public interface JpaRootEObject extends JpaEObject
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Version</em>' attribute.
 	 * @see #setVersion(String)
-	 * @see org.eclipse.jpt.jpa.core.resource.xml.CommonPackage#getJpaRootEObject_Version()
+	 * @see org.eclipse.jpt.common.core.resource.xml.CommonPackage#getERootObject_Version()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getVersion();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject#getVersion <em>Version</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.common.core.resource.xml.ERootObject#getVersion <em>Version</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Version</em>' attribute.
@@ -76,14 +76,14 @@ public interface JpaRootEObject extends JpaEObject
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Schema Location</em>' attribute.
 	 * @see #setSchemaLocation(String)
-	 * @see org.eclipse.jpt.jpa.core.resource.xml.CommonPackage#getJpaRootEObject_SchemaLocation()
+	 * @see org.eclipse.jpt.common.core.resource.xml.CommonPackage#getERootObject_SchemaLocation()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getSchemaLocation();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject#getSchemaLocation <em>Schema Location</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.common.core.resource.xml.ERootObject#getSchemaLocation <em>Schema Location</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Schema Location</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/AbstractJpaRootEObject.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/ERootObjectImpl.java
index df72ac8864..c11f483a0a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/AbstractJpaRootEObject.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/ERootObjectImpl.java
@@ -9,7 +9,7 @@
  *  	Oracle - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.jpt.jpa.core.resource.xml;
+package org.eclipse.jpt.common.core.resource.xml;
 
 import java.util.Map;
 import org.eclipse.emf.common.notify.Notification;
@@ -33,11 +33,11 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.jpa.core.resource.xml.CommonPackage#getAbstractJpaRootEObject()
+ * @see org.eclipse.jpt.common.core.resource.xml.CommonPackage#getERootObjectImpl()
  * @model kind="class" abstract="true"
  * @generated
  */
-public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implements JpaRootEObject
+public abstract class ERootObjectImpl extends EBaseObjectImpl implements ERootObject
 {
 	/**
 	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
@@ -84,7 +84,7 @@ public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected AbstractJpaRootEObject()
+	protected ERootObjectImpl()
 	{
 		super();
 	}
@@ -97,7 +97,7 @@ public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implemen
 	@Override
 	protected EClass eStaticClass()
 	{
-		return CommonPackage.Literals.ABSTRACT_JPA_ROOT_EOBJECT;
+		return CommonPackage.Literals.EROOT_OBJECT_IMPL;
 	}
 
 	/**
@@ -110,7 +110,7 @@ public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implemen
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Version</em>' attribute.
 	 * @see #setVersion(String)
-	 * @see org.eclipse.jpt.jpa.core.resource.xml.CommonPackage#getJpaRootEObject_Version()
+	 * @see org.eclipse.jpt.common.core.resource.xml.CommonPackage#getERootObject_Version()
 	 * @model required="true"
 	 * @generated
 	 */
@@ -120,7 +120,7 @@ public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implemen
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaRootEObject#getVersion <em>Version</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.common.core.resource.xml.ERootObjectImpl#getVersion <em>Version</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Version</em>' attribute.
@@ -132,7 +132,7 @@ public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implemen
 		String oldVersion = version;
 		version = newVersion;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT__VERSION, oldVersion, version));
+			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EROOT_OBJECT_IMPL__VERSION, oldVersion, version));
 	}
 	
 	public void setVersion(String newVersion) {
@@ -150,7 +150,7 @@ public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implemen
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Schema Location</em>' attribute.
 	 * @see #setSchemaLocation(String)
-	 * @see org.eclipse.jpt.jpa.core.resource.xml.CommonPackage#getJpaRootEObject_SchemaLocation()
+	 * @see org.eclipse.jpt.common.core.resource.xml.CommonPackage#getERootObject_SchemaLocation()
 	 * @model required="true"
 	 * @generated
 	 */
@@ -160,7 +160,7 @@ public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implemen
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaRootEObject#getSchemaLocation <em>Schema Location</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.common.core.resource.xml.ERootObjectImpl#getSchemaLocation <em>Schema Location</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Schema Location</em>' attribute.
@@ -172,7 +172,7 @@ public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implemen
 		String oldSchemaLocation = schemaLocation;
 		schemaLocation = newSchemaLocation;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT__SCHEMA_LOCATION, oldSchemaLocation, schemaLocation));
+			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EROOT_OBJECT_IMPL__SCHEMA_LOCATION, oldSchemaLocation, schemaLocation));
 	}
 
 	/**
@@ -185,9 +185,9 @@ public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implemen
 	{
 		switch (featureID)
 		{
-			case CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT__VERSION:
+			case CommonPackage.EROOT_OBJECT_IMPL__VERSION:
 				return getVersion();
-			case CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT__SCHEMA_LOCATION:
+			case CommonPackage.EROOT_OBJECT_IMPL__SCHEMA_LOCATION:
 				return getSchemaLocation();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -203,10 +203,10 @@ public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implemen
 	{
 		switch (featureID)
 		{
-			case CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT__VERSION:
+			case CommonPackage.EROOT_OBJECT_IMPL__VERSION:
 				setVersion((String)newValue);
 				return;
-			case CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT__SCHEMA_LOCATION:
+			case CommonPackage.EROOT_OBJECT_IMPL__SCHEMA_LOCATION:
 				setSchemaLocation((String)newValue);
 				return;
 		}
@@ -223,10 +223,10 @@ public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implemen
 	{
 		switch (featureID)
 		{
-			case CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT__VERSION:
+			case CommonPackage.EROOT_OBJECT_IMPL__VERSION:
 				setVersion(VERSION_EDEFAULT);
 				return;
-			case CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT__SCHEMA_LOCATION:
+			case CommonPackage.EROOT_OBJECT_IMPL__SCHEMA_LOCATION:
 				setSchemaLocation(SCHEMA_LOCATION_EDEFAULT);
 				return;
 		}
@@ -243,9 +243,9 @@ public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implemen
 	{
 		switch (featureID)
 		{
-			case CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT__VERSION:
+			case CommonPackage.EROOT_OBJECT_IMPL__VERSION:
 				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-			case CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT__SCHEMA_LOCATION:
+			case CommonPackage.EROOT_OBJECT_IMPL__SCHEMA_LOCATION:
 				return SCHEMA_LOCATION_EDEFAULT == null ? schemaLocation != null : !SCHEMA_LOCATION_EDEFAULT.equals(schemaLocation);
 		}
 		return super.eIsSet(featureID);
@@ -294,7 +294,7 @@ public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implemen
 	protected static Translator buildVersionTranslator(final Map<String, String> versionsToSchemaLocations) {
 		return new EnumeratedValueTranslator(
 				XML.VERSION, 
-				CommonPackage.eINSTANCE.getJpaRootEObject_Version(),
+				CommonPackage.eINSTANCE.getERootObject_Version(),
 				Translator.DOM_ATTRIBUTE) {
 			
 			@Override
@@ -318,7 +318,7 @@ public abstract class AbstractJpaRootEObject extends AbstractJpaEObject implemen
 		
 		return new EnumeratedValueTranslator(
 				XML.XSI_SCHEMA_LOCATION, 
-				CommonPackage.eINSTANCE.getJpaRootEObject_SchemaLocation(),
+				CommonPackage.eINSTANCE.getERootObject_SchemaLocation(),
 				Translator.DOM_ATTRIBUTE) {
 			
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/EmfTools.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/EmfTools.java
index 6a4656a939..e3d21218aa 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/EmfTools.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/EmfTools.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.jpa.core.resource.xml;
+package org.eclipse.jpt.common.core.resource.xml;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/JpaXmlResourceProvider.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/JpaXmlResourceProvider.java
index 51c95720d6..e303afde26 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/JpaXmlResourceProvider.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/JpaXmlResourceProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.jpa.core.resource.xml;
+package org.eclipse.jpt.common.core.resource.xml;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -25,9 +25,9 @@ import org.eclipse.core.runtime.IStatus;
  */
 public interface JpaXmlResourceProvider {
 
-	JpaXmlResource getXmlResource();
+	JptXmlResource getXmlResource();
 	
 	IStatus validateEdit(Object context);
 
-	JpaXmlResource createFileAndResource(Object config, IProgressMonitor monitor) throws CoreException;
+	JptXmlResource createFileAndResource(Object config, IProgressMonitor monitor) throws CoreException;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/JpaXmlResource.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/JptXmlResource.java
index 0e50cb3e53..7ee51dc154 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/JpaXmlResource.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/JptXmlResource.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.jpa.core.resource.xml;
+package org.eclipse.jpt.common.core.resource.xml;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -27,10 +27,10 @@ import org.eclipse.jpt.common.core.ContentTypeReference;
 import org.eclipse.jpt.common.core.JptResourceModel;
 import org.eclipse.jpt.common.core.JptResourceModelListener;
 import org.eclipse.jpt.common.core.JptResourceType;
+import org.eclipse.jpt.common.core.internal.plugin.JptCommonCorePlugin;
 import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
 import org.eclipse.jpt.common.utility.internal.ListenerList;
 import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin;
 import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
 import org.eclipse.wst.common.internal.emf.resource.Renderer;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -41,7 +41,7 @@ import org.xml.sax.EntityResolver;
  * To retrieve the JPA XML resource corresponding to an Eclipse file:
  * <pre>
  * IFile file = (IFile) ResourcesPlugin.getWorkspace().getRoot().findMember("Foo.java");
- * JpaXmlResource jpaXmlResource = (JpaXmlResource) file.getAdapter(JpaXmlResource.class);
+ * JptXmlResource jpaXmlResource = (JptXmlResource) file.getAdapter(JptXmlResource.class);
  * </pre>
  * This is a non-blocking call; and as a result it will return <code>null</code>
  * if the JPA XML resource or its JPA project is currently under construction.
@@ -57,7 +57,7 @@ import org.xml.sax.EntityResolver;
  * @version 2.3
  * @since 2.2
  */
-public class JpaXmlResource
+public class JptXmlResource
 	extends TranslatorResourceImpl
 	implements JptResourceModel, ContentTypeReference
 {
@@ -73,7 +73,7 @@ public class JpaXmlResource
 			new ListenerList<JptResourceModelListener>(JptResourceModelListener.class);
 	
 	
-	public JpaXmlResource(URI uri, Renderer renderer, IContentType contentType, Translator rootTranslator) {
+	public JptXmlResource(URI uri, Renderer renderer, IContentType contentType, Translator rootTranslator) {
 		super(uri, renderer);
 		this.contentType = contentType;
 		this.rootTranslator = rootTranslator;
@@ -84,7 +84,7 @@ public class JpaXmlResource
 	}
 	
 	public String getVersion() {
-		JpaRootEObject root = this.getRootObject();
+		ERootObject root = this.getRootObject();
 		return (root == null) ? null : root.getVersion();
 	}
 
@@ -199,12 +199,12 @@ public class JpaXmlResource
 	}
 	
 	@Override
-	public JpaRootEObject getRootObject() {
+	public ERootObject getRootObject() {
 		EObject root = super.getRootObject();
 		try {
-			return (JpaRootEObject) root;
+			return (ERootObject) root;
 		} catch (ClassCastException ex) {
-			throw new IllegalStateException("The root object of a JPA XML resource must implement JpaRootEObject: " + root, ex); //$NON-NLS-1$
+			throw new IllegalStateException("The root object of a JPA XML resource must implement ERootObject: " + root, ex); //$NON-NLS-1$
 		}
 	}
 	
@@ -251,7 +251,7 @@ public class JpaXmlResource
 		try {
 			this.save(Collections.EMPTY_MAP);
 		} catch (IOException ex) {
-			JptJpaCorePlugin.instance().logError(ex);
+			JptCommonCorePlugin.instance().logError(ex);
 		}
 	}
 	
@@ -280,7 +280,7 @@ public class JpaXmlResource
 			try {
 				listener.resourceModelChanged(this);
 			} catch (Exception ex) {
-				JptJpaCorePlugin.instance().logError(ex);
+				JptCommonCorePlugin.instance().logError(ex);
 			}
 		}
 	}
@@ -290,7 +290,7 @@ public class JpaXmlResource
 			try {
 				listener.resourceModelReverted(this);
 			} catch (Exception ex) {
-				JptJpaCorePlugin.instance().logError(ex);
+				JptCommonCorePlugin.instance().logError(ex);
 			}
 		}
 	}
@@ -300,7 +300,7 @@ public class JpaXmlResource
 			try {
 				listener.resourceModelUnloaded(this);
 			} catch (Exception ex) {
-				JptJpaCorePlugin.instance().logError(ex);
+				JptCommonCorePlugin.instance().logError(ex);
 			}
 		}
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/XML.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/XML.java
index 53e161227f..575a2f8750 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/xml/XML.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/XML.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.jpa.core.resource.xml;
+package org.eclipse.jpt.common.core.resource.xml;
 
 /**
  * XML-related stuff.
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java
index 788cf013e5..ca139a05bb 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java
@@ -1235,13 +1235,13 @@ public abstract class AbstractJaxbProject
 		}
 		
 		public void resourceModelReverted(JptResourceModel jpaResourceModel) {
-//			IFile file = WorkbenchResourceHelper.getFile((JpaXmlResource)jpaResourceModel);
+//			IFile file = WorkbenchResourceHelper.getFile((JptXmlResource)jpaResourceModel);
 //			AbstractJaxbProject.this.removeJaxbFile(file);
 //			AbstractJaxbProject.this.addJaxbFile(file);
 		}
 		
 		public void resourceModelUnloaded(JptResourceModel jpaResourceModel) {
-//			IFile file = WorkbenchResourceHelper.getFile((JpaXmlResource)jpaResourceModel);
+//			IFile file = WorkbenchResourceHelper.getFile((JptXmlResource)jpaResourceModel);
 //			AbstractJaxbProject.this.removeJaxbFile(file);
 		}
 	}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
index 2abe8f3efe..f594d66c60 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
@@ -13,12 +13,16 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.300,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.7.100,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.jem.util;bundle-version="[2.1.100,3.0.0)",
  org.eclipse.jpt.common.core;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.jpt.common.eclipselink.core;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.jpt.common.utility;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.jpt.jaxb.core;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.jst.common.project.facet.core;bundle-version="[1.4.200,2.0.0)",
  org.eclipse.jst.j2ee;bundle-version="[1.1.500,2.0.0)",
+ org.eclipse.text;bundle-version="[3.5.200,4.0.0)",
+ org.eclipse.wst.common.emf;bundle-version="[1.2.100,2.0.0)",
+ org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.101,2.0.0)",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.200,2.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.2.300,2.0.0)",
  org.eclipse.xsd;bundle-version="[2.8.0,3.0.0)"
@@ -32,9 +36,11 @@ Export-Package: org.eclipse.jpt.jaxb.eclipselink.core,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.resource.java;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.resource.java.binary;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.resource.java.source;x-internal:=true,
+ org.eclipse.jpt.jaxb.eclipselink.core.internal.resource.oxm,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_1;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_3;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_4;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.validation;x-internal:=true,
- org.eclipse.jpt.jaxb.eclipselink.core.resource.java
+ org.eclipse.jpt.jaxb.eclipselink.core.resource.java,
+ org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/build.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/build.properties
index b7fe1216e1..22d1946538 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/build.properties
@@ -16,3 +16,5 @@ bin.includes = .,\
                plugin.xml,\
                plugin.properties
 jars.compile.order = .
+src.includes = model/
+src.includes = model/
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.ecore b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.ecore
new file mode 100644
index 0000000000..d59d1ce6ed
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.ecore
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="oxm" nsURI="jpt.eclipselink.oxm.xmi" nsPrefix="org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm">

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xsiNilRepresentsNull" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emptyNodeRepresentsNull"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nullRepresentationForXml"

+        eType="#//EXmlMarshalNullRepresentation"/>

+  </eClassifiers>

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="method" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="transformerClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlAccessMethods" eType="#//EXmlAccessMethods"

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

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlJavaTypeAdapter" eType="#//EXmlJavaTypeAdapter"

+        containment="true"/>

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="containerType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlAccessorType" eType="#//EXmlAccessType"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EJavaType" eSuperTypes="#//EPropertyHolder">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="superType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlAccessorOrder" eType="#//EXmlAccessOrder"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlAccessorType" eType="#//EXmlAccessType"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlCustomizer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlDiscriminatorNode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlDiscriminatorValue"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlInlineBinaryData" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlTransient" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlNameTransformer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlType" eType="#//EXmlType"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlRootElement" eType="#//EXmlRootElement"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlVirtualAccessMethods"

+        eType="#//EXmlVirtualAccessMethods" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlSeeAlso" eType="#//EXmlSeeAlso"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlJavaTypeAdapter" eType="#//EXmlJavaTypeAdapter"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlClassExtractor" eType="#//EXmlClassExtractor"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="javaAttributes" upperBound="-1"

+        eType="#//EJavaAttribute" containment="true" resolveProxies="false"/>

+  </eClassifiers>

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlProperties" upperBound="-1"

+        eType="#//EXmlProperty" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EDataType" name="EPropOrder" instanceClassName="java.util.List">

+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">

+      <details key="itemType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>

+    </eAnnotations>

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="readOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="writeOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlAccessMethods">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="getMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="setMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="EXmlAccessOrder">

+    <eLiterals name="ALPHABETICAL"/>

+    <eLiterals name="UNDEFINED" value="1"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="EXmlAccessType">

+    <eLiterals name="FIELD"/>

+    <eLiterals name="NONE" value="1"/>

+    <eLiterals name="PROPERTY" value="2"/>

+    <eLiterals name="PUBLIC_MEMBER" value="3"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlAnyAttribute" eSuperTypes="#//EJavaAttribute #//EAccessibleJavaAttribute #//EContainerJavaAttribute #//EReadWriteJavaAttribute #//EPropertyHolder">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlAnyElement" eSuperTypes="#//EJavaAttribute #//EAccessibleJavaAttribute #//EAdaptableJavaAttribute #//EContainerJavaAttribute #//EReadWriteJavaAttribute #//EPropertyHolder">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlMixed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lax" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="domHandler" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlElementRefs" eType="#//EXmlElementRefs"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlAttribute" eSuperTypes="#//EJavaAttribute #//EAccessibleJavaAttribute #//EAdaptableJavaAttribute #//EContainerJavaAttribute #//EReadWriteJavaAttribute #//ETypedJavaAttribute #//EPropertyHolder">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="required" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlIdRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlList" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlInlineBinaryData" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlAttachmentRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlMimeType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlAbstractNullPolicy"

+        eType="#//EAbstractXmlNullPolicy" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlSchemaType" eType="#//EXmlSchemaType"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlBindings" eSuperTypes="../../org.eclipse.jpt.common.core/model/common.ecore#//ERootObjectImpl">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlAccessorType" eType="#//EXmlAccessType"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlAccessorOrder" eType="#//EXmlAccessOrder"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlMappingMetadataComplete"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="packageName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlNameTransformer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlSchema" eType="#//EXmlSchema"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlSchemaType" eType="#//EXmlSchemaType"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlSchemaTypes" upperBound="-1"

+        eType="#//EXmlSchemaType" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlJavaTypeAdapters" upperBound="-1"

+        eType="#//EXmlJavaTypeAdapter" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlRegistries" upperBound="-1"

+        eType="#//EXmlRegistry" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlEnums" upperBound="-1"

+        eType="#//EXmlEnum" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="javaTypes" upperBound="-1"

+        eType="#//EJavaType" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlClassExtractor">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlElement" eSuperTypes="#//EJavaAttribute #//EAccessibleJavaAttribute #//EAdaptableJavaAttribute #//EContainerJavaAttribute #//EPropertyHolder #//EReadWriteJavaAttribute">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nillable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="required" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlIdRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlList" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlInlineBinaryData" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlAttachmentRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlMimeType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cdata" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlAbstractNullPolicy"

+        eType="#//EAbstractXmlNullPolicy" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlElementWrapper" eType="#//EXmlElementWrapper"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlMap" eType="#//EXmlElementWrapper"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlSchemaType" eType="#//EXmlSchemaType"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlElementDecl">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scope" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="substitutionHeadName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="substitutionHeadNamespace"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlElementRef" eSuperTypes="#//EJavaAttribute #//EAccessibleJavaAttribute #//EAdaptableJavaAttribute #//EContainerJavaAttribute #//EReadWriteJavaAttribute #//ETypedJavaAttribute #//EPropertyHolder">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlMixed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlElementWrapper" eType="#//EXmlElementWrapper"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlElementRefs" eSuperTypes="#//EJavaAttribute #//EAccessibleJavaAttribute #//EAdaptableJavaAttribute #//EReadWriteJavaAttribute #//EPropertyHolder">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlMixed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlElementRefs" upperBound="-1"

+        eType="#//EXmlElementRef" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlElementWrapper" eType="#//EXmlElementWrapper"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlElements" eSuperTypes="#//EJavaAttribute #//EAccessibleJavaAttribute #//EContainerJavaAttribute #//EReadWriteJavaAttribute #//EPropertyHolder">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlIdRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlList" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlElements" upperBound="-1"

+        eType="#//EXmlElement" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlElementWrapper" eType="#//EXmlElementWrapper"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlJoinNodes" upperBound="-1"

+        eType="#//EXmlJoinNodes" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlElementWrapper">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nillable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="required" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlEnum">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaEnum" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlEnumValues" upperBound="-1"

+        eType="#//EXmlEnumValue" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlEnumValue">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaEnumValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlInverseReference" eSuperTypes="#//EJavaAttribute #//EAccessibleJavaAttribute #//EContainerJavaAttribute #//ETypedJavaAttribute #//EPropertyHolder">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mappedBy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlIsSetNullPolicy" eSuperTypes="#//EAbstractXmlNullPolicy">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSetMethodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlIsSetParameters" upperBound="-1"

+        eType="#//EXmlIsSetParameter" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlIsSetParameter">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlJavaTypeAdapter" eSuperTypes="#//EJavaAttribute">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlJoinNode">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="referencedXmlPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlJoinNodes" eSuperTypes="#//EJavaAttribute #//EContainerJavaAttribute #//ETypedJavaAttribute">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlJoinNodes" upperBound="-1"

+        eType="#//EXmlJoinNode" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlMap">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="EXmlMarshalNullRepresentation">

+    <eLiterals name="XSI_NIL"/>

+    <eLiterals name="ABSENT_NODE" value="1"/>

+    <eLiterals name="EMPTY_NODE" value="2"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlNullPolicy" eSuperTypes="#//EAbstractXmlNullPolicy">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSetPerformedForAbsentNode"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlNs">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespaceUri" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="EXmlNsForm">

+    <eLiterals name="UNQUALIFIED"/>

+    <eLiterals name="QUALIFIED" value="1"/>

+    <eLiterals name="UNSET" value="2"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlProperty">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlReadTransformer" eSuperTypes="#//EAbstractXmlTransformer"/>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlRegistry">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlElementDecls" upperBound="-1"

+        eType="#//EXmlElementDecl" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlRootElement">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlSchema">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeFormDefault" eType="#//EXmlNsForm"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementFormDefault" eType="#//EXmlNsForm"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlns" upperBound="-1"

+        eType="#//EXmlNs" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlSchemaType">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EDataType" name="EXmlSeeAlso" instanceClassName="java.util.List">

+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">

+      <details key="itemType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>

+    </eAnnotations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlTransformation" eSuperTypes="#//EJavaAttribute #//EAccessibleJavaAttribute #//EPropertyHolder">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="optional" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlReadTransformer" eType="#//EXmlReadTransformer"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlWriteTransformers" upperBound="-1"

+        eType="#//EXmlWriteTransformer" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlTransient" eSuperTypes="#//EJavaAttribute">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlType">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="factoryClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="factoryMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="propOrder" eType="#//EPropOrder"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlValue" eSuperTypes="#//EJavaAttribute #//EAccessibleJavaAttribute #//EAdaptableJavaAttribute #//EContainerJavaAttribute #//EReadWriteJavaAttribute #//ETypedJavaAttribute #//EPropertyHolder">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cdata" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="xmlAbstractNullPolicy"

+        eType="#//EAbstractXmlNullPolicy" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlVirtualAccessMethods">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="getMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="setMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="schema" eType="#//EXmlVirtualAccessMethodsSchema"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="EXmlVirtualAccessMethodsSchema">

+    <eLiterals name="NODES"/>

+    <eLiterals name="ANY" value="1"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EXmlWriteTransformer" eSuperTypes="#//EAbstractXmlTransformer">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.genmodel b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.genmodel
new file mode 100644
index 0000000000..f6e8052bdc
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/model/oxm.genmodel
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jpt.jaxb.eclipselink.core/src" creationCommands="false"

+    creationIcons="false" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.jpt.jaxb.eclipselink.core"

+    modelName="Oxm" editPluginClass="" editorPluginClass="" updateClasspath="false"

+    rootExtendsInterface="org.eclipse.jpt.common.core.resource.xml.EBaseObject" rootExtendsClass="org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl"

+    suppressInterfaces="true" testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"

+    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.jpt.jaxb.eclipselink.core.edit"

+    editorPluginID="org.eclipse.jpt.jaxb.eclipselink.core.edit" usedGenPackages="../../org.eclipse.jpt.common.core/model/commonResourceModels.genmodel#//xml">

+  <foreignModel>oxm.ecore</foreignModel>

+  <genPackages prefix="Oxm" basePackage="org.eclipse.jpt.jaxb.eclipselink.core.resource"

+      disposableProviderFactory="true" adapterFactory="false" contentTypeIdentifier=""

+      ecorePackage="oxm.ecore#/">

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="oxm.ecore#//EXmlAccessOrder">

+      <genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlAccessOrder/ALPHABETICAL"/>

+      <genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlAccessOrder/UNDEFINED"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="oxm.ecore#//EXmlAccessType">

+      <genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlAccessType/FIELD"/>

+      <genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlAccessType/NONE"/>

+      <genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlAccessType/PROPERTY"/>

+      <genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlAccessType/PUBLIC_MEMBER"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="oxm.ecore#//EXmlMarshalNullRepresentation">

+      <genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlMarshalNullRepresentation/XSI_NIL"/>

+      <genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlMarshalNullRepresentation/ABSENT_NODE"/>

+      <genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlMarshalNullRepresentation/EMPTY_NODE"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="oxm.ecore#//EXmlNsForm">

+      <genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlNsForm/UNQUALIFIED"/>

+      <genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlNsForm/QUALIFIED"/>

+      <genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlNsForm/UNSET"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="oxm.ecore#//EXmlVirtualAccessMethodsSchema">

+      <genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlVirtualAccessMethodsSchema/NODES"/>

+      <genEnumLiterals ecoreEnumLiteral="oxm.ecore#//EXmlVirtualAccessMethodsSchema/ANY"/>

+    </genEnums>

+    <genDataTypes ecoreDataType="oxm.ecore#//EPropOrder"/>

+    <genDataTypes ecoreDataType="oxm.ecore#//EXmlSeeAlso"/>

+    <genClasses image="false" ecoreClass="oxm.ecore#//EAbstractXmlNullPolicy">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EAbstractXmlNullPolicy/xsiNilRepresentsNull"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EAbstractXmlNullPolicy/emptyNodeRepresentsNull"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EAbstractXmlNullPolicy/nullRepresentationForXml"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="oxm.ecore#//EAbstractXmlTransformer">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EAbstractXmlTransformer/method"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EAbstractXmlTransformer/transformerClass"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="oxm.ecore#//EAccessibleJavaAttribute">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EAccessibleJavaAttribute/xmlAccessMethods"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="oxm.ecore#//EAdaptableJavaAttribute">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EAdaptableJavaAttribute/xmlJavaTypeAdapter"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="oxm.ecore#//EContainerJavaAttribute">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EContainerJavaAttribute/containerType"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="oxm.ecore#//EJavaAttribute">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EJavaAttribute/javaAttribute"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EJavaAttribute/xmlAccessorType"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EJavaType">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EJavaType/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EJavaType/superType"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EJavaType/xmlAccessorOrder"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EJavaType/xmlAccessorType"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EJavaType/xmlCustomizer"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EJavaType/xmlDiscriminatorNode"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EJavaType/xmlDiscriminatorValue"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EJavaType/xmlInlineBinaryData"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EJavaType/xmlTransient"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EJavaType/xmlNameTransformer"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EJavaType/xmlType"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EJavaType/xmlRootElement"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EJavaType/xmlVirtualAccessMethods"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EJavaType/xmlSeeAlso"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EJavaType/xmlJavaTypeAdapter"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EJavaType/xmlClassExtractor"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EJavaType/javaAttributes"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="oxm.ecore#//EPropertyHolder">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EPropertyHolder/xmlProperties"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="oxm.ecore#//EReadWriteJavaAttribute">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EReadWriteJavaAttribute/readOnly"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EReadWriteJavaAttribute/writeOnly"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="oxm.ecore#//ETypedJavaAttribute">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//ETypedJavaAttribute/type"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlAccessMethods">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAccessMethods/getMethod"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAccessMethods/setMethod"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlAnyAttribute">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAnyAttribute/xmlPath"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlAnyElement">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAnyElement/xmlMixed"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAnyElement/lax"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAnyElement/domHandler"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAnyElement/xmlPath"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlAnyElement/xmlElementRefs"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlAttribute">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAttribute/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAttribute/namespace"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAttribute/required"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAttribute/xmlId"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAttribute/xmlIdRef"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAttribute/xmlKey"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAttribute/xmlList"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAttribute/xmlInlineBinaryData"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAttribute/xmlAttachmentRef"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAttribute/xmlMimeType"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlAttribute/xmlPath"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlAttribute/xmlAbstractNullPolicy"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlAttribute/xmlSchemaType"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlBindings">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlBindings/xmlAccessorType"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlBindings/xmlAccessorOrder"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlBindings/xmlMappingMetadataComplete"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlBindings/packageName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlBindings/xmlNameTransformer"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlBindings/xmlSchema"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlBindings/xmlSchemaType"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlBindings/xmlSchemaTypes"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlBindings/xmlJavaTypeAdapters"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlBindings/xmlRegistries"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlBindings/xmlEnums"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlBindings/javaTypes"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlClassExtractor">

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

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlElement">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/namespace"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/defaultValue"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/nillable"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/required"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/xmlId"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/xmlIdRef"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/xmlKey"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/xmlList"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/xmlInlineBinaryData"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/xmlAttachmentRef"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/xmlMimeType"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/cdata"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/xmlPath"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElement/xmlLocation"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlElement/xmlAbstractNullPolicy"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlElement/xmlElementWrapper"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlElement/xmlMap"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlElement/xmlSchemaType"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlElementDecl">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementDecl/javaMethod"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementDecl/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementDecl/namespace"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementDecl/defaultValue"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementDecl/scope"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementDecl/substitutionHeadName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementDecl/substitutionHeadNamespace"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementDecl/type"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlElementRef">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementRef/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementRef/namespace"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementRef/xmlMixed"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlElementRef/xmlElementWrapper"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlElementRefs">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementRefs/xmlMixed"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlElementRefs/xmlElementRefs"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlElementRefs/xmlElementWrapper"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlElements">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElements/xmlIdRef"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElements/xmlList"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlElements/xmlElements"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlElements/xmlElementWrapper"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlElements/xmlJoinNodes"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlElementWrapper">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementWrapper/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementWrapper/namespace"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementWrapper/nillable"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlElementWrapper/required"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlEnum">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlEnum/javaEnum"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlEnum/value"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlEnum/xmlEnumValues"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlEnumValue">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlEnumValue/javaEnumValue"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlInverseReference">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlInverseReference/mappedBy"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlIsSetNullPolicy">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlIsSetNullPolicy/isSetMethodName"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlIsSetNullPolicy/xmlIsSetParameters"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlIsSetParameter">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlIsSetParameter/value"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlIsSetParameter/type"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlJavaTypeAdapter">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlJavaTypeAdapter/value"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlJavaTypeAdapter/type"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlJavaTypeAdapter/valueType"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlJoinNode">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlJoinNode/xmlPath"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlJoinNode/referencedXmlPath"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlJoinNodes">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlJoinNodes/xmlJoinNodes"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlMap">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlMap/key"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlMap/value"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlNullPolicy">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlNullPolicy/isSetPerformedForAbsentNode"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlNs">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlNs/namespaceUri"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlNs/prefix"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlProperty">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlProperty/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlProperty/value"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlProperty/valueType"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlReadTransformer"/>

+    <genClasses ecoreClass="oxm.ecore#//EXmlRegistry">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlRegistry/name"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlRegistry/xmlElementDecls"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlRootElement">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlRootElement/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlRootElement/namespace"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlSchema">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlSchema/attributeFormDefault"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlSchema/elementFormDefault"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlSchema/location"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlSchema/namespace"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlSchema/xmlns"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlSchemaType">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlSchemaType/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlSchemaType/namespace"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlSchemaType/type"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlTransformation">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlTransformation/optional"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlTransformation/xmlReadTransformer"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlTransformation/xmlWriteTransformers"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlTransient">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlTransient/xmlLocation"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlType">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlType/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlType/namespace"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlType/factoryClass"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlType/factoryMethod"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlType/propOrder"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlValue">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlValue/cdata"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference oxm.ecore#//EXmlValue/xmlAbstractNullPolicy"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlVirtualAccessMethods">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlVirtualAccessMethods/getMethod"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlVirtualAccessMethods/setMethod"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlVirtualAccessMethods/schema"/>

+    </genClasses>

+    <genClasses ecoreClass="oxm.ecore#//EXmlWriteTransformer">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute oxm.ecore#//EXmlWriteTransformer/xmlPath"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.properties
index 52ad60c72e..524782836d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.properties
@@ -22,6 +22,8 @@
 pluginName = Dali Java Persistence Tools - EclipseLink JAXB Support - Core
 providerName = Eclipse Web Tools Platform
 
+OXM_XML_CONTENT = EclipseLink oxm.xml mapping file
+
 ECLIPSELINK_PLATFORM_GROUP_LABEL = EclipseLink
 ECLIPSELINK_2_1_PLATFORM_LABEL = EclipseLink 2.1.x
 ECLIPSELINK_2_2_PLATFORM_LABEL = EclipseLink 2.2.x
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.xml
index 28efc2f92f..b8dbc1fb4e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.xml
@@ -12,6 +12,25 @@
 
 <plugin>
 	
+	<extension
+		point="org.eclipse.core.contenttype.contentTypes">
+		
+		<!-- oxm.xml -->
+  		<content-type
+			id="org.eclipse.jpt.jaxb.eclipselink.core.content.oxm"
+			name="%OXM_XML_CONTENT"
+			base-type="org.eclipse.core.runtime.xml">
+			<describer
+				class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber2">
+				<parameter 
+					name="element" 
+					value="{http://www.eclipse.org/eclipselink/xsds/persistence/oxm}xml-bindings"/>
+			</describer>
+		</content-type>
+		
+	</extension>
+	
+	
 	<extension 
 		point="org.eclipse.core.expressions.propertyTesters">
 		
@@ -91,4 +110,20 @@
 		
 	</extension>
 	
+	
+	<!-- ***** WTP resource factories ***** -->
+
+	<extension
+		point="org.eclipse.wst.common.modulecore.resourceFactories">
+		
+		<resourceFactory
+			class="org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmXmlResourceFactory"
+			isDefault="true">
+			<contentTypeBinding
+				contentTypeId="org.eclipse.jpt.jaxb.eclipselink.core.content.oxm">
+			</contentTypeBinding>
+		</resourceFactory>
+		
+	</extension>
+	
 </plugin>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/resource/oxm/OxmXmlResourceProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/resource/oxm/OxmXmlResourceProvider.java
new file mode 100644
index 0000000000..d27dd34460
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/resource/oxm/OxmXmlResourceProvider.java
@@ -0,0 +1,55 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.internal.resource.oxm;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.jpt.common.core.internal.resource.xml.AbstractJptXmlResourceProvider;

+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings;

+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EclipseLink;

+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory;

+

+public class OxmXmlResourceProvider

+		extends AbstractJptXmlResourceProvider {

+	

+	/**

+	 * (Convenience method) Returns an OXM resource model provider for 

+	 * the given file.

+	 */

+	public static OxmXmlResourceProvider getXmlResourceProvider(IFile file) {

+		return getXmlResourceProvider_(file.getProject(), file.getFullPath());

+	}

+	

+	/**

+	 * (Convenience method) Returns an OXM resource model provider for

+	 * the given project in the specified runtime location

+	 */

+	public static OxmXmlResourceProvider getXmlResourceProvider(IProject project, IPath runtimePath) {

+		return getXmlResourceProvider_(project, runtimePath);

+	}

+	

+	

+	private static OxmXmlResourceProvider getXmlResourceProvider_(IProject project, IPath fullPath) {

+		return new OxmXmlResourceProvider(project, fullPath);

+	}

+	

+	

+	public OxmXmlResourceProvider(IProject project, IPath filePath) {

+		super(project, filePath, EXmlBindings.CONTENT_TYPE);

+	}

+	

+	@Override

+	protected void populateRoot(Object config) {

+		EXmlBindings xmlBindings = OxmFactory.eINSTANCE.createEXmlBindings();

+		xmlBindings.setVersion(EclipseLink.SCHEMA_VERSION_2_4); // TODO - for now

+		getResourceContents().add(xmlBindings);

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EAbstractXmlNullPolicy.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EAbstractXmlNullPolicy.java
new file mode 100644
index 0000000000..56fd173ef3
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EAbstractXmlNullPolicy.java
@@ -0,0 +1,391 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.HashMap;

+import java.util.Map;

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+import org.eclipse.wst.common.internal.emf.resource.MultiObjectTranslator;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EAbstract Xml Null Policy</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy#isXsiNilRepresentsNull <em>Xsi Nil Represents Null</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy#isEmptyNodeRepresentsNull <em>Empty Node Represents Null</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy#getNullRepresentationForXml <em>Null Representation For Xml</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAbstractXmlNullPolicy()

+ * @model kind="class" abstract="true"

+ * @extends EBaseObject

+ * @generated

+ */

+public abstract class EAbstractXmlNullPolicy extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #isXsiNilRepresentsNull() <em>Xsi Nil Represents Null</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXsiNilRepresentsNull()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XSI_NIL_REPRESENTS_NULL_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isXsiNilRepresentsNull() <em>Xsi Nil Represents Null</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXsiNilRepresentsNull()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xsiNilRepresentsNull = XSI_NIL_REPRESENTS_NULL_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #isEmptyNodeRepresentsNull() <em>Empty Node Represents Null</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isEmptyNodeRepresentsNull()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean EMPTY_NODE_REPRESENTS_NULL_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isEmptyNodeRepresentsNull() <em>Empty Node Represents Null</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isEmptyNodeRepresentsNull()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean emptyNodeRepresentsNull = EMPTY_NODE_REPRESENTS_NULL_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getNullRepresentationForXml() <em>Null Representation For Xml</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNullRepresentationForXml()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final EXmlMarshalNullRepresentation NULL_REPRESENTATION_FOR_XML_EDEFAULT = EXmlMarshalNullRepresentation.XSI_NIL;

+

+	/**

+	 * The cached value of the '{@link #getNullRepresentationForXml() <em>Null Representation For Xml</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNullRepresentationForXml()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlMarshalNullRepresentation nullRepresentationForXml = NULL_REPRESENTATION_FOR_XML_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EAbstractXmlNullPolicy()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EABSTRACT_XML_NULL_POLICY;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xsi Nil Represents Null</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xsi Nil Represents Null</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xsi Nil Represents Null</em>' attribute.

+	 * @see #setXsiNilRepresentsNull(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAbstractXmlNullPolicy_XsiNilRepresentsNull()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXsiNilRepresentsNull()

+	{

+		return xsiNilRepresentsNull;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy#isXsiNilRepresentsNull <em>Xsi Nil Represents Null</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xsi Nil Represents Null</em>' attribute.

+	 * @see #isXsiNilRepresentsNull()

+	 * @generated

+	 */

+	public void setXsiNilRepresentsNull(boolean newXsiNilRepresentsNull)

+	{

+		boolean oldXsiNilRepresentsNull = xsiNilRepresentsNull;

+		xsiNilRepresentsNull = newXsiNilRepresentsNull;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EABSTRACT_XML_NULL_POLICY__XSI_NIL_REPRESENTS_NULL, oldXsiNilRepresentsNull, xsiNilRepresentsNull));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Empty Node Represents Null</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Empty Node Represents Null</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Empty Node Represents Null</em>' attribute.

+	 * @see #setEmptyNodeRepresentsNull(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAbstractXmlNullPolicy_EmptyNodeRepresentsNull()

+	 * @model

+	 * @generated

+	 */

+	public boolean isEmptyNodeRepresentsNull()

+	{

+		return emptyNodeRepresentsNull;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy#isEmptyNodeRepresentsNull <em>Empty Node Represents Null</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Empty Node Represents Null</em>' attribute.

+	 * @see #isEmptyNodeRepresentsNull()

+	 * @generated

+	 */

+	public void setEmptyNodeRepresentsNull(boolean newEmptyNodeRepresentsNull)

+	{

+		boolean oldEmptyNodeRepresentsNull = emptyNodeRepresentsNull;

+		emptyNodeRepresentsNull = newEmptyNodeRepresentsNull;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EABSTRACT_XML_NULL_POLICY__EMPTY_NODE_REPRESENTS_NULL, oldEmptyNodeRepresentsNull, emptyNodeRepresentsNull));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Null Representation For Xml</b></em>' attribute.

+	 * The literals are from the enumeration {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMarshalNullRepresentation}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Null Representation For Xml</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Null Representation For Xml</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMarshalNullRepresentation

+	 * @see #setNullRepresentationForXml(EXmlMarshalNullRepresentation)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAbstractXmlNullPolicy_NullRepresentationForXml()

+	 * @model

+	 * @generated

+	 */

+	public EXmlMarshalNullRepresentation getNullRepresentationForXml()

+	{

+		return nullRepresentationForXml;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy#getNullRepresentationForXml <em>Null Representation For Xml</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Null Representation For Xml</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMarshalNullRepresentation

+	 * @see #getNullRepresentationForXml()

+	 * @generated

+	 */

+	public void setNullRepresentationForXml(EXmlMarshalNullRepresentation newNullRepresentationForXml)

+	{

+		EXmlMarshalNullRepresentation oldNullRepresentationForXml = nullRepresentationForXml;

+		nullRepresentationForXml = newNullRepresentationForXml == null ? NULL_REPRESENTATION_FOR_XML_EDEFAULT : newNullRepresentationForXml;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EABSTRACT_XML_NULL_POLICY__NULL_REPRESENTATION_FOR_XML, oldNullRepresentationForXml, nullRepresentationForXml));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EABSTRACT_XML_NULL_POLICY__XSI_NIL_REPRESENTS_NULL:

+				return isXsiNilRepresentsNull();

+			case OxmPackage.EABSTRACT_XML_NULL_POLICY__EMPTY_NODE_REPRESENTS_NULL:

+				return isEmptyNodeRepresentsNull();

+			case OxmPackage.EABSTRACT_XML_NULL_POLICY__NULL_REPRESENTATION_FOR_XML:

+				return getNullRepresentationForXml();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EABSTRACT_XML_NULL_POLICY__XSI_NIL_REPRESENTS_NULL:

+				setXsiNilRepresentsNull((Boolean)newValue);

+				return;

+			case OxmPackage.EABSTRACT_XML_NULL_POLICY__EMPTY_NODE_REPRESENTS_NULL:

+				setEmptyNodeRepresentsNull((Boolean)newValue);

+				return;

+			case OxmPackage.EABSTRACT_XML_NULL_POLICY__NULL_REPRESENTATION_FOR_XML:

+				setNullRepresentationForXml((EXmlMarshalNullRepresentation)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EABSTRACT_XML_NULL_POLICY__XSI_NIL_REPRESENTS_NULL:

+				setXsiNilRepresentsNull(XSI_NIL_REPRESENTS_NULL_EDEFAULT);

+				return;

+			case OxmPackage.EABSTRACT_XML_NULL_POLICY__EMPTY_NODE_REPRESENTS_NULL:

+				setEmptyNodeRepresentsNull(EMPTY_NODE_REPRESENTS_NULL_EDEFAULT);

+				return;

+			case OxmPackage.EABSTRACT_XML_NULL_POLICY__NULL_REPRESENTATION_FOR_XML:

+				setNullRepresentationForXml(NULL_REPRESENTATION_FOR_XML_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EABSTRACT_XML_NULL_POLICY__XSI_NIL_REPRESENTS_NULL:

+				return xsiNilRepresentsNull != XSI_NIL_REPRESENTS_NULL_EDEFAULT;

+			case OxmPackage.EABSTRACT_XML_NULL_POLICY__EMPTY_NODE_REPRESENTS_NULL:

+				return emptyNodeRepresentsNull != EMPTY_NODE_REPRESENTS_NULL_EDEFAULT;

+			case OxmPackage.EABSTRACT_XML_NULL_POLICY__NULL_REPRESENTATION_FOR_XML:

+				return nullRepresentationForXml != NULL_REPRESENTATION_FOR_XML_EDEFAULT;

+		}

+		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(" (xsiNilRepresentsNull: ");

+		result.append(xsiNilRepresentsNull);

+		result.append(", emptyNodeRepresentsNull: ");

+		result.append(emptyNodeRepresentsNull);

+		result.append(", nullRepresentationForXml: ");

+		result.append(nullRepresentationForXml);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class AbstractXmlNullPolicyTranslator

+			extends MultiObjectTranslator {

+		

+		protected static String DOM_PATH = 

+				EclipseLink.XML_IS_SET_NULL_POLICY + ","

+						+ EclipseLink.XML_NULL_POLICY;

+		

+		protected static Map<String, Translator> DELEGATES = new HashMap<String, Translator>();

+		

+						

+		protected AbstractXmlNullPolicyTranslator() {

+			super(DOM_PATH, OxmPackage.eINSTANCE.getEXmlAttribute_XmlAbstractNullPolicy());

+		}

+		

+		

+		protected static Map<String, Translator> delegates() {

+			if (DELEGATES.isEmpty()) {

+				String path = EclipseLink.XML_IS_SET_NULL_POLICY;

+				DELEGATES.put(path, new EXmlIsSetNullPolicy.XmlIsSetNullPolicyTranslator());

+				

+				path = EclipseLink.XML_NULL_POLICY;

+				DELEGATES.put(path, new EXmlNullPolicy.XmlNullPolicyTranslator());

+			}

+			return DELEGATES;

+		}

+		

+		@Override

+		public Translator getDelegateFor(EObject o) {

+			switch (o.eClass().getClassifierID()) {

+				case OxmPackage.EXML_IS_SET_NULL_POLICY :

+					return delegates().get(EclipseLink.XML_IS_SET_NULL_POLICY);

+				case OxmPackage.EXML_NULL_POLICY :

+					return delegates().get(EclipseLink.XML_NULL_POLICY);

+			}

+			throw new IllegalStateException("Null policy expected"); //$NON-NLS-1$

+		}

+		

+		@Override

+		public Translator getDelegateFor(String domName, String readAheadName) {

+			return delegates().get(domName);

+		}

+	}

+	

+	

+	abstract static class AbstractAbstractXmlNullPolicyTranslator

+			extends SimpleTranslator {

+		

+		protected AbstractAbstractXmlNullPolicyTranslator(String domPathAndName, Translator[] translatorChildren) {

+			super(domPathAndName, OxmPackage.eINSTANCE.getEXmlAttribute_XmlAbstractNullPolicy(), translatorChildren);

+		}

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EAbstractXmlTransformer.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EAbstractXmlTransformer.java
new file mode 100644
index 0000000000..d8a2028cc1
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EAbstractXmlTransformer.java
@@ -0,0 +1,260 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EAbstract Xml Transformer</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlTransformer#getMethod <em>Method</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlTransformer#getTransformerClass <em>Transformer Class</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAbstractXmlTransformer()

+ * @model kind="class" abstract="true"

+ * @extends EBaseObject

+ * @generated

+ */

+public abstract class EAbstractXmlTransformer extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getMethod() <em>Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getMethod()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String METHOD_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getMethod() <em>Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getMethod()

+	 * @generated

+	 * @ordered

+	 */

+	protected String method = METHOD_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getTransformerClass() <em>Transformer Class</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getTransformerClass()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String TRANSFORMER_CLASS_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getTransformerClass() <em>Transformer Class</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getTransformerClass()

+	 * @generated

+	 * @ordered

+	 */

+	protected String transformerClass = TRANSFORMER_CLASS_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EAbstractXmlTransformer()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EABSTRACT_XML_TRANSFORMER;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Method</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Method</em>' attribute.

+	 * @see #setMethod(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAbstractXmlTransformer_Method()

+	 * @model

+	 * @generated

+	 */

+	public String getMethod()

+	{

+		return method;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlTransformer#getMethod <em>Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Method</em>' attribute.

+	 * @see #getMethod()

+	 * @generated

+	 */

+	public void setMethod(String newMethod)

+	{

+		String oldMethod = method;

+		method = newMethod;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EABSTRACT_XML_TRANSFORMER__METHOD, oldMethod, method));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Transformer Class</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Transformer Class</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Transformer Class</em>' attribute.

+	 * @see #setTransformerClass(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAbstractXmlTransformer_TransformerClass()

+	 * @model

+	 * @generated

+	 */

+	public String getTransformerClass()

+	{

+		return transformerClass;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlTransformer#getTransformerClass <em>Transformer Class</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Transformer Class</em>' attribute.

+	 * @see #getTransformerClass()

+	 * @generated

+	 */

+	public void setTransformerClass(String newTransformerClass)

+	{

+		String oldTransformerClass = transformerClass;

+		transformerClass = newTransformerClass;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EABSTRACT_XML_TRANSFORMER__TRANSFORMER_CLASS, oldTransformerClass, transformerClass));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EABSTRACT_XML_TRANSFORMER__METHOD:

+				return getMethod();

+			case OxmPackage.EABSTRACT_XML_TRANSFORMER__TRANSFORMER_CLASS:

+				return getTransformerClass();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EABSTRACT_XML_TRANSFORMER__METHOD:

+				setMethod((String)newValue);

+				return;

+			case OxmPackage.EABSTRACT_XML_TRANSFORMER__TRANSFORMER_CLASS:

+				setTransformerClass((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EABSTRACT_XML_TRANSFORMER__METHOD:

+				setMethod(METHOD_EDEFAULT);

+				return;

+			case OxmPackage.EABSTRACT_XML_TRANSFORMER__TRANSFORMER_CLASS:

+				setTransformerClass(TRANSFORMER_CLASS_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EABSTRACT_XML_TRANSFORMER__METHOD:

+				return METHOD_EDEFAULT == null ? method != null : !METHOD_EDEFAULT.equals(method);

+			case OxmPackage.EABSTRACT_XML_TRANSFORMER__TRANSFORMER_CLASS:

+				return TRANSFORMER_CLASS_EDEFAULT == null ? transformerClass != null : !TRANSFORMER_CLASS_EDEFAULT.equals(transformerClass);

+		}

+		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(" (method: ");

+		result.append(method);

+		result.append(", transformerClass: ");

+		result.append(transformerClass);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EAbstractXmlTransformer

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EAccessibleJavaAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EAccessibleJavaAttribute.java
new file mode 100644
index 0000000000..2945a49b8b
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EAccessibleJavaAttribute.java
@@ -0,0 +1,52 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EAccessible Java Attribute</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAccessibleJavaAttribute#getXmlAccessMethods <em>Xml Access Methods</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAccessibleJavaAttribute()

+ * @model kind="class" interface="true" abstract="true"

+ * @extends EBaseObject

+ * @generated

+ */

+public interface EAccessibleJavaAttribute extends EBaseObject

+{

+	/**

+	 * Returns the value of the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Access Methods</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #setXmlAccessMethods(EXmlAccessMethods)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAccessibleJavaAttribute_XmlAccessMethods()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EXmlAccessMethods getXmlAccessMethods();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAccessibleJavaAttribute#getXmlAccessMethods <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 */

+	void setXmlAccessMethods(EXmlAccessMethods value);

+

+} // EAccessibleJavaAttribute

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EAdaptableJavaAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EAdaptableJavaAttribute.java
new file mode 100644
index 0000000000..fb6172f5dd
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EAdaptableJavaAttribute.java
@@ -0,0 +1,52 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EAdaptable Java Attribute</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAdaptableJavaAttribute#getXmlJavaTypeAdapter <em>Xml Java Type Adapter</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAdaptableJavaAttribute()

+ * @model kind="class" interface="true" abstract="true"

+ * @extends EBaseObject

+ * @generated

+ */

+public interface EAdaptableJavaAttribute extends EBaseObject

+{

+	/**

+	 * Returns the value of the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Java Type Adapter</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #setXmlJavaTypeAdapter(EXmlJavaTypeAdapter)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAdaptableJavaAttribute_XmlJavaTypeAdapter()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EXmlJavaTypeAdapter getXmlJavaTypeAdapter();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAdaptableJavaAttribute#getXmlJavaTypeAdapter <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 */

+	void setXmlJavaTypeAdapter(EXmlJavaTypeAdapter value);

+

+} // EAdaptableJavaAttribute

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EContainerJavaAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EContainerJavaAttribute.java
new file mode 100644
index 0000000000..66ce42e7d5
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EContainerJavaAttribute.java
@@ -0,0 +1,52 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EContainer Java Attribute</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EContainerJavaAttribute#getContainerType <em>Container Type</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEContainerJavaAttribute()

+ * @model kind="class" interface="true" abstract="true"

+ * @extends EBaseObject

+ * @generated

+ */

+public interface EContainerJavaAttribute extends EBaseObject

+{

+	/**

+	 * Returns the value of the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Container Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Container Type</em>' attribute.

+	 * @see #setContainerType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEContainerJavaAttribute_ContainerType()

+	 * @model

+	 * @generated

+	 */

+	String getContainerType();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EContainerJavaAttribute#getContainerType <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Container Type</em>' attribute.

+	 * @see #getContainerType()

+	 * @generated

+	 */

+	void setContainerType(String value);

+

+} // EContainerJavaAttribute

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EJavaAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EJavaAttribute.java
new file mode 100644
index 0000000000..27dca7bd59
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EJavaAttribute.java
@@ -0,0 +1,418 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.HashMap;

+import java.util.Map;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+import org.eclipse.wst.common.internal.emf.resource.MultiObjectTranslator;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EJava Attribute</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute#getJavaAttribute <em>Java Attribute</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute#getXmlAccessorType <em>Xml Accessor Type</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaAttribute()

+ * @model kind="class" abstract="true"

+ * @extends EBaseObject

+ * @generated

+ */

+public abstract class EJavaAttribute extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getJavaAttribute() <em>Java Attribute</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getJavaAttribute()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String JAVA_ATTRIBUTE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getJavaAttribute() <em>Java Attribute</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getJavaAttribute()

+	 * @generated

+	 * @ordered

+	 */

+	protected String javaAttribute = JAVA_ATTRIBUTE_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getXmlAccessorType() <em>Xml Accessor Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessorType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final EXmlAccessType XML_ACCESSOR_TYPE_EDEFAULT = EXmlAccessType.FIELD;

+

+	/**

+	 * The cached value of the '{@link #getXmlAccessorType() <em>Xml Accessor Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessorType()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessType xmlAccessorType = XML_ACCESSOR_TYPE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EJavaAttribute()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EJAVA_ATTRIBUTE;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Java Attribute</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Java Attribute</em>' attribute.

+	 * @see #setJavaAttribute(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaAttribute_JavaAttribute()

+	 * @model

+	 * @generated

+	 */

+	public String getJavaAttribute()

+	{

+		return javaAttribute;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute#getJavaAttribute <em>Java Attribute</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Java Attribute</em>' attribute.

+	 * @see #getJavaAttribute()

+	 * @generated

+	 */

+	public void setJavaAttribute(String newJavaAttribute)

+	{

+		String oldJavaAttribute = javaAttribute;

+		javaAttribute = newJavaAttribute;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE, oldJavaAttribute, javaAttribute));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * The literals are from the enumeration {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Accessor Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Accessor Type</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType

+	 * @see #setXmlAccessorType(EXmlAccessType)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaAttribute_XmlAccessorType()

+	 * @model

+	 * @generated

+	 */

+	public EXmlAccessType getXmlAccessorType()

+	{

+		return xmlAccessorType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute#getXmlAccessorType <em>Xml Accessor Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Accessor Type</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType

+	 * @see #getXmlAccessorType()

+	 * @generated

+	 */

+	public void setXmlAccessorType(EXmlAccessType newXmlAccessorType)

+	{

+		EXmlAccessType oldXmlAccessorType = xmlAccessorType;

+		xmlAccessorType = newXmlAccessorType == null ? XML_ACCESSOR_TYPE_EDEFAULT : newXmlAccessorType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE, oldXmlAccessorType, xmlAccessorType));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE:

+				return getJavaAttribute();

+			case OxmPackage.EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE:

+				return getXmlAccessorType();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE:

+				setJavaAttribute((String)newValue);

+				return;

+			case OxmPackage.EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE:

+				setXmlAccessorType((EXmlAccessType)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE:

+				setJavaAttribute(JAVA_ATTRIBUTE_EDEFAULT);

+				return;

+			case OxmPackage.EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE:

+				setXmlAccessorType(XML_ACCESSOR_TYPE_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE:

+				return JAVA_ATTRIBUTE_EDEFAULT == null ? javaAttribute != null : !JAVA_ATTRIBUTE_EDEFAULT.equals(javaAttribute);

+			case OxmPackage.EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE:

+				return xmlAccessorType != XML_ACCESSOR_TYPE_EDEFAULT;

+		}

+		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(" (javaAttribute: ");

+		result.append(javaAttribute);

+		result.append(", xmlAccessorType: ");

+		result.append(xmlAccessorType);

+		result.append(')');

+		return result.toString();

+	}

+	

+	

+	// ***** translators *****

+	

+	static class JavaAttributesTranslator

+			extends MultiObjectTranslator {

+		

+		protected static String DOM_PATH = 

+				EclipseLink.JAVA_ATTRIBUTES + "/"

+						+ EclipseLink.XML_ANY_ATTRIBUTE + ","

+						+ EclipseLink.XML_ANY_ELEMENT + ","

+						+ EclipseLink.XML_ATTRIBUTE + ","

+						+ EclipseLink.XML_ELEMENT + ","

+						+ EclipseLink.XML_ELEMENT_REF + ","

+						+ EclipseLink.XML_ELEMENT_REFS + ","

+						+ EclipseLink.XML_ELEMENTS + ","

+						+ EclipseLink.XML_INVERSE_REFERENCE + ","

+						+ EclipseLink.XML_JAVA_TYPE_ADAPTER + ","

+						+ EclipseLink.XML_JOIN_NODES + ","

+						+ EclipseLink.XML_TRANSFORMATION + ","

+						+ EclipseLink.XML_TRANSIENT + ","

+						+ EclipseLink.XML_VALUE;

+		

+		protected static Map<String, Translator> DELEGATES = new HashMap<String, Translator>();

+		

+						

+		JavaAttributesTranslator() {

+			super(DOM_PATH, OxmPackage.eINSTANCE.getEJavaType_JavaAttributes());

+		}

+		

+		

+		protected static Map<String, Translator> delegates() {

+			if (DELEGATES.isEmpty()) {

+				

+				String pathPrefix = EclipseLink.JAVA_ATTRIBUTES + "/";

+				EStructuralFeature eStructuralFeature = OxmPackage.eINSTANCE.getEJavaType_JavaAttributes();

+				

+				String path = EclipseLink.XML_ANY_ATTRIBUTE;

+				DELEGATES.put(path, 

+					new EXmlAnyAttribute.XmlAnyAttributeTranslator(pathPrefix + path, eStructuralFeature));

+				

+				path = EclipseLink.XML_ANY_ELEMENT;

+				DELEGATES.put(path, 

+					new EXmlAnyElement.XmlAnyElementTranslator(pathPrefix + path, eStructuralFeature));

+				

+				path = EclipseLink.XML_ATTRIBUTE;

+				DELEGATES.put(path, 

+					new EXmlAttribute.XmlAttributeTranslator(pathPrefix + path, eStructuralFeature));

+				

+				path = EclipseLink.XML_ELEMENT;

+				DELEGATES.put(path, 

+					new EXmlElement.XmlElementTranslator(pathPrefix + path, eStructuralFeature));

+				

+				path = EclipseLink.XML_ELEMENT_REF;

+				DELEGATES.put(path, 

+					new EXmlElementRef.XmlElementRefTranslator(pathPrefix + path, eStructuralFeature));

+				

+				path = EclipseLink.XML_ELEMENT_REFS;

+				DELEGATES.put(path, 

+					new EXmlElementRefs.XmlElementRefsTranslator(pathPrefix + path, eStructuralFeature));

+				

+				path = EclipseLink.XML_ELEMENTS;

+				DELEGATES.put(path, 

+					new EXmlElements.XmlElementsTranslator(pathPrefix + path, eStructuralFeature));

+				

+				path = EclipseLink.XML_INVERSE_REFERENCE;

+				DELEGATES.put(path, 

+					new EXmlInverseReference.XmlInverseReferenceTranslator(pathPrefix + path, eStructuralFeature));

+				

+				path = EclipseLink.XML_JAVA_TYPE_ADAPTER;

+				DELEGATES.put(path, 

+					new EXmlJavaTypeAdapter.XmlJavaTypeAdapterTranslator(pathPrefix + path, eStructuralFeature));

+				

+				path = EclipseLink.XML_JOIN_NODES;

+				DELEGATES.put(path, 

+					new EXmlJoinNodes.XmlJoinNodesTranslator(pathPrefix + path, eStructuralFeature));

+				

+				path = EclipseLink.XML_TRANSFORMATION;

+				DELEGATES.put(path, 

+					new EXmlTransformation.XmlTransformationTranslator(pathPrefix + path, eStructuralFeature));

+				

+				path = EclipseLink.XML_TRANSIENT;

+				DELEGATES.put(path, 

+					new EXmlTransient.XmlTransientTranslator(pathPrefix + path, eStructuralFeature));

+				

+				path = EclipseLink.XML_VALUE;

+				DELEGATES.put(path, 

+					new EXmlValue.XmlValueTranslator(pathPrefix + path, eStructuralFeature));

+			}

+			return DELEGATES;

+		}

+		

+		protected static String wrappedPath(String path) {

+			return EclipseLink.JAVA_ATTRIBUTES + "/" + path;

+		}

+		

+		@Override

+		public Translator getDelegateFor(EObject o) {

+			switch (o.eClass().getClassifierID()) {

+				case OxmPackage.EXML_ANY_ATTRIBUTE :

+					return delegates().get(EclipseLink.XML_ANY_ATTRIBUTE);

+				case OxmPackage.EXML_ANY_ELEMENT :

+					return delegates().get(EclipseLink.XML_ANY_ELEMENT);

+				case OxmPackage.EXML_ATTRIBUTE :

+					return delegates().get(EclipseLink.XML_ATTRIBUTE);

+				case OxmPackage.EXML_ELEMENT :

+					return delegates().get(EclipseLink.XML_ELEMENT);

+				case OxmPackage.EXML_ELEMENT_REF :

+					return delegates().get(EclipseLink.XML_ELEMENT_REF);

+				case OxmPackage.EXML_ELEMENT_REFS:

+					return delegates().get(EclipseLink.XML_ELEMENT_REFS);

+				case OxmPackage.EXML_ELEMENTS:

+					return delegates().get(EclipseLink.XML_ELEMENTS);

+				case OxmPackage.EXML_INVERSE_REFERENCE :

+					return delegates().get(EclipseLink.XML_INVERSE_REFERENCE);

+				case OxmPackage.EXML_JAVA_TYPE_ADAPTER :

+					return delegates().get(EclipseLink.XML_JAVA_TYPE_ADAPTER);

+				case OxmPackage.EXML_JOIN_NODES :

+					return delegates().get(EclipseLink.XML_JOIN_NODES);

+				case OxmPackage.EXML_TRANSFORMATION :

+					return delegates().get(EclipseLink.XML_TRANSFORMATION);

+				case OxmPackage.EXML_TRANSIENT :

+					return delegates().get(EclipseLink.XML_TRANSIENT);

+				case OxmPackage.EXML_VALUE :

+					return delegates().get(EclipseLink.XML_VALUE);

+				

+			}

+			throw new IllegalStateException("Java attribute expected"); //$NON-NLS-1$

+		}

+		

+		@Override

+		public Translator getDelegateFor(String domName, String readAheadName) {

+			return delegates().get(domName);

+		}

+	}

+	

+	

+	abstract static class AbstractJavaAttributeTranslator

+			extends SimpleTranslator {

+		

+		protected AbstractJavaAttributeTranslator(

+				String domPathAndName, EStructuralFeature eStructuralFeature, Translator[] translatorChildren) {

+			super(EclipseLink.JAVA_ATTRIBUTES + "/" + domPathAndName, eStructuralFeature, translatorChildren);

+		}

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EJavaType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EJavaType.java
new file mode 100644
index 0000000000..cbf525aea9
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EJavaType.java
@@ -0,0 +1,1396 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import java.util.List;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EJava Type</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getSuperType <em>Super Type</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlAccessorOrder <em>Xml Accessor Order</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlAccessorType <em>Xml Accessor Type</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlCustomizer <em>Xml Customizer</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlDiscriminatorNode <em>Xml Discriminator Node</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlDiscriminatorValue <em>Xml Discriminator Value</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#isXmlInlineBinaryData <em>Xml Inline Binary Data</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#isXmlTransient <em>Xml Transient</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlNameTransformer <em>Xml Name Transformer</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlType <em>Xml Type</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlRootElement <em>Xml Root Element</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlVirtualAccessMethods <em>Xml Virtual Access Methods</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlSeeAlso <em>Xml See Also</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlJavaTypeAdapter <em>Xml Java Type Adapter</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlClassExtractor <em>Xml Class Extractor</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getJavaAttributes <em>Java Attributes</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType()

+ * @model kind="class"

+ * @generated

+ */

+public class EJavaType extends EBaseObjectImpl implements EPropertyHolder

+{

+	/**

+	 * The cached value of the '{@link #getXmlProperties() <em>Xml Properties</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlProperties()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlProperty> xmlProperties;

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getSuperType() <em>Super Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getSuperType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String SUPER_TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getSuperType() <em>Super Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getSuperType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String superType = SUPER_TYPE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getXmlAccessorOrder() <em>Xml Accessor Order</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessorOrder()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final EXmlAccessOrder XML_ACCESSOR_ORDER_EDEFAULT = EXmlAccessOrder.ALPHABETICAL;

+	/**

+	 * The cached value of the '{@link #getXmlAccessorOrder() <em>Xml Accessor Order</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessorOrder()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessOrder xmlAccessorOrder = XML_ACCESSOR_ORDER_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getXmlAccessorType() <em>Xml Accessor Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessorType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final EXmlAccessType XML_ACCESSOR_TYPE_EDEFAULT = EXmlAccessType.FIELD;

+	/**

+	 * The cached value of the '{@link #getXmlAccessorType() <em>Xml Accessor Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessorType()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessType xmlAccessorType = XML_ACCESSOR_TYPE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getXmlCustomizer() <em>Xml Customizer</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlCustomizer()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String XML_CUSTOMIZER_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getXmlCustomizer() <em>Xml Customizer</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlCustomizer()

+	 * @generated

+	 * @ordered

+	 */

+	protected String xmlCustomizer = XML_CUSTOMIZER_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getXmlDiscriminatorNode() <em>Xml Discriminator Node</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlDiscriminatorNode()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String XML_DISCRIMINATOR_NODE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getXmlDiscriminatorNode() <em>Xml Discriminator Node</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlDiscriminatorNode()

+	 * @generated

+	 * @ordered

+	 */

+	protected String xmlDiscriminatorNode = XML_DISCRIMINATOR_NODE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getXmlDiscriminatorValue() <em>Xml Discriminator Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlDiscriminatorValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String XML_DISCRIMINATOR_VALUE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getXmlDiscriminatorValue() <em>Xml Discriminator Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlDiscriminatorValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected String xmlDiscriminatorValue = XML_DISCRIMINATOR_VALUE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlInlineBinaryData() <em>Xml Inline Binary Data</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlInlineBinaryData()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_INLINE_BINARY_DATA_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlInlineBinaryData() <em>Xml Inline Binary Data</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlInlineBinaryData()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlInlineBinaryData = XML_INLINE_BINARY_DATA_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlTransient() <em>Xml Transient</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlTransient()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_TRANSIENT_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlTransient() <em>Xml Transient</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlTransient()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlTransient = XML_TRANSIENT_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getXmlNameTransformer() <em>Xml Name Transformer</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlNameTransformer()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String XML_NAME_TRANSFORMER_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getXmlNameTransformer() <em>Xml Name Transformer</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlNameTransformer()

+	 * @generated

+	 * @ordered

+	 */

+	protected String xmlNameTransformer = XML_NAME_TRANSFORMER_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlType() <em>Xml Type</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlType()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlType xmlType;

+	/**

+	 * The cached value of the '{@link #getXmlRootElement() <em>Xml Root Element</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlRootElement()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlRootElement xmlRootElement;

+	/**

+	 * The cached value of the '{@link #getXmlVirtualAccessMethods() <em>Xml Virtual Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlVirtualAccessMethods()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlVirtualAccessMethods xmlVirtualAccessMethods;

+	/**

+	 * The default value of the '{@link #getXmlSeeAlso() <em>Xml See Also</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlSeeAlso()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final List<String> XML_SEE_ALSO_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getXmlSeeAlso() <em>Xml See Also</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlSeeAlso()

+	 * @generated

+	 * @ordered

+	 */

+	protected List<String> xmlSeeAlso = XML_SEE_ALSO_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlJavaTypeAdapter() <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlJavaTypeAdapter xmlJavaTypeAdapter;

+	/**

+	 * The cached value of the '{@link #getXmlClassExtractor() <em>Xml Class Extractor</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlClassExtractor()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlClassExtractor xmlClassExtractor;

+	/**

+	 * The cached value of the '{@link #getJavaAttributes() <em>Java Attributes</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getJavaAttributes()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EJavaAttribute> javaAttributes;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EJavaType()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EJAVA_TYPE;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Properties</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Properties</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder_XmlProperties()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlProperty> getXmlProperties()

+	{

+		if (xmlProperties == null)

+		{

+			xmlProperties = new EObjectContainmentEList<EXmlProperty>(EXmlProperty.class, this, OxmPackage.EJAVA_TYPE__XML_PROPERTIES);

+		}

+		return xmlProperties;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_Name()

+	 * @model

+	 * @generated

+	 */

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__NAME, oldName, name));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Super Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Super Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Super Type</em>' attribute.

+	 * @see #setSuperType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_SuperType()

+	 * @model

+	 * @generated

+	 */

+	public String getSuperType()

+	{

+		return superType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getSuperType <em>Super Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Super Type</em>' attribute.

+	 * @see #getSuperType()

+	 * @generated

+	 */

+	public void setSuperType(String newSuperType)

+	{

+		String oldSuperType = superType;

+		superType = newSuperType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__SUPER_TYPE, oldSuperType, superType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Accessor Order</b></em>' attribute.

+	 * The literals are from the enumeration {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Accessor Order</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Accessor Order</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder

+	 * @see #setXmlAccessorOrder(EXmlAccessOrder)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_XmlAccessorOrder()

+	 * @model

+	 * @generated

+	 */

+	public EXmlAccessOrder getXmlAccessorOrder()

+	{

+		return xmlAccessorOrder;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlAccessorOrder <em>Xml Accessor Order</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Accessor Order</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder

+	 * @see #getXmlAccessorOrder()

+	 * @generated

+	 */

+	public void setXmlAccessorOrder(EXmlAccessOrder newXmlAccessorOrder)

+	{

+		EXmlAccessOrder oldXmlAccessorOrder = xmlAccessorOrder;

+		xmlAccessorOrder = newXmlAccessorOrder == null ? XML_ACCESSOR_ORDER_EDEFAULT : newXmlAccessorOrder;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_ACCESSOR_ORDER, oldXmlAccessorOrder, xmlAccessorOrder));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * The literals are from the enumeration {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Accessor Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Accessor Type</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType

+	 * @see #setXmlAccessorType(EXmlAccessType)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_XmlAccessorType()

+	 * @model

+	 * @generated

+	 */

+	public EXmlAccessType getXmlAccessorType()

+	{

+		return xmlAccessorType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlAccessorType <em>Xml Accessor Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Accessor Type</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType

+	 * @see #getXmlAccessorType()

+	 * @generated

+	 */

+	public void setXmlAccessorType(EXmlAccessType newXmlAccessorType)

+	{

+		EXmlAccessType oldXmlAccessorType = xmlAccessorType;

+		xmlAccessorType = newXmlAccessorType == null ? XML_ACCESSOR_TYPE_EDEFAULT : newXmlAccessorType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_ACCESSOR_TYPE, oldXmlAccessorType, xmlAccessorType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Customizer</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Customizer</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Customizer</em>' attribute.

+	 * @see #setXmlCustomizer(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_XmlCustomizer()

+	 * @model

+	 * @generated

+	 */

+	public String getXmlCustomizer()

+	{

+		return xmlCustomizer;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlCustomizer <em>Xml Customizer</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Customizer</em>' attribute.

+	 * @see #getXmlCustomizer()

+	 * @generated

+	 */

+	public void setXmlCustomizer(String newXmlCustomizer)

+	{

+		String oldXmlCustomizer = xmlCustomizer;

+		xmlCustomizer = newXmlCustomizer;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_CUSTOMIZER, oldXmlCustomizer, xmlCustomizer));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Discriminator Node</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Discriminator Node</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Discriminator Node</em>' attribute.

+	 * @see #setXmlDiscriminatorNode(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_XmlDiscriminatorNode()

+	 * @model

+	 * @generated

+	 */

+	public String getXmlDiscriminatorNode()

+	{

+		return xmlDiscriminatorNode;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlDiscriminatorNode <em>Xml Discriminator Node</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Discriminator Node</em>' attribute.

+	 * @see #getXmlDiscriminatorNode()

+	 * @generated

+	 */

+	public void setXmlDiscriminatorNode(String newXmlDiscriminatorNode)

+	{

+		String oldXmlDiscriminatorNode = xmlDiscriminatorNode;

+		xmlDiscriminatorNode = newXmlDiscriminatorNode;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_DISCRIMINATOR_NODE, oldXmlDiscriminatorNode, xmlDiscriminatorNode));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Discriminator Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Discriminator Value</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Discriminator Value</em>' attribute.

+	 * @see #setXmlDiscriminatorValue(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_XmlDiscriminatorValue()

+	 * @model

+	 * @generated

+	 */

+	public String getXmlDiscriminatorValue()

+	{

+		return xmlDiscriminatorValue;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlDiscriminatorValue <em>Xml Discriminator Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Discriminator Value</em>' attribute.

+	 * @see #getXmlDiscriminatorValue()

+	 * @generated

+	 */

+	public void setXmlDiscriminatorValue(String newXmlDiscriminatorValue)

+	{

+		String oldXmlDiscriminatorValue = xmlDiscriminatorValue;

+		xmlDiscriminatorValue = newXmlDiscriminatorValue;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_DISCRIMINATOR_VALUE, oldXmlDiscriminatorValue, xmlDiscriminatorValue));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Inline Binary Data</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Inline Binary Data</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Inline Binary Data</em>' attribute.

+	 * @see #setXmlInlineBinaryData(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_XmlInlineBinaryData()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlInlineBinaryData()

+	{

+		return xmlInlineBinaryData;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#isXmlInlineBinaryData <em>Xml Inline Binary Data</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Inline Binary Data</em>' attribute.

+	 * @see #isXmlInlineBinaryData()

+	 * @generated

+	 */

+	public void setXmlInlineBinaryData(boolean newXmlInlineBinaryData)

+	{

+		boolean oldXmlInlineBinaryData = xmlInlineBinaryData;

+		xmlInlineBinaryData = newXmlInlineBinaryData;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_INLINE_BINARY_DATA, oldXmlInlineBinaryData, xmlInlineBinaryData));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Transient</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Transient</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Transient</em>' attribute.

+	 * @see #setXmlTransient(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_XmlTransient()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlTransient()

+	{

+		return xmlTransient;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#isXmlTransient <em>Xml Transient</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Transient</em>' attribute.

+	 * @see #isXmlTransient()

+	 * @generated

+	 */

+	public void setXmlTransient(boolean newXmlTransient)

+	{

+		boolean oldXmlTransient = xmlTransient;

+		xmlTransient = newXmlTransient;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_TRANSIENT, oldXmlTransient, xmlTransient));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Name Transformer</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Name Transformer</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Name Transformer</em>' attribute.

+	 * @see #setXmlNameTransformer(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_XmlNameTransformer()

+	 * @model

+	 * @generated

+	 */

+	public String getXmlNameTransformer()

+	{

+		return xmlNameTransformer;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlNameTransformer <em>Xml Name Transformer</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Name Transformer</em>' attribute.

+	 * @see #getXmlNameTransformer()

+	 * @generated

+	 */

+	public void setXmlNameTransformer(String newXmlNameTransformer)

+	{

+		String oldXmlNameTransformer = xmlNameTransformer;

+		xmlNameTransformer = newXmlNameTransformer;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_NAME_TRANSFORMER, oldXmlNameTransformer, xmlNameTransformer));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Type</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Type</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Type</em>' containment reference.

+	 * @see #setXmlType(EXmlType)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_XmlType()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlType getXmlType()

+	{

+		return xmlType;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlType(EXmlType newXmlType, NotificationChain msgs)

+	{

+		EXmlType oldXmlType = xmlType;

+		xmlType = newXmlType;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_TYPE, oldXmlType, newXmlType);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlType <em>Xml Type</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Type</em>' containment reference.

+	 * @see #getXmlType()

+	 * @generated

+	 */

+	public void setXmlType(EXmlType newXmlType)

+	{

+		if (newXmlType != xmlType)

+		{

+			NotificationChain msgs = null;

+			if (xmlType != null)

+				msgs = ((InternalEObject)xmlType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EJAVA_TYPE__XML_TYPE, null, msgs);

+			if (newXmlType != null)

+				msgs = ((InternalEObject)newXmlType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EJAVA_TYPE__XML_TYPE, null, msgs);

+			msgs = basicSetXmlType(newXmlType, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_TYPE, newXmlType, newXmlType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Root Element</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Root Element</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Root Element</em>' containment reference.

+	 * @see #setXmlRootElement(EXmlRootElement)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_XmlRootElement()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlRootElement getXmlRootElement()

+	{

+		return xmlRootElement;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlRootElement(EXmlRootElement newXmlRootElement, NotificationChain msgs)

+	{

+		EXmlRootElement oldXmlRootElement = xmlRootElement;

+		xmlRootElement = newXmlRootElement;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_ROOT_ELEMENT, oldXmlRootElement, newXmlRootElement);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlRootElement <em>Xml Root Element</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Root Element</em>' containment reference.

+	 * @see #getXmlRootElement()

+	 * @generated

+	 */

+	public void setXmlRootElement(EXmlRootElement newXmlRootElement)

+	{

+		if (newXmlRootElement != xmlRootElement)

+		{

+			NotificationChain msgs = null;

+			if (xmlRootElement != null)

+				msgs = ((InternalEObject)xmlRootElement).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EJAVA_TYPE__XML_ROOT_ELEMENT, null, msgs);

+			if (newXmlRootElement != null)

+				msgs = ((InternalEObject)newXmlRootElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EJAVA_TYPE__XML_ROOT_ELEMENT, null, msgs);

+			msgs = basicSetXmlRootElement(newXmlRootElement, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_ROOT_ELEMENT, newXmlRootElement, newXmlRootElement));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Virtual Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Virtual Access Methods</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Virtual Access Methods</em>' containment reference.

+	 * @see #setXmlVirtualAccessMethods(EXmlVirtualAccessMethods)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_XmlVirtualAccessMethods()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlVirtualAccessMethods getXmlVirtualAccessMethods()

+	{

+		return xmlVirtualAccessMethods;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlVirtualAccessMethods(EXmlVirtualAccessMethods newXmlVirtualAccessMethods, NotificationChain msgs)

+	{

+		EXmlVirtualAccessMethods oldXmlVirtualAccessMethods = xmlVirtualAccessMethods;

+		xmlVirtualAccessMethods = newXmlVirtualAccessMethods;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_VIRTUAL_ACCESS_METHODS, oldXmlVirtualAccessMethods, newXmlVirtualAccessMethods);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlVirtualAccessMethods <em>Xml Virtual Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Virtual Access Methods</em>' containment reference.

+	 * @see #getXmlVirtualAccessMethods()

+	 * @generated

+	 */

+	public void setXmlVirtualAccessMethods(EXmlVirtualAccessMethods newXmlVirtualAccessMethods)

+	{

+		if (newXmlVirtualAccessMethods != xmlVirtualAccessMethods)

+		{

+			NotificationChain msgs = null;

+			if (xmlVirtualAccessMethods != null)

+				msgs = ((InternalEObject)xmlVirtualAccessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EJAVA_TYPE__XML_VIRTUAL_ACCESS_METHODS, null, msgs);

+			if (newXmlVirtualAccessMethods != null)

+				msgs = ((InternalEObject)newXmlVirtualAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EJAVA_TYPE__XML_VIRTUAL_ACCESS_METHODS, null, msgs);

+			msgs = basicSetXmlVirtualAccessMethods(newXmlVirtualAccessMethods, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_VIRTUAL_ACCESS_METHODS, newXmlVirtualAccessMethods, newXmlVirtualAccessMethods));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml See Also</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml See Also</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml See Also</em>' attribute.

+	 * @see #setXmlSeeAlso(List)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_XmlSeeAlso()

+	 * @model dataType="org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSeeAlso" many="false"

+	 * @generated

+	 */

+	public List<String> getXmlSeeAlso()

+	{

+		return xmlSeeAlso;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlSeeAlso <em>Xml See Also</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml See Also</em>' attribute.

+	 * @see #getXmlSeeAlso()

+	 * @generated

+	 */

+	public void setXmlSeeAlso(List<String> newXmlSeeAlso)

+	{

+		List<String> oldXmlSeeAlso = xmlSeeAlso;

+		xmlSeeAlso = newXmlSeeAlso;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_SEE_ALSO, oldXmlSeeAlso, xmlSeeAlso));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Java Type Adapter</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #setXmlJavaTypeAdapter(EXmlJavaTypeAdapter)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_XmlJavaTypeAdapter()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlJavaTypeAdapter getXmlJavaTypeAdapter()

+	{

+		return xmlJavaTypeAdapter;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlJavaTypeAdapter(EXmlJavaTypeAdapter newXmlJavaTypeAdapter, NotificationChain msgs)

+	{

+		EXmlJavaTypeAdapter oldXmlJavaTypeAdapter = xmlJavaTypeAdapter;

+		xmlJavaTypeAdapter = newXmlJavaTypeAdapter;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_JAVA_TYPE_ADAPTER, oldXmlJavaTypeAdapter, newXmlJavaTypeAdapter);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlJavaTypeAdapter <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 */

+	public void setXmlJavaTypeAdapter(EXmlJavaTypeAdapter newXmlJavaTypeAdapter)

+	{

+		if (newXmlJavaTypeAdapter != xmlJavaTypeAdapter)

+		{

+			NotificationChain msgs = null;

+			if (xmlJavaTypeAdapter != null)

+				msgs = ((InternalEObject)xmlJavaTypeAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EJAVA_TYPE__XML_JAVA_TYPE_ADAPTER, null, msgs);

+			if (newXmlJavaTypeAdapter != null)

+				msgs = ((InternalEObject)newXmlJavaTypeAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EJAVA_TYPE__XML_JAVA_TYPE_ADAPTER, null, msgs);

+			msgs = basicSetXmlJavaTypeAdapter(newXmlJavaTypeAdapter, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_JAVA_TYPE_ADAPTER, newXmlJavaTypeAdapter, newXmlJavaTypeAdapter));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Class Extractor</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Class Extractor</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Class Extractor</em>' containment reference.

+	 * @see #setXmlClassExtractor(EXmlClassExtractor)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_XmlClassExtractor()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlClassExtractor getXmlClassExtractor()

+	{

+		return xmlClassExtractor;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlClassExtractor(EXmlClassExtractor newXmlClassExtractor, NotificationChain msgs)

+	{

+		EXmlClassExtractor oldXmlClassExtractor = xmlClassExtractor;

+		xmlClassExtractor = newXmlClassExtractor;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_CLASS_EXTRACTOR, oldXmlClassExtractor, newXmlClassExtractor);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlClassExtractor <em>Xml Class Extractor</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Class Extractor</em>' containment reference.

+	 * @see #getXmlClassExtractor()

+	 * @generated

+	 */

+	public void setXmlClassExtractor(EXmlClassExtractor newXmlClassExtractor)

+	{

+		if (newXmlClassExtractor != xmlClassExtractor)

+		{

+			NotificationChain msgs = null;

+			if (xmlClassExtractor != null)

+				msgs = ((InternalEObject)xmlClassExtractor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EJAVA_TYPE__XML_CLASS_EXTRACTOR, null, msgs);

+			if (newXmlClassExtractor != null)

+				msgs = ((InternalEObject)newXmlClassExtractor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EJAVA_TYPE__XML_CLASS_EXTRACTOR, null, msgs);

+			msgs = basicSetXmlClassExtractor(newXmlClassExtractor, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EJAVA_TYPE__XML_CLASS_EXTRACTOR, newXmlClassExtractor, newXmlClassExtractor));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Java Attributes</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Java Attributes</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Java Attributes</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType_JavaAttributes()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EJavaAttribute> getJavaAttributes()

+	{

+		if (javaAttributes == null)

+		{

+			javaAttributes = new EObjectContainmentEList<EJavaAttribute>(EJavaAttribute.class, this, OxmPackage.EJAVA_TYPE__JAVA_ATTRIBUTES);

+		}

+		return javaAttributes;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EJAVA_TYPE__XML_PROPERTIES:

+				return ((InternalEList<?>)getXmlProperties()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EJAVA_TYPE__XML_TYPE:

+				return basicSetXmlType(null, msgs);

+			case OxmPackage.EJAVA_TYPE__XML_ROOT_ELEMENT:

+				return basicSetXmlRootElement(null, msgs);

+			case OxmPackage.EJAVA_TYPE__XML_VIRTUAL_ACCESS_METHODS:

+				return basicSetXmlVirtualAccessMethods(null, msgs);

+			case OxmPackage.EJAVA_TYPE__XML_JAVA_TYPE_ADAPTER:

+				return basicSetXmlJavaTypeAdapter(null, msgs);

+			case OxmPackage.EJAVA_TYPE__XML_CLASS_EXTRACTOR:

+				return basicSetXmlClassExtractor(null, msgs);

+			case OxmPackage.EJAVA_TYPE__JAVA_ATTRIBUTES:

+				return ((InternalEList<?>)getJavaAttributes()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EJAVA_TYPE__XML_PROPERTIES:

+				return getXmlProperties();

+			case OxmPackage.EJAVA_TYPE__NAME:

+				return getName();

+			case OxmPackage.EJAVA_TYPE__SUPER_TYPE:

+				return getSuperType();

+			case OxmPackage.EJAVA_TYPE__XML_ACCESSOR_ORDER:

+				return getXmlAccessorOrder();

+			case OxmPackage.EJAVA_TYPE__XML_ACCESSOR_TYPE:

+				return getXmlAccessorType();

+			case OxmPackage.EJAVA_TYPE__XML_CUSTOMIZER:

+				return getXmlCustomizer();

+			case OxmPackage.EJAVA_TYPE__XML_DISCRIMINATOR_NODE:

+				return getXmlDiscriminatorNode();

+			case OxmPackage.EJAVA_TYPE__XML_DISCRIMINATOR_VALUE:

+				return getXmlDiscriminatorValue();

+			case OxmPackage.EJAVA_TYPE__XML_INLINE_BINARY_DATA:

+				return isXmlInlineBinaryData();

+			case OxmPackage.EJAVA_TYPE__XML_TRANSIENT:

+				return isXmlTransient();

+			case OxmPackage.EJAVA_TYPE__XML_NAME_TRANSFORMER:

+				return getXmlNameTransformer();

+			case OxmPackage.EJAVA_TYPE__XML_TYPE:

+				return getXmlType();

+			case OxmPackage.EJAVA_TYPE__XML_ROOT_ELEMENT:

+				return getXmlRootElement();

+			case OxmPackage.EJAVA_TYPE__XML_VIRTUAL_ACCESS_METHODS:

+				return getXmlVirtualAccessMethods();

+			case OxmPackage.EJAVA_TYPE__XML_SEE_ALSO:

+				return getXmlSeeAlso();

+			case OxmPackage.EJAVA_TYPE__XML_JAVA_TYPE_ADAPTER:

+				return getXmlJavaTypeAdapter();

+			case OxmPackage.EJAVA_TYPE__XML_CLASS_EXTRACTOR:

+				return getXmlClassExtractor();

+			case OxmPackage.EJAVA_TYPE__JAVA_ATTRIBUTES:

+				return getJavaAttributes();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EJAVA_TYPE__XML_PROPERTIES:

+				getXmlProperties().clear();

+				getXmlProperties().addAll((Collection<? extends EXmlProperty>)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__NAME:

+				setName((String)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__SUPER_TYPE:

+				setSuperType((String)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_ACCESSOR_ORDER:

+				setXmlAccessorOrder((EXmlAccessOrder)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_ACCESSOR_TYPE:

+				setXmlAccessorType((EXmlAccessType)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_CUSTOMIZER:

+				setXmlCustomizer((String)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_DISCRIMINATOR_NODE:

+				setXmlDiscriminatorNode((String)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_DISCRIMINATOR_VALUE:

+				setXmlDiscriminatorValue((String)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_INLINE_BINARY_DATA:

+				setXmlInlineBinaryData((Boolean)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_TRANSIENT:

+				setXmlTransient((Boolean)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_NAME_TRANSFORMER:

+				setXmlNameTransformer((String)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_TYPE:

+				setXmlType((EXmlType)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_ROOT_ELEMENT:

+				setXmlRootElement((EXmlRootElement)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_VIRTUAL_ACCESS_METHODS:

+				setXmlVirtualAccessMethods((EXmlVirtualAccessMethods)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_SEE_ALSO:

+				setXmlSeeAlso((List<String>)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_JAVA_TYPE_ADAPTER:

+				setXmlJavaTypeAdapter((EXmlJavaTypeAdapter)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_CLASS_EXTRACTOR:

+				setXmlClassExtractor((EXmlClassExtractor)newValue);

+				return;

+			case OxmPackage.EJAVA_TYPE__JAVA_ATTRIBUTES:

+				getJavaAttributes().clear();

+				getJavaAttributes().addAll((Collection<? extends EJavaAttribute>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EJAVA_TYPE__XML_PROPERTIES:

+				getXmlProperties().clear();

+				return;

+			case OxmPackage.EJAVA_TYPE__NAME:

+				setName(NAME_EDEFAULT);

+				return;

+			case OxmPackage.EJAVA_TYPE__SUPER_TYPE:

+				setSuperType(SUPER_TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_ACCESSOR_ORDER:

+				setXmlAccessorOrder(XML_ACCESSOR_ORDER_EDEFAULT);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_ACCESSOR_TYPE:

+				setXmlAccessorType(XML_ACCESSOR_TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_CUSTOMIZER:

+				setXmlCustomizer(XML_CUSTOMIZER_EDEFAULT);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_DISCRIMINATOR_NODE:

+				setXmlDiscriminatorNode(XML_DISCRIMINATOR_NODE_EDEFAULT);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_DISCRIMINATOR_VALUE:

+				setXmlDiscriminatorValue(XML_DISCRIMINATOR_VALUE_EDEFAULT);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_INLINE_BINARY_DATA:

+				setXmlInlineBinaryData(XML_INLINE_BINARY_DATA_EDEFAULT);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_TRANSIENT:

+				setXmlTransient(XML_TRANSIENT_EDEFAULT);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_NAME_TRANSFORMER:

+				setXmlNameTransformer(XML_NAME_TRANSFORMER_EDEFAULT);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_TYPE:

+				setXmlType((EXmlType)null);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_ROOT_ELEMENT:

+				setXmlRootElement((EXmlRootElement)null);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_VIRTUAL_ACCESS_METHODS:

+				setXmlVirtualAccessMethods((EXmlVirtualAccessMethods)null);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_SEE_ALSO:

+				setXmlSeeAlso(XML_SEE_ALSO_EDEFAULT);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_JAVA_TYPE_ADAPTER:

+				setXmlJavaTypeAdapter((EXmlJavaTypeAdapter)null);

+				return;

+			case OxmPackage.EJAVA_TYPE__XML_CLASS_EXTRACTOR:

+				setXmlClassExtractor((EXmlClassExtractor)null);

+				return;

+			case OxmPackage.EJAVA_TYPE__JAVA_ATTRIBUTES:

+				getJavaAttributes().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EJAVA_TYPE__XML_PROPERTIES:

+				return xmlProperties != null && !xmlProperties.isEmpty();

+			case OxmPackage.EJAVA_TYPE__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+			case OxmPackage.EJAVA_TYPE__SUPER_TYPE:

+				return SUPER_TYPE_EDEFAULT == null ? superType != null : !SUPER_TYPE_EDEFAULT.equals(superType);

+			case OxmPackage.EJAVA_TYPE__XML_ACCESSOR_ORDER:

+				return xmlAccessorOrder != XML_ACCESSOR_ORDER_EDEFAULT;

+			case OxmPackage.EJAVA_TYPE__XML_ACCESSOR_TYPE:

+				return xmlAccessorType != XML_ACCESSOR_TYPE_EDEFAULT;

+			case OxmPackage.EJAVA_TYPE__XML_CUSTOMIZER:

+				return XML_CUSTOMIZER_EDEFAULT == null ? xmlCustomizer != null : !XML_CUSTOMIZER_EDEFAULT.equals(xmlCustomizer);

+			case OxmPackage.EJAVA_TYPE__XML_DISCRIMINATOR_NODE:

+				return XML_DISCRIMINATOR_NODE_EDEFAULT == null ? xmlDiscriminatorNode != null : !XML_DISCRIMINATOR_NODE_EDEFAULT.equals(xmlDiscriminatorNode);

+			case OxmPackage.EJAVA_TYPE__XML_DISCRIMINATOR_VALUE:

+				return XML_DISCRIMINATOR_VALUE_EDEFAULT == null ? xmlDiscriminatorValue != null : !XML_DISCRIMINATOR_VALUE_EDEFAULT.equals(xmlDiscriminatorValue);

+			case OxmPackage.EJAVA_TYPE__XML_INLINE_BINARY_DATA:

+				return xmlInlineBinaryData != XML_INLINE_BINARY_DATA_EDEFAULT;

+			case OxmPackage.EJAVA_TYPE__XML_TRANSIENT:

+				return xmlTransient != XML_TRANSIENT_EDEFAULT;

+			case OxmPackage.EJAVA_TYPE__XML_NAME_TRANSFORMER:

+				return XML_NAME_TRANSFORMER_EDEFAULT == null ? xmlNameTransformer != null : !XML_NAME_TRANSFORMER_EDEFAULT.equals(xmlNameTransformer);

+			case OxmPackage.EJAVA_TYPE__XML_TYPE:

+				return xmlType != null;

+			case OxmPackage.EJAVA_TYPE__XML_ROOT_ELEMENT:

+				return xmlRootElement != null;

+			case OxmPackage.EJAVA_TYPE__XML_VIRTUAL_ACCESS_METHODS:

+				return xmlVirtualAccessMethods != null;

+			case OxmPackage.EJAVA_TYPE__XML_SEE_ALSO:

+				return XML_SEE_ALSO_EDEFAULT == null ? xmlSeeAlso != null : !XML_SEE_ALSO_EDEFAULT.equals(xmlSeeAlso);

+			case OxmPackage.EJAVA_TYPE__XML_JAVA_TYPE_ADAPTER:

+				return xmlJavaTypeAdapter != null;

+			case OxmPackage.EJAVA_TYPE__XML_CLASS_EXTRACTOR:

+				return xmlClassExtractor != null;

+			case OxmPackage.EJAVA_TYPE__JAVA_ATTRIBUTES:

+				return javaAttributes != null && !javaAttributes.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+	

+	

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(", superType: ");

+		result.append(superType);

+		result.append(", xmlAccessorOrder: ");

+		result.append(xmlAccessorOrder);

+		result.append(", xmlAccessorType: ");

+		result.append(xmlAccessorType);

+		result.append(", xmlCustomizer: ");

+		result.append(xmlCustomizer);

+		result.append(", xmlDiscriminatorNode: ");

+		result.append(xmlDiscriminatorNode);

+		result.append(", xmlDiscriminatorValue: ");

+		result.append(xmlDiscriminatorValue);

+		result.append(", xmlInlineBinaryData: ");

+		result.append(xmlInlineBinaryData);

+		result.append(", xmlTransient: ");

+		result.append(xmlTransient);

+		result.append(", xmlNameTransformer: ");

+		result.append(xmlNameTransformer);

+		result.append(", xmlSeeAlso: ");

+		result.append(xmlSeeAlso);

+		result.append(')');

+		return result.toString();

+	}

+

+	// ***** translators *****

+	

+	public static Translator buildTranslator() {

+		return new SimpleTranslator(EclipseLink.JAVA_TYPES + "/" + EclipseLink.JAVA_TYPE, OxmPackage.eINSTANCE.getEXmlBindings_JavaTypes(), buildTranslatorChildren());

+	}

+	

+	private static Translator[] buildTranslatorChildren() {

+		return new Translator[] {

+			new EJavaAttribute.JavaAttributesTranslator()

+		};

+	}

+}
\ No newline at end of file
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EPropertyHolder.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EPropertyHolder.java
new file mode 100644
index 0000000000..9e34cbb797
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EPropertyHolder.java
@@ -0,0 +1,44 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EProperty Holder</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EPropertyHolder#getXmlProperties <em>Xml Properties</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder()

+ * @model kind="class" interface="true" abstract="true"

+ * @extends EBaseObject

+ * @generated

+ */

+public interface EPropertyHolder extends EBaseObject

+{

+	/**

+	 * Returns the value of the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Properties</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Properties</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder_XmlProperties()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<EXmlProperty> getXmlProperties();

+

+} // EPropertyHolder

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EReadWriteJavaAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EReadWriteJavaAttribute.java
new file mode 100644
index 0000000000..abf7719784
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EReadWriteJavaAttribute.java
@@ -0,0 +1,79 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>ERead Write Java Attribute</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EReadWriteJavaAttribute#isReadOnly <em>Read Only</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EReadWriteJavaAttribute#isWriteOnly <em>Write Only</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute()

+ * @model kind="class" interface="true" abstract="true"

+ * @extends EBaseObject

+ * @generated

+ */

+public interface EReadWriteJavaAttribute extends EBaseObject

+{

+	/**

+	 * Returns the value of the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Read Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Read Only</em>' attribute.

+	 * @see #setReadOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_ReadOnly()

+	 * @model

+	 * @generated

+	 */

+	boolean isReadOnly();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EReadWriteJavaAttribute#isReadOnly <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Read Only</em>' attribute.

+	 * @see #isReadOnly()

+	 * @generated

+	 */

+	void setReadOnly(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Write Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Write Only</em>' attribute.

+	 * @see #setWriteOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_WriteOnly()

+	 * @model

+	 * @generated

+	 */

+	boolean isWriteOnly();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EReadWriteJavaAttribute#isWriteOnly <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Write Only</em>' attribute.

+	 * @see #isWriteOnly()

+	 * @generated

+	 */

+	void setWriteOnly(boolean value);

+

+} // EReadWriteJavaAttribute

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/ETypedJavaAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/ETypedJavaAttribute.java
new file mode 100644
index 0000000000..f407bf4dbe
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/ETypedJavaAttribute.java
@@ -0,0 +1,52 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>ETyped Java Attribute</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.ETypedJavaAttribute#getType <em>Type</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getETypedJavaAttribute()

+ * @model kind="class" interface="true" abstract="true"

+ * @extends EBaseObject

+ * @generated

+ */

+public interface ETypedJavaAttribute extends EBaseObject

+{

+	/**

+	 * Returns the value of the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Type</em>' attribute.

+	 * @see #setType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getETypedJavaAttribute_Type()

+	 * @model

+	 * @generated

+	 */

+	String getType();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.ETypedJavaAttribute#getType <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Type</em>' attribute.

+	 * @see #getType()

+	 * @generated

+	 */

+	void setType(String value);

+

+} // ETypedJavaAttribute

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAccessMethods.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAccessMethods.java
new file mode 100644
index 0000000000..72d70ecde6
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAccessMethods.java
@@ -0,0 +1,260 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Access Methods</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessMethods#getGetMethod <em>Get Method</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessMethods#getSetMethod <em>Set Method</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAccessMethods()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlAccessMethods extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getGetMethod() <em>Get Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getGetMethod()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String GET_METHOD_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getGetMethod() <em>Get Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getGetMethod()

+	 * @generated

+	 * @ordered

+	 */

+	protected String getMethod = GET_METHOD_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getSetMethod() <em>Set Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getSetMethod()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String SET_METHOD_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getSetMethod() <em>Set Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getSetMethod()

+	 * @generated

+	 * @ordered

+	 */

+	protected String setMethod = SET_METHOD_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlAccessMethods()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_ACCESS_METHODS;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Get Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Get Method</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Get Method</em>' attribute.

+	 * @see #setGetMethod(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAccessMethods_GetMethod()

+	 * @model

+	 * @generated

+	 */

+	public String getGetMethod()

+	{

+		return getMethod;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessMethods#getGetMethod <em>Get Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Get Method</em>' attribute.

+	 * @see #getGetMethod()

+	 * @generated

+	 */

+	public void setGetMethod(String newGetMethod)

+	{

+		String oldGetMethod = getMethod;

+		getMethod = newGetMethod;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ACCESS_METHODS__GET_METHOD, oldGetMethod, getMethod));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Set Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Set Method</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Set Method</em>' attribute.

+	 * @see #setSetMethod(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAccessMethods_SetMethod()

+	 * @model

+	 * @generated

+	 */

+	public String getSetMethod()

+	{

+		return setMethod;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessMethods#getSetMethod <em>Set Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Set Method</em>' attribute.

+	 * @see #getSetMethod()

+	 * @generated

+	 */

+	public void setSetMethod(String newSetMethod)

+	{

+		String oldSetMethod = setMethod;

+		setMethod = newSetMethod;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ACCESS_METHODS__SET_METHOD, oldSetMethod, setMethod));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ACCESS_METHODS__GET_METHOD:

+				return getGetMethod();

+			case OxmPackage.EXML_ACCESS_METHODS__SET_METHOD:

+				return getSetMethod();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ACCESS_METHODS__GET_METHOD:

+				setGetMethod((String)newValue);

+				return;

+			case OxmPackage.EXML_ACCESS_METHODS__SET_METHOD:

+				setSetMethod((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ACCESS_METHODS__GET_METHOD:

+				setGetMethod(GET_METHOD_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ACCESS_METHODS__SET_METHOD:

+				setSetMethod(SET_METHOD_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ACCESS_METHODS__GET_METHOD:

+				return GET_METHOD_EDEFAULT == null ? getMethod != null : !GET_METHOD_EDEFAULT.equals(getMethod);

+			case OxmPackage.EXML_ACCESS_METHODS__SET_METHOD:

+				return SET_METHOD_EDEFAULT == null ? setMethod != null : !SET_METHOD_EDEFAULT.equals(setMethod);

+		}

+		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(" (getMethod: ");

+		result.append(getMethod);

+		result.append(", setMethod: ");

+		result.append(setMethod);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlAccessMethods

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAccessOrder.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAccessOrder.java
new file mode 100644
index 0000000000..63f3c3c24c
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAccessOrder.java
@@ -0,0 +1,223 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.emf.common.util.Enumerator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the literals of the enumeration '<em><b>EXml Access Order</b></em>',

+ * and utility methods for working with them.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAccessOrder()

+ * @model

+ * @generated

+ */

+public enum EXmlAccessOrder implements Enumerator

+{

+	/**

+	 * The '<em><b>ALPHABETICAL</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #ALPHABETICAL_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	ALPHABETICAL(0, "ALPHABETICAL", "ALPHABETICAL"),

+

+	/**

+	 * The '<em><b>UNDEFINED</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #UNDEFINED_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	UNDEFINED(1, "UNDEFINED", "UNDEFINED");

+

+	/**

+	 * The '<em><b>ALPHABETICAL</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>ALPHABETICAL</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #ALPHABETICAL

+	 * @model

+	 * @generated

+	 * @ordered

+	 */

+	public static final int ALPHABETICAL_VALUE = 0;

+

+	/**

+	 * The '<em><b>UNDEFINED</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>UNDEFINED</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #UNDEFINED

+	 * @model

+	 * @generated

+	 * @ordered

+	 */

+	public static final int UNDEFINED_VALUE = 1;

+

+	/**

+	 * An array of all the '<em><b>EXml Access Order</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static final EXmlAccessOrder[] VALUES_ARRAY =

+		new EXmlAccessOrder[]

+		{

+			ALPHABETICAL,

+			UNDEFINED,

+		};

+

+	/**

+	 * A public read-only list of all the '<em><b>EXml Access Order</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final List<EXmlAccessOrder> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

+

+	/**

+	 * Returns the '<em><b>EXml Access Order</b></em>' literal with the specified literal value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlAccessOrder get(String literal)

+	{

+		for (int i = 0; i < VALUES_ARRAY.length; ++i)

+		{

+			EXmlAccessOrder result = VALUES_ARRAY[i];

+			if (result.toString().equals(literal))

+			{

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>EXml Access Order</b></em>' literal with the specified name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlAccessOrder getByName(String name)

+	{

+		for (int i = 0; i < VALUES_ARRAY.length; ++i)

+		{

+			EXmlAccessOrder result = VALUES_ARRAY[i];

+			if (result.getName().equals(name))

+			{

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>EXml Access Order</b></em>' literal with the specified integer value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlAccessOrder get(int value)

+	{

+		switch (value)

+		{

+			case ALPHABETICAL_VALUE: return ALPHABETICAL;

+			case UNDEFINED_VALUE: return UNDEFINED;

+		}

+		return null;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final int value;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final String name;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final String literal;

+

+	/**

+	 * Only this class can construct instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EXmlAccessOrder(int value, String name, String literal)

+	{

+		this.value = value;

+		this.name = name;

+		this.literal = literal;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public int getValue()

+	{

+	  return value;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getName()

+	{

+	  return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getLiteral()

+	{

+	  return literal;

+	}

+

+	/**

+	 * Returns the literal value of the enumerator, which is its string representation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		return literal;

+	}

+	

+} //EXmlAccessOrder

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAccessType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAccessType.java
new file mode 100644
index 0000000000..a062ec16f9
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAccessType.java
@@ -0,0 +1,277 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.emf.common.util.Enumerator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the literals of the enumeration '<em><b>EXml Access Type</b></em>',

+ * and utility methods for working with them.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAccessType()

+ * @model

+ * @generated

+ */

+public enum EXmlAccessType implements Enumerator

+{

+	/**

+	 * The '<em><b>FIELD</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #FIELD_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	FIELD(0, "FIELD", "FIELD"),

+

+	/**

+	 * The '<em><b>NONE</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #NONE_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	NONE(1, "NONE", "NONE"),

+

+	/**

+	 * The '<em><b>PROPERTY</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #PROPERTY_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	PROPERTY(2, "PROPERTY", "PROPERTY"),

+

+	/**

+	 * The '<em><b>PUBLIC MEMBER</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #PUBLIC_MEMBER_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	PUBLIC_MEMBER(3, "PUBLIC_MEMBER", "PUBLIC_MEMBER");

+

+	/**

+	 * The '<em><b>FIELD</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>FIELD</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #FIELD

+	 * @model

+	 * @generated

+	 * @ordered

+	 */

+	public static final int FIELD_VALUE = 0;

+

+	/**

+	 * The '<em><b>NONE</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #NONE

+	 * @model

+	 * @generated

+	 * @ordered

+	 */

+	public static final int NONE_VALUE = 1;

+

+	/**

+	 * The '<em><b>PROPERTY</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>PROPERTY</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #PROPERTY

+	 * @model

+	 * @generated

+	 * @ordered

+	 */

+	public static final int PROPERTY_VALUE = 2;

+

+	/**

+	 * The '<em><b>PUBLIC MEMBER</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>PUBLIC MEMBER</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #PUBLIC_MEMBER

+	 * @model

+	 * @generated

+	 * @ordered

+	 */

+	public static final int PUBLIC_MEMBER_VALUE = 3;

+

+	/**

+	 * An array of all the '<em><b>EXml Access Type</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static final EXmlAccessType[] VALUES_ARRAY =

+		new EXmlAccessType[]

+		{

+			FIELD,

+			NONE,

+			PROPERTY,

+			PUBLIC_MEMBER,

+		};

+

+	/**

+	 * A public read-only list of all the '<em><b>EXml Access Type</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final List<EXmlAccessType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

+

+	/**

+	 * Returns the '<em><b>EXml Access Type</b></em>' literal with the specified literal value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlAccessType get(String literal)

+	{

+		for (int i = 0; i < VALUES_ARRAY.length; ++i)

+		{

+			EXmlAccessType result = VALUES_ARRAY[i];

+			if (result.toString().equals(literal))

+			{

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>EXml Access Type</b></em>' literal with the specified name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlAccessType getByName(String name)

+	{

+		for (int i = 0; i < VALUES_ARRAY.length; ++i)

+		{

+			EXmlAccessType result = VALUES_ARRAY[i];

+			if (result.getName().equals(name))

+			{

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>EXml Access Type</b></em>' literal with the specified integer value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlAccessType get(int value)

+	{

+		switch (value)

+		{

+			case FIELD_VALUE: return FIELD;

+			case NONE_VALUE: return NONE;

+			case PROPERTY_VALUE: return PROPERTY;

+			case PUBLIC_MEMBER_VALUE: return PUBLIC_MEMBER;

+		}

+		return null;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final int value;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final String name;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final String literal;

+

+	/**

+	 * Only this class can construct instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EXmlAccessType(int value, String name, String literal)

+	{

+		this.value = value;

+		this.name = name;

+		this.literal = literal;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public int getValue()

+	{

+	  return value;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getName()

+	{

+	  return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getLiteral()

+	{

+	  return literal;

+	}

+

+	/**

+	 * Returns the literal value of the enumerator, which is its string representation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		return literal;

+	}

+	

+} //EXmlAccessType

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyAttribute.java
new file mode 100644
index 0000000000..bfde945c47
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyAttribute.java
@@ -0,0 +1,647 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Any Attribute</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute#getXmlPath <em>Xml Path</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAnyAttribute()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlAnyAttribute extends EJavaAttribute implements EAccessibleJavaAttribute, EContainerJavaAttribute, EReadWriteJavaAttribute, EPropertyHolder

+{

+	/**

+	 * The cached value of the '{@link #getXmlAccessMethods() <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessMethods xmlAccessMethods;

+	/**

+	 * The default value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String CONTAINER_TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String containerType = CONTAINER_TYPE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean READ_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean readOnly = READ_ONLY_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean WRITE_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean writeOnly = WRITE_ONLY_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlProperties() <em>Xml Properties</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlProperties()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlProperty> xmlProperties;

+	/**

+	 * The default value of the '{@link #getXmlPath() <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlPath()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String XML_PATH_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getXmlPath() <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlPath()

+	 * @generated

+	 * @ordered

+	 */

+	protected String xmlPath = XML_PATH_EDEFAULT;

+

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlAnyAttribute()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_ANY_ATTRIBUTE;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Access Methods</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #setXmlAccessMethods(EXmlAccessMethods)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAccessibleJavaAttribute_XmlAccessMethods()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlAccessMethods getXmlAccessMethods()

+	{

+		return xmlAccessMethods;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods, NotificationChain msgs)

+	{

+		EXmlAccessMethods oldXmlAccessMethods = xmlAccessMethods;

+		xmlAccessMethods = newXmlAccessMethods;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ATTRIBUTE__XML_ACCESS_METHODS, oldXmlAccessMethods, newXmlAccessMethods);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute#getXmlAccessMethods <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 */

+	public void setXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods)

+	{

+		if (newXmlAccessMethods != xmlAccessMethods)

+		{

+			NotificationChain msgs = null;

+			if (xmlAccessMethods != null)

+				msgs = ((InternalEObject)xmlAccessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ANY_ATTRIBUTE__XML_ACCESS_METHODS, null, msgs);

+			if (newXmlAccessMethods != null)

+				msgs = ((InternalEObject)newXmlAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ANY_ATTRIBUTE__XML_ACCESS_METHODS, null, msgs);

+			msgs = basicSetXmlAccessMethods(newXmlAccessMethods, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ATTRIBUTE__XML_ACCESS_METHODS, newXmlAccessMethods, newXmlAccessMethods));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Container Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Container Type</em>' attribute.

+	 * @see #setContainerType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEContainerJavaAttribute_ContainerType()

+	 * @model

+	 * @generated

+	 */

+	public String getContainerType()

+	{

+		return containerType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute#getContainerType <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Container Type</em>' attribute.

+	 * @see #getContainerType()

+	 * @generated

+	 */

+	public void setContainerType(String newContainerType)

+	{

+		String oldContainerType = containerType;

+		containerType = newContainerType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ATTRIBUTE__CONTAINER_TYPE, oldContainerType, containerType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Read Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Read Only</em>' attribute.

+	 * @see #setReadOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_ReadOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isReadOnly()

+	{

+		return readOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute#isReadOnly <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Read Only</em>' attribute.

+	 * @see #isReadOnly()

+	 * @generated

+	 */

+	public void setReadOnly(boolean newReadOnly)

+	{

+		boolean oldReadOnly = readOnly;

+		readOnly = newReadOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ATTRIBUTE__READ_ONLY, oldReadOnly, readOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Write Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Write Only</em>' attribute.

+	 * @see #setWriteOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_WriteOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isWriteOnly()

+	{

+		return writeOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute#isWriteOnly <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Write Only</em>' attribute.

+	 * @see #isWriteOnly()

+	 * @generated

+	 */

+	public void setWriteOnly(boolean newWriteOnly)

+	{

+		boolean oldWriteOnly = writeOnly;

+		writeOnly = newWriteOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ATTRIBUTE__WRITE_ONLY, oldWriteOnly, writeOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Properties</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Properties</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder_XmlProperties()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlProperty> getXmlProperties()

+	{

+		if (xmlProperties == null)

+		{

+			xmlProperties = new EObjectContainmentEList<EXmlProperty>(EXmlProperty.class, this, OxmPackage.EXML_ANY_ATTRIBUTE__XML_PROPERTIES);

+		}

+		return xmlProperties;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Path</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Path</em>' attribute.

+	 * @see #setXmlPath(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAnyAttribute_XmlPath()

+	 * @model

+	 * @generated

+	 */

+	public String getXmlPath()

+	{

+		return xmlPath;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute#getXmlPath <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Path</em>' attribute.

+	 * @see #getXmlPath()

+	 * @generated

+	 */

+	public void setXmlPath(String newXmlPath)

+	{

+		String oldXmlPath = xmlPath;

+		xmlPath = newXmlPath;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ATTRIBUTE__XML_PATH, oldXmlPath, xmlPath));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ANY_ATTRIBUTE__XML_ACCESS_METHODS:

+				return basicSetXmlAccessMethods(null, msgs);

+			case OxmPackage.EXML_ANY_ATTRIBUTE__XML_PROPERTIES:

+				return ((InternalEList<?>)getXmlProperties()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ANY_ATTRIBUTE__XML_ACCESS_METHODS:

+				return getXmlAccessMethods();

+			case OxmPackage.EXML_ANY_ATTRIBUTE__CONTAINER_TYPE:

+				return getContainerType();

+			case OxmPackage.EXML_ANY_ATTRIBUTE__READ_ONLY:

+				return isReadOnly();

+			case OxmPackage.EXML_ANY_ATTRIBUTE__WRITE_ONLY:

+				return isWriteOnly();

+			case OxmPackage.EXML_ANY_ATTRIBUTE__XML_PROPERTIES:

+				return getXmlProperties();

+			case OxmPackage.EXML_ANY_ATTRIBUTE__XML_PATH:

+				return getXmlPath();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ANY_ATTRIBUTE__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ATTRIBUTE__CONTAINER_TYPE:

+				setContainerType((String)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ATTRIBUTE__READ_ONLY:

+				setReadOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ATTRIBUTE__WRITE_ONLY:

+				setWriteOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ATTRIBUTE__XML_PROPERTIES:

+				getXmlProperties().clear();

+				getXmlProperties().addAll((Collection<? extends EXmlProperty>)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ATTRIBUTE__XML_PATH:

+				setXmlPath((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ANY_ATTRIBUTE__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)null);

+				return;

+			case OxmPackage.EXML_ANY_ATTRIBUTE__CONTAINER_TYPE:

+				setContainerType(CONTAINER_TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ANY_ATTRIBUTE__READ_ONLY:

+				setReadOnly(READ_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ANY_ATTRIBUTE__WRITE_ONLY:

+				setWriteOnly(WRITE_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ANY_ATTRIBUTE__XML_PROPERTIES:

+				getXmlProperties().clear();

+				return;

+			case OxmPackage.EXML_ANY_ATTRIBUTE__XML_PATH:

+				setXmlPath(XML_PATH_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ANY_ATTRIBUTE__XML_ACCESS_METHODS:

+				return xmlAccessMethods != null;

+			case OxmPackage.EXML_ANY_ATTRIBUTE__CONTAINER_TYPE:

+				return CONTAINER_TYPE_EDEFAULT == null ? containerType != null : !CONTAINER_TYPE_EDEFAULT.equals(containerType);

+			case OxmPackage.EXML_ANY_ATTRIBUTE__READ_ONLY:

+				return readOnly != READ_ONLY_EDEFAULT;

+			case OxmPackage.EXML_ANY_ATTRIBUTE__WRITE_ONLY:

+				return writeOnly != WRITE_ONLY_EDEFAULT;

+			case OxmPackage.EXML_ANY_ATTRIBUTE__XML_PROPERTIES:

+				return xmlProperties != null && !xmlProperties.isEmpty();

+			case OxmPackage.EXML_ANY_ATTRIBUTE__XML_PATH:

+				return XML_PATH_EDEFAULT == null ? xmlPath != null : !XML_PATH_EDEFAULT.equals(xmlPath);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)

+	{

+		if (baseClass == EAccessibleJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ANY_ATTRIBUTE__XML_ACCESS_METHODS: return OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ANY_ATTRIBUTE__CONTAINER_TYPE: return OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ANY_ATTRIBUTE__READ_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY;

+				case OxmPackage.EXML_ANY_ATTRIBUTE__WRITE_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ANY_ATTRIBUTE__XML_PROPERTIES: return OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES;

+				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 == EAccessibleJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS: return OxmPackage.EXML_ANY_ATTRIBUTE__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE: return OxmPackage.EXML_ANY_ATTRIBUTE__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY: return OxmPackage.EXML_ANY_ATTRIBUTE__READ_ONLY;

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY: return OxmPackage.EXML_ANY_ATTRIBUTE__WRITE_ONLY;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES: return OxmPackage.EXML_ANY_ATTRIBUTE__XML_PROPERTIES;

+				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(" (containerType: ");

+		result.append(containerType);

+		result.append(", readOnly: ");

+		result.append(readOnly);

+		result.append(", writeOnly: ");

+		result.append(writeOnly);

+		result.append(", xmlPath: ");

+		result.append(xmlPath);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlAnyAttributeTranslator

+			extends AbstractJavaAttributeTranslator {

+		

+		XmlAnyAttributeTranslator(String domPathAndName, EStructuralFeature eStructuralFeature) {

+			super(domPathAndName, eStructuralFeature, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlAnyAttribute();

+		}

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyElement.java
new file mode 100644
index 0000000000..e2a61c5938
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAnyElement.java
@@ -0,0 +1,1024 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Any Element</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#isXmlMixed <em>Xml Mixed</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#isLax <em>Lax</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getDomHandler <em>Dom Handler</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getXmlPath <em>Xml Path</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getXmlElementRefs <em>Xml Element Refs</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAnyElement()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlAnyElement extends EJavaAttribute implements EAccessibleJavaAttribute, EAdaptableJavaAttribute, EContainerJavaAttribute, EReadWriteJavaAttribute, EPropertyHolder

+{

+	/**

+	 * The cached value of the '{@link #getXmlAccessMethods() <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessMethods xmlAccessMethods;

+	/**

+	 * The cached value of the '{@link #getXmlJavaTypeAdapter() <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlJavaTypeAdapter xmlJavaTypeAdapter;

+	/**

+	 * The default value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String CONTAINER_TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String containerType = CONTAINER_TYPE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean READ_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean readOnly = READ_ONLY_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean WRITE_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean writeOnly = WRITE_ONLY_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlProperties() <em>Xml Properties</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlProperties()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlProperty> xmlProperties;

+	/**

+	 * The default value of the '{@link #isXmlMixed() <em>Xml Mixed</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlMixed()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_MIXED_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlMixed() <em>Xml Mixed</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlMixed()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlMixed = XML_MIXED_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isLax() <em>Lax</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isLax()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean LAX_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isLax() <em>Lax</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isLax()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean lax = LAX_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getDomHandler() <em>Dom Handler</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getDomHandler()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String DOM_HANDLER_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getDomHandler() <em>Dom Handler</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getDomHandler()

+	 * @generated

+	 * @ordered

+	 */

+	protected String domHandler = DOM_HANDLER_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getXmlPath() <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlPath()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String XML_PATH_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getXmlPath() <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlPath()

+	 * @generated

+	 * @ordered

+	 */

+	protected String xmlPath = XML_PATH_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlElementRefs() <em>Xml Element Refs</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlElementRefs()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlElementRefs xmlElementRefs;

+

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlAnyElement()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_ANY_ELEMENT;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Access Methods</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #setXmlAccessMethods(EXmlAccessMethods)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAccessibleJavaAttribute_XmlAccessMethods()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlAccessMethods getXmlAccessMethods()

+	{

+		return xmlAccessMethods;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods, NotificationChain msgs)

+	{

+		EXmlAccessMethods oldXmlAccessMethods = xmlAccessMethods;

+		xmlAccessMethods = newXmlAccessMethods;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ELEMENT__XML_ACCESS_METHODS, oldXmlAccessMethods, newXmlAccessMethods);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getXmlAccessMethods <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 */

+	public void setXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods)

+	{

+		if (newXmlAccessMethods != xmlAccessMethods)

+		{

+			NotificationChain msgs = null;

+			if (xmlAccessMethods != null)

+				msgs = ((InternalEObject)xmlAccessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ANY_ELEMENT__XML_ACCESS_METHODS, null, msgs);

+			if (newXmlAccessMethods != null)

+				msgs = ((InternalEObject)newXmlAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ANY_ELEMENT__XML_ACCESS_METHODS, null, msgs);

+			msgs = basicSetXmlAccessMethods(newXmlAccessMethods, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ELEMENT__XML_ACCESS_METHODS, newXmlAccessMethods, newXmlAccessMethods));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Java Type Adapter</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #setXmlJavaTypeAdapter(EXmlJavaTypeAdapter)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAdaptableJavaAttribute_XmlJavaTypeAdapter()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlJavaTypeAdapter getXmlJavaTypeAdapter()

+	{

+		return xmlJavaTypeAdapter;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlJavaTypeAdapter(EXmlJavaTypeAdapter newXmlJavaTypeAdapter, NotificationChain msgs)

+	{

+		EXmlJavaTypeAdapter oldXmlJavaTypeAdapter = xmlJavaTypeAdapter;

+		xmlJavaTypeAdapter = newXmlJavaTypeAdapter;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ELEMENT__XML_JAVA_TYPE_ADAPTER, oldXmlJavaTypeAdapter, newXmlJavaTypeAdapter);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getXmlJavaTypeAdapter <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 */

+	public void setXmlJavaTypeAdapter(EXmlJavaTypeAdapter newXmlJavaTypeAdapter)

+	{

+		if (newXmlJavaTypeAdapter != xmlJavaTypeAdapter)

+		{

+			NotificationChain msgs = null;

+			if (xmlJavaTypeAdapter != null)

+				msgs = ((InternalEObject)xmlJavaTypeAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ANY_ELEMENT__XML_JAVA_TYPE_ADAPTER, null, msgs);

+			if (newXmlJavaTypeAdapter != null)

+				msgs = ((InternalEObject)newXmlJavaTypeAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ANY_ELEMENT__XML_JAVA_TYPE_ADAPTER, null, msgs);

+			msgs = basicSetXmlJavaTypeAdapter(newXmlJavaTypeAdapter, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ELEMENT__XML_JAVA_TYPE_ADAPTER, newXmlJavaTypeAdapter, newXmlJavaTypeAdapter));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Container Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Container Type</em>' attribute.

+	 * @see #setContainerType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEContainerJavaAttribute_ContainerType()

+	 * @model

+	 * @generated

+	 */

+	public String getContainerType()

+	{

+		return containerType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getContainerType <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Container Type</em>' attribute.

+	 * @see #getContainerType()

+	 * @generated

+	 */

+	public void setContainerType(String newContainerType)

+	{

+		String oldContainerType = containerType;

+		containerType = newContainerType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ELEMENT__CONTAINER_TYPE, oldContainerType, containerType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Read Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Read Only</em>' attribute.

+	 * @see #setReadOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_ReadOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isReadOnly()

+	{

+		return readOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#isReadOnly <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Read Only</em>' attribute.

+	 * @see #isReadOnly()

+	 * @generated

+	 */

+	public void setReadOnly(boolean newReadOnly)

+	{

+		boolean oldReadOnly = readOnly;

+		readOnly = newReadOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ELEMENT__READ_ONLY, oldReadOnly, readOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Write Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Write Only</em>' attribute.

+	 * @see #setWriteOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_WriteOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isWriteOnly()

+	{

+		return writeOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#isWriteOnly <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Write Only</em>' attribute.

+	 * @see #isWriteOnly()

+	 * @generated

+	 */

+	public void setWriteOnly(boolean newWriteOnly)

+	{

+		boolean oldWriteOnly = writeOnly;

+		writeOnly = newWriteOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ELEMENT__WRITE_ONLY, oldWriteOnly, writeOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Properties</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Properties</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder_XmlProperties()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlProperty> getXmlProperties()

+	{

+		if (xmlProperties == null)

+		{

+			xmlProperties = new EObjectContainmentEList<EXmlProperty>(EXmlProperty.class, this, OxmPackage.EXML_ANY_ELEMENT__XML_PROPERTIES);

+		}

+		return xmlProperties;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Mixed</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Mixed</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Mixed</em>' attribute.

+	 * @see #setXmlMixed(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAnyElement_XmlMixed()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlMixed()

+	{

+		return xmlMixed;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#isXmlMixed <em>Xml Mixed</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Mixed</em>' attribute.

+	 * @see #isXmlMixed()

+	 * @generated

+	 */

+	public void setXmlMixed(boolean newXmlMixed)

+	{

+		boolean oldXmlMixed = xmlMixed;

+		xmlMixed = newXmlMixed;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ELEMENT__XML_MIXED, oldXmlMixed, xmlMixed));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Lax</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Lax</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Lax</em>' attribute.

+	 * @see #setLax(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAnyElement_Lax()

+	 * @model

+	 * @generated

+	 */

+	public boolean isLax()

+	{

+		return lax;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#isLax <em>Lax</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Lax</em>' attribute.

+	 * @see #isLax()

+	 * @generated

+	 */

+	public void setLax(boolean newLax)

+	{

+		boolean oldLax = lax;

+		lax = newLax;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ELEMENT__LAX, oldLax, lax));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Dom Handler</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Dom Handler</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Dom Handler</em>' attribute.

+	 * @see #setDomHandler(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAnyElement_DomHandler()

+	 * @model

+	 * @generated

+	 */

+	public String getDomHandler()

+	{

+		return domHandler;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getDomHandler <em>Dom Handler</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Dom Handler</em>' attribute.

+	 * @see #getDomHandler()

+	 * @generated

+	 */

+	public void setDomHandler(String newDomHandler)

+	{

+		String oldDomHandler = domHandler;

+		domHandler = newDomHandler;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ELEMENT__DOM_HANDLER, oldDomHandler, domHandler));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Path</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Path</em>' attribute.

+	 * @see #setXmlPath(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAnyElement_XmlPath()

+	 * @model

+	 * @generated

+	 */

+	public String getXmlPath()

+	{

+		return xmlPath;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getXmlPath <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Path</em>' attribute.

+	 * @see #getXmlPath()

+	 * @generated

+	 */

+	public void setXmlPath(String newXmlPath)

+	{

+		String oldXmlPath = xmlPath;

+		xmlPath = newXmlPath;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ELEMENT__XML_PATH, oldXmlPath, xmlPath));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Element Refs</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Element Refs</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Element Refs</em>' containment reference.

+	 * @see #setXmlElementRefs(EXmlElementRefs)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAnyElement_XmlElementRefs()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlElementRefs getXmlElementRefs()

+	{

+		return xmlElementRefs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlElementRefs(EXmlElementRefs newXmlElementRefs, NotificationChain msgs)

+	{

+		EXmlElementRefs oldXmlElementRefs = xmlElementRefs;

+		xmlElementRefs = newXmlElementRefs;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ELEMENT__XML_ELEMENT_REFS, oldXmlElementRefs, newXmlElementRefs);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getXmlElementRefs <em>Xml Element Refs</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Element Refs</em>' containment reference.

+	 * @see #getXmlElementRefs()

+	 * @generated

+	 */

+	public void setXmlElementRefs(EXmlElementRefs newXmlElementRefs)

+	{

+		if (newXmlElementRefs != xmlElementRefs)

+		{

+			NotificationChain msgs = null;

+			if (xmlElementRefs != null)

+				msgs = ((InternalEObject)xmlElementRefs).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ANY_ELEMENT__XML_ELEMENT_REFS, null, msgs);

+			if (newXmlElementRefs != null)

+				msgs = ((InternalEObject)newXmlElementRefs).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ANY_ELEMENT__XML_ELEMENT_REFS, null, msgs);

+			msgs = basicSetXmlElementRefs(newXmlElementRefs, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ANY_ELEMENT__XML_ELEMENT_REFS, newXmlElementRefs, newXmlElementRefs));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ANY_ELEMENT__XML_ACCESS_METHODS:

+				return basicSetXmlAccessMethods(null, msgs);

+			case OxmPackage.EXML_ANY_ELEMENT__XML_JAVA_TYPE_ADAPTER:

+				return basicSetXmlJavaTypeAdapter(null, msgs);

+			case OxmPackage.EXML_ANY_ELEMENT__XML_PROPERTIES:

+				return ((InternalEList<?>)getXmlProperties()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EXML_ANY_ELEMENT__XML_ELEMENT_REFS:

+				return basicSetXmlElementRefs(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ANY_ELEMENT__XML_ACCESS_METHODS:

+				return getXmlAccessMethods();

+			case OxmPackage.EXML_ANY_ELEMENT__XML_JAVA_TYPE_ADAPTER:

+				return getXmlJavaTypeAdapter();

+			case OxmPackage.EXML_ANY_ELEMENT__CONTAINER_TYPE:

+				return getContainerType();

+			case OxmPackage.EXML_ANY_ELEMENT__READ_ONLY:

+				return isReadOnly();

+			case OxmPackage.EXML_ANY_ELEMENT__WRITE_ONLY:

+				return isWriteOnly();

+			case OxmPackage.EXML_ANY_ELEMENT__XML_PROPERTIES:

+				return getXmlProperties();

+			case OxmPackage.EXML_ANY_ELEMENT__XML_MIXED:

+				return isXmlMixed();

+			case OxmPackage.EXML_ANY_ELEMENT__LAX:

+				return isLax();

+			case OxmPackage.EXML_ANY_ELEMENT__DOM_HANDLER:

+				return getDomHandler();

+			case OxmPackage.EXML_ANY_ELEMENT__XML_PATH:

+				return getXmlPath();

+			case OxmPackage.EXML_ANY_ELEMENT__XML_ELEMENT_REFS:

+				return getXmlElementRefs();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ANY_ELEMENT__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__XML_JAVA_TYPE_ADAPTER:

+				setXmlJavaTypeAdapter((EXmlJavaTypeAdapter)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__CONTAINER_TYPE:

+				setContainerType((String)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__READ_ONLY:

+				setReadOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__WRITE_ONLY:

+				setWriteOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__XML_PROPERTIES:

+				getXmlProperties().clear();

+				getXmlProperties().addAll((Collection<? extends EXmlProperty>)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__XML_MIXED:

+				setXmlMixed((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__LAX:

+				setLax((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__DOM_HANDLER:

+				setDomHandler((String)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__XML_PATH:

+				setXmlPath((String)newValue);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__XML_ELEMENT_REFS:

+				setXmlElementRefs((EXmlElementRefs)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ANY_ELEMENT__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)null);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__XML_JAVA_TYPE_ADAPTER:

+				setXmlJavaTypeAdapter((EXmlJavaTypeAdapter)null);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__CONTAINER_TYPE:

+				setContainerType(CONTAINER_TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__READ_ONLY:

+				setReadOnly(READ_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__WRITE_ONLY:

+				setWriteOnly(WRITE_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__XML_PROPERTIES:

+				getXmlProperties().clear();

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__XML_MIXED:

+				setXmlMixed(XML_MIXED_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__LAX:

+				setLax(LAX_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__DOM_HANDLER:

+				setDomHandler(DOM_HANDLER_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__XML_PATH:

+				setXmlPath(XML_PATH_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ANY_ELEMENT__XML_ELEMENT_REFS:

+				setXmlElementRefs((EXmlElementRefs)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ANY_ELEMENT__XML_ACCESS_METHODS:

+				return xmlAccessMethods != null;

+			case OxmPackage.EXML_ANY_ELEMENT__XML_JAVA_TYPE_ADAPTER:

+				return xmlJavaTypeAdapter != null;

+			case OxmPackage.EXML_ANY_ELEMENT__CONTAINER_TYPE:

+				return CONTAINER_TYPE_EDEFAULT == null ? containerType != null : !CONTAINER_TYPE_EDEFAULT.equals(containerType);

+			case OxmPackage.EXML_ANY_ELEMENT__READ_ONLY:

+				return readOnly != READ_ONLY_EDEFAULT;

+			case OxmPackage.EXML_ANY_ELEMENT__WRITE_ONLY:

+				return writeOnly != WRITE_ONLY_EDEFAULT;

+			case OxmPackage.EXML_ANY_ELEMENT__XML_PROPERTIES:

+				return xmlProperties != null && !xmlProperties.isEmpty();

+			case OxmPackage.EXML_ANY_ELEMENT__XML_MIXED:

+				return xmlMixed != XML_MIXED_EDEFAULT;

+			case OxmPackage.EXML_ANY_ELEMENT__LAX:

+				return lax != LAX_EDEFAULT;

+			case OxmPackage.EXML_ANY_ELEMENT__DOM_HANDLER:

+				return DOM_HANDLER_EDEFAULT == null ? domHandler != null : !DOM_HANDLER_EDEFAULT.equals(domHandler);

+			case OxmPackage.EXML_ANY_ELEMENT__XML_PATH:

+				return XML_PATH_EDEFAULT == null ? xmlPath != null : !XML_PATH_EDEFAULT.equals(xmlPath);

+			case OxmPackage.EXML_ANY_ELEMENT__XML_ELEMENT_REFS:

+				return xmlElementRefs != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)

+	{

+		if (baseClass == EAccessibleJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ANY_ELEMENT__XML_ACCESS_METHODS: return OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EAdaptableJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ANY_ELEMENT__XML_JAVA_TYPE_ADAPTER: return OxmPackage.EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ANY_ELEMENT__CONTAINER_TYPE: return OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ANY_ELEMENT__READ_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY;

+				case OxmPackage.EXML_ANY_ELEMENT__WRITE_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ANY_ELEMENT__XML_PROPERTIES: return OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES;

+				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 == EAccessibleJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS: return OxmPackage.EXML_ANY_ELEMENT__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EAdaptableJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER: return OxmPackage.EXML_ANY_ELEMENT__XML_JAVA_TYPE_ADAPTER;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE: return OxmPackage.EXML_ANY_ELEMENT__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY: return OxmPackage.EXML_ANY_ELEMENT__READ_ONLY;

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY: return OxmPackage.EXML_ANY_ELEMENT__WRITE_ONLY;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES: return OxmPackage.EXML_ANY_ELEMENT__XML_PROPERTIES;

+				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(" (containerType: ");

+		result.append(containerType);

+		result.append(", readOnly: ");

+		result.append(readOnly);

+		result.append(", writeOnly: ");

+		result.append(writeOnly);

+		result.append(", xmlMixed: ");

+		result.append(xmlMixed);

+		result.append(", lax: ");

+		result.append(lax);

+		result.append(", domHandler: ");

+		result.append(domHandler);

+		result.append(", xmlPath: ");

+		result.append(xmlPath);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlAnyElementTranslator

+			extends AbstractJavaAttributeTranslator {

+		

+		XmlAnyElementTranslator(String domPathAndName, EStructuralFeature eStructuralFeature) {

+			super(domPathAndName, eStructuralFeature, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlAnyElement();

+		}

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAttribute.java
new file mode 100644
index 0000000000..c3b282095c
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlAttribute.java
@@ -0,0 +1,1651 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Attribute</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getNamespace <em>Namespace</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isRequired <em>Required</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlId <em>Xml Id</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlIdRef <em>Xml Id Ref</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlKey <em>Xml Key</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlList <em>Xml List</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlInlineBinaryData <em>Xml Inline Binary Data</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlAttachmentRef <em>Xml Attachment Ref</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlMimeType <em>Xml Mime Type</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlPath <em>Xml Path</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlAbstractNullPolicy <em>Xml Abstract Null Policy</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlSchemaType <em>Xml Schema Type</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlAttribute extends EJavaAttribute implements EAccessibleJavaAttribute, EAdaptableJavaAttribute, EContainerJavaAttribute, EReadWriteJavaAttribute, ETypedJavaAttribute, EPropertyHolder

+{

+	/**

+	 * The cached value of the '{@link #getXmlAccessMethods() <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessMethods xmlAccessMethods;

+	/**

+	 * The cached value of the '{@link #getXmlJavaTypeAdapter() <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlJavaTypeAdapter xmlJavaTypeAdapter;

+	/**

+	 * The default value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String CONTAINER_TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String containerType = CONTAINER_TYPE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean READ_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean readOnly = READ_ONLY_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean WRITE_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean writeOnly = WRITE_ONLY_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String type = TYPE_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlProperties() <em>Xml Properties</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlProperties()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlProperty> xmlProperties;

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAMESPACE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected String namespace = NAMESPACE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isRequired() <em>Required</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isRequired()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean REQUIRED_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isRequired() <em>Required</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isRequired()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean required = REQUIRED_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlId() <em>Xml Id</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlId()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_ID_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlId() <em>Xml Id</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlId()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlId = XML_ID_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlIdRef() <em>Xml Id Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlIdRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_ID_REF_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlIdRef() <em>Xml Id Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlIdRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlIdRef = XML_ID_REF_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlKey() <em>Xml Key</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlKey()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_KEY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlKey() <em>Xml Key</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlKey()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlKey = XML_KEY_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlList() <em>Xml List</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlList()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_LIST_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlList() <em>Xml List</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlList()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlList = XML_LIST_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlInlineBinaryData() <em>Xml Inline Binary Data</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlInlineBinaryData()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_INLINE_BINARY_DATA_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlInlineBinaryData() <em>Xml Inline Binary Data</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlInlineBinaryData()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlInlineBinaryData = XML_INLINE_BINARY_DATA_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlAttachmentRef() <em>Xml Attachment Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlAttachmentRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_ATTACHMENT_REF_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlAttachmentRef() <em>Xml Attachment Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlAttachmentRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlAttachmentRef = XML_ATTACHMENT_REF_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getXmlMimeType() <em>Xml Mime Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlMimeType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String XML_MIME_TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getXmlMimeType() <em>Xml Mime Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlMimeType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String xmlMimeType = XML_MIME_TYPE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getXmlPath() <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlPath()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String XML_PATH_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getXmlPath() <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlPath()

+	 * @generated

+	 * @ordered

+	 */

+	protected String xmlPath = XML_PATH_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlAbstractNullPolicy() <em>Xml Abstract Null Policy</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAbstractNullPolicy()

+	 * @generated

+	 * @ordered

+	 */

+	protected EAbstractXmlNullPolicy xmlAbstractNullPolicy;

+

+	/**

+	 * The cached value of the '{@link #getXmlSchemaType() <em>Xml Schema Type</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlSchemaType()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlSchemaType xmlSchemaType;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlAttribute()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_ATTRIBUTE;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Access Methods</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #setXmlAccessMethods(EXmlAccessMethods)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAccessibleJavaAttribute_XmlAccessMethods()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlAccessMethods getXmlAccessMethods()

+	{

+		return xmlAccessMethods;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods, NotificationChain msgs)

+	{

+		EXmlAccessMethods oldXmlAccessMethods = xmlAccessMethods;

+		xmlAccessMethods = newXmlAccessMethods;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_ACCESS_METHODS, oldXmlAccessMethods, newXmlAccessMethods);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlAccessMethods <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 */

+	public void setXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods)

+	{

+		if (newXmlAccessMethods != xmlAccessMethods)

+		{

+			NotificationChain msgs = null;

+			if (xmlAccessMethods != null)

+				msgs = ((InternalEObject)xmlAccessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ATTRIBUTE__XML_ACCESS_METHODS, null, msgs);

+			if (newXmlAccessMethods != null)

+				msgs = ((InternalEObject)newXmlAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ATTRIBUTE__XML_ACCESS_METHODS, null, msgs);

+			msgs = basicSetXmlAccessMethods(newXmlAccessMethods, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_ACCESS_METHODS, newXmlAccessMethods, newXmlAccessMethods));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Java Type Adapter</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #setXmlJavaTypeAdapter(EXmlJavaTypeAdapter)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAdaptableJavaAttribute_XmlJavaTypeAdapter()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlJavaTypeAdapter getXmlJavaTypeAdapter()

+	{

+		return xmlJavaTypeAdapter;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlJavaTypeAdapter(EXmlJavaTypeAdapter newXmlJavaTypeAdapter, NotificationChain msgs)

+	{

+		EXmlJavaTypeAdapter oldXmlJavaTypeAdapter = xmlJavaTypeAdapter;

+		xmlJavaTypeAdapter = newXmlJavaTypeAdapter;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER, oldXmlJavaTypeAdapter, newXmlJavaTypeAdapter);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlJavaTypeAdapter <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 */

+	public void setXmlJavaTypeAdapter(EXmlJavaTypeAdapter newXmlJavaTypeAdapter)

+	{

+		if (newXmlJavaTypeAdapter != xmlJavaTypeAdapter)

+		{

+			NotificationChain msgs = null;

+			if (xmlJavaTypeAdapter != null)

+				msgs = ((InternalEObject)xmlJavaTypeAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER, null, msgs);

+			if (newXmlJavaTypeAdapter != null)

+				msgs = ((InternalEObject)newXmlJavaTypeAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER, null, msgs);

+			msgs = basicSetXmlJavaTypeAdapter(newXmlJavaTypeAdapter, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER, newXmlJavaTypeAdapter, newXmlJavaTypeAdapter));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Container Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Container Type</em>' attribute.

+	 * @see #setContainerType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEContainerJavaAttribute_ContainerType()

+	 * @model

+	 * @generated

+	 */

+	public String getContainerType()

+	{

+		return containerType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getContainerType <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Container Type</em>' attribute.

+	 * @see #getContainerType()

+	 * @generated

+	 */

+	public void setContainerType(String newContainerType)

+	{

+		String oldContainerType = containerType;

+		containerType = newContainerType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__CONTAINER_TYPE, oldContainerType, containerType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Read Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Read Only</em>' attribute.

+	 * @see #setReadOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_ReadOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isReadOnly()

+	{

+		return readOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isReadOnly <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Read Only</em>' attribute.

+	 * @see #isReadOnly()

+	 * @generated

+	 */

+	public void setReadOnly(boolean newReadOnly)

+	{

+		boolean oldReadOnly = readOnly;

+		readOnly = newReadOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__READ_ONLY, oldReadOnly, readOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Write Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Write Only</em>' attribute.

+	 * @see #setWriteOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_WriteOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isWriteOnly()

+	{

+		return writeOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isWriteOnly <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Write Only</em>' attribute.

+	 * @see #isWriteOnly()

+	 * @generated

+	 */

+	public void setWriteOnly(boolean newWriteOnly)

+	{

+		boolean oldWriteOnly = writeOnly;

+		writeOnly = newWriteOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__WRITE_ONLY, oldWriteOnly, writeOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Type</em>' attribute.

+	 * @see #setType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getETypedJavaAttribute_Type()

+	 * @model

+	 * @generated

+	 */

+	public String getType()

+	{

+		return type;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getType <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Type</em>' attribute.

+	 * @see #getType()

+	 * @generated

+	 */

+	public void setType(String newType)

+	{

+		String oldType = type;

+		type = newType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__TYPE, oldType, type));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Properties</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Properties</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder_XmlProperties()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlProperty> getXmlProperties()

+	{

+		if (xmlProperties == null)

+		{

+			xmlProperties = new EObjectContainmentEList<EXmlProperty>(EXmlProperty.class, this, OxmPackage.EXML_ATTRIBUTE__XML_PROPERTIES);

+		}

+		return xmlProperties;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute_Name()

+	 * @model

+	 * @generated

+	 */

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__NAME, oldName, name));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Namespace</em>' attribute.

+	 * @see #setNamespace(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute_Namespace()

+	 * @model

+	 * @generated

+	 */

+	public String getNamespace()

+	{

+		return namespace;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getNamespace <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Namespace</em>' attribute.

+	 * @see #getNamespace()

+	 * @generated

+	 */

+	public void setNamespace(String newNamespace)

+	{

+		String oldNamespace = namespace;

+		namespace = newNamespace;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__NAMESPACE, oldNamespace, namespace));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Required</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Required</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Required</em>' attribute.

+	 * @see #setRequired(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute_Required()

+	 * @model

+	 * @generated

+	 */

+	public boolean isRequired()

+	{

+		return required;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isRequired <em>Required</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Required</em>' attribute.

+	 * @see #isRequired()

+	 * @generated

+	 */

+	public void setRequired(boolean newRequired)

+	{

+		boolean oldRequired = required;

+		required = newRequired;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__REQUIRED, oldRequired, required));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Id</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Id</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Id</em>' attribute.

+	 * @see #setXmlId(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute_XmlId()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlId()

+	{

+		return xmlId;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlId <em>Xml Id</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Id</em>' attribute.

+	 * @see #isXmlId()

+	 * @generated

+	 */

+	public void setXmlId(boolean newXmlId)

+	{

+		boolean oldXmlId = xmlId;

+		xmlId = newXmlId;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_ID, oldXmlId, xmlId));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Id Ref</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Id Ref</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Id Ref</em>' attribute.

+	 * @see #setXmlIdRef(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute_XmlIdRef()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlIdRef()

+	{

+		return xmlIdRef;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlIdRef <em>Xml Id Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Id Ref</em>' attribute.

+	 * @see #isXmlIdRef()

+	 * @generated

+	 */

+	public void setXmlIdRef(boolean newXmlIdRef)

+	{

+		boolean oldXmlIdRef = xmlIdRef;

+		xmlIdRef = newXmlIdRef;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_ID_REF, oldXmlIdRef, xmlIdRef));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Key</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Key</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Key</em>' attribute.

+	 * @see #setXmlKey(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute_XmlKey()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlKey()

+	{

+		return xmlKey;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlKey <em>Xml Key</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Key</em>' attribute.

+	 * @see #isXmlKey()

+	 * @generated

+	 */

+	public void setXmlKey(boolean newXmlKey)

+	{

+		boolean oldXmlKey = xmlKey;

+		xmlKey = newXmlKey;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_KEY, oldXmlKey, xmlKey));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml List</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml List</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml List</em>' attribute.

+	 * @see #setXmlList(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute_XmlList()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlList()

+	{

+		return xmlList;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlList <em>Xml List</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml List</em>' attribute.

+	 * @see #isXmlList()

+	 * @generated

+	 */

+	public void setXmlList(boolean newXmlList)

+	{

+		boolean oldXmlList = xmlList;

+		xmlList = newXmlList;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_LIST, oldXmlList, xmlList));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Inline Binary Data</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Inline Binary Data</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Inline Binary Data</em>' attribute.

+	 * @see #setXmlInlineBinaryData(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute_XmlInlineBinaryData()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlInlineBinaryData()

+	{

+		return xmlInlineBinaryData;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlInlineBinaryData <em>Xml Inline Binary Data</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Inline Binary Data</em>' attribute.

+	 * @see #isXmlInlineBinaryData()

+	 * @generated

+	 */

+	public void setXmlInlineBinaryData(boolean newXmlInlineBinaryData)

+	{

+		boolean oldXmlInlineBinaryData = xmlInlineBinaryData;

+		xmlInlineBinaryData = newXmlInlineBinaryData;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_INLINE_BINARY_DATA, oldXmlInlineBinaryData, xmlInlineBinaryData));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Attachment Ref</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Attachment Ref</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Attachment Ref</em>' attribute.

+	 * @see #setXmlAttachmentRef(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute_XmlAttachmentRef()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlAttachmentRef()

+	{

+		return xmlAttachmentRef;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlAttachmentRef <em>Xml Attachment Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Attachment Ref</em>' attribute.

+	 * @see #isXmlAttachmentRef()

+	 * @generated

+	 */

+	public void setXmlAttachmentRef(boolean newXmlAttachmentRef)

+	{

+		boolean oldXmlAttachmentRef = xmlAttachmentRef;

+		xmlAttachmentRef = newXmlAttachmentRef;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_ATTACHMENT_REF, oldXmlAttachmentRef, xmlAttachmentRef));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Mime Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Mime Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Mime Type</em>' attribute.

+	 * @see #setXmlMimeType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute_XmlMimeType()

+	 * @model

+	 * @generated

+	 */

+	public String getXmlMimeType()

+	{

+		return xmlMimeType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlMimeType <em>Xml Mime Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Mime Type</em>' attribute.

+	 * @see #getXmlMimeType()

+	 * @generated

+	 */

+	public void setXmlMimeType(String newXmlMimeType)

+	{

+		String oldXmlMimeType = xmlMimeType;

+		xmlMimeType = newXmlMimeType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_MIME_TYPE, oldXmlMimeType, xmlMimeType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Path</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Path</em>' attribute.

+	 * @see #setXmlPath(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute_XmlPath()

+	 * @model

+	 * @generated

+	 */

+	public String getXmlPath()

+	{

+		return xmlPath;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlPath <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Path</em>' attribute.

+	 * @see #getXmlPath()

+	 * @generated

+	 */

+	public void setXmlPath(String newXmlPath)

+	{

+		String oldXmlPath = xmlPath;

+		xmlPath = newXmlPath;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_PATH, oldXmlPath, xmlPath));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Abstract Null Policy</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Abstract Null Policy</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Abstract Null Policy</em>' containment reference.

+	 * @see #setXmlAbstractNullPolicy(EAbstractXmlNullPolicy)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute_XmlAbstractNullPolicy()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EAbstractXmlNullPolicy getXmlAbstractNullPolicy()

+	{

+		return xmlAbstractNullPolicy;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlAbstractNullPolicy(EAbstractXmlNullPolicy newXmlAbstractNullPolicy, NotificationChain msgs)

+	{

+		EAbstractXmlNullPolicy oldXmlAbstractNullPolicy = xmlAbstractNullPolicy;

+		xmlAbstractNullPolicy = newXmlAbstractNullPolicy;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_ABSTRACT_NULL_POLICY, oldXmlAbstractNullPolicy, newXmlAbstractNullPolicy);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlAbstractNullPolicy <em>Xml Abstract Null Policy</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Abstract Null Policy</em>' containment reference.

+	 * @see #getXmlAbstractNullPolicy()

+	 * @generated

+	 */

+	public void setXmlAbstractNullPolicy(EAbstractXmlNullPolicy newXmlAbstractNullPolicy)

+	{

+		if (newXmlAbstractNullPolicy != xmlAbstractNullPolicy)

+		{

+			NotificationChain msgs = null;

+			if (xmlAbstractNullPolicy != null)

+				msgs = ((InternalEObject)xmlAbstractNullPolicy).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ATTRIBUTE__XML_ABSTRACT_NULL_POLICY, null, msgs);

+			if (newXmlAbstractNullPolicy != null)

+				msgs = ((InternalEObject)newXmlAbstractNullPolicy).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ATTRIBUTE__XML_ABSTRACT_NULL_POLICY, null, msgs);

+			msgs = basicSetXmlAbstractNullPolicy(newXmlAbstractNullPolicy, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_ABSTRACT_NULL_POLICY, newXmlAbstractNullPolicy, newXmlAbstractNullPolicy));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Schema Type</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Schema Type</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Schema Type</em>' containment reference.

+	 * @see #setXmlSchemaType(EXmlSchemaType)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute_XmlSchemaType()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlSchemaType getXmlSchemaType()

+	{

+		return xmlSchemaType;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlSchemaType(EXmlSchemaType newXmlSchemaType, NotificationChain msgs)

+	{

+		EXmlSchemaType oldXmlSchemaType = xmlSchemaType;

+		xmlSchemaType = newXmlSchemaType;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_SCHEMA_TYPE, oldXmlSchemaType, newXmlSchemaType);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlSchemaType <em>Xml Schema Type</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Schema Type</em>' containment reference.

+	 * @see #getXmlSchemaType()

+	 * @generated

+	 */

+	public void setXmlSchemaType(EXmlSchemaType newXmlSchemaType)

+	{

+		if (newXmlSchemaType != xmlSchemaType)

+		{

+			NotificationChain msgs = null;

+			if (xmlSchemaType != null)

+				msgs = ((InternalEObject)xmlSchemaType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ATTRIBUTE__XML_SCHEMA_TYPE, null, msgs);

+			if (newXmlSchemaType != null)

+				msgs = ((InternalEObject)newXmlSchemaType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ATTRIBUTE__XML_SCHEMA_TYPE, null, msgs);

+			msgs = basicSetXmlSchemaType(newXmlSchemaType, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ATTRIBUTE__XML_SCHEMA_TYPE, newXmlSchemaType, newXmlSchemaType));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ATTRIBUTE__XML_ACCESS_METHODS:

+				return basicSetXmlAccessMethods(null, msgs);

+			case OxmPackage.EXML_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER:

+				return basicSetXmlJavaTypeAdapter(null, msgs);

+			case OxmPackage.EXML_ATTRIBUTE__XML_PROPERTIES:

+				return ((InternalEList<?>)getXmlProperties()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EXML_ATTRIBUTE__XML_ABSTRACT_NULL_POLICY:

+				return basicSetXmlAbstractNullPolicy(null, msgs);

+			case OxmPackage.EXML_ATTRIBUTE__XML_SCHEMA_TYPE:

+				return basicSetXmlSchemaType(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ATTRIBUTE__XML_ACCESS_METHODS:

+				return getXmlAccessMethods();

+			case OxmPackage.EXML_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER:

+				return getXmlJavaTypeAdapter();

+			case OxmPackage.EXML_ATTRIBUTE__CONTAINER_TYPE:

+				return getContainerType();

+			case OxmPackage.EXML_ATTRIBUTE__READ_ONLY:

+				return isReadOnly();

+			case OxmPackage.EXML_ATTRIBUTE__WRITE_ONLY:

+				return isWriteOnly();

+			case OxmPackage.EXML_ATTRIBUTE__TYPE:

+				return getType();

+			case OxmPackage.EXML_ATTRIBUTE__XML_PROPERTIES:

+				return getXmlProperties();

+			case OxmPackage.EXML_ATTRIBUTE__NAME:

+				return getName();

+			case OxmPackage.EXML_ATTRIBUTE__NAMESPACE:

+				return getNamespace();

+			case OxmPackage.EXML_ATTRIBUTE__REQUIRED:

+				return isRequired();

+			case OxmPackage.EXML_ATTRIBUTE__XML_ID:

+				return isXmlId();

+			case OxmPackage.EXML_ATTRIBUTE__XML_ID_REF:

+				return isXmlIdRef();

+			case OxmPackage.EXML_ATTRIBUTE__XML_KEY:

+				return isXmlKey();

+			case OxmPackage.EXML_ATTRIBUTE__XML_LIST:

+				return isXmlList();

+			case OxmPackage.EXML_ATTRIBUTE__XML_INLINE_BINARY_DATA:

+				return isXmlInlineBinaryData();

+			case OxmPackage.EXML_ATTRIBUTE__XML_ATTACHMENT_REF:

+				return isXmlAttachmentRef();

+			case OxmPackage.EXML_ATTRIBUTE__XML_MIME_TYPE:

+				return getXmlMimeType();

+			case OxmPackage.EXML_ATTRIBUTE__XML_PATH:

+				return getXmlPath();

+			case OxmPackage.EXML_ATTRIBUTE__XML_ABSTRACT_NULL_POLICY:

+				return getXmlAbstractNullPolicy();

+			case OxmPackage.EXML_ATTRIBUTE__XML_SCHEMA_TYPE:

+				return getXmlSchemaType();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ATTRIBUTE__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER:

+				setXmlJavaTypeAdapter((EXmlJavaTypeAdapter)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__CONTAINER_TYPE:

+				setContainerType((String)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__READ_ONLY:

+				setReadOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__WRITE_ONLY:

+				setWriteOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__TYPE:

+				setType((String)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_PROPERTIES:

+				getXmlProperties().clear();

+				getXmlProperties().addAll((Collection<? extends EXmlProperty>)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__NAME:

+				setName((String)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__NAMESPACE:

+				setNamespace((String)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__REQUIRED:

+				setRequired((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_ID:

+				setXmlId((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_ID_REF:

+				setXmlIdRef((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_KEY:

+				setXmlKey((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_LIST:

+				setXmlList((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_INLINE_BINARY_DATA:

+				setXmlInlineBinaryData((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_ATTACHMENT_REF:

+				setXmlAttachmentRef((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_MIME_TYPE:

+				setXmlMimeType((String)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_PATH:

+				setXmlPath((String)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_ABSTRACT_NULL_POLICY:

+				setXmlAbstractNullPolicy((EAbstractXmlNullPolicy)newValue);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_SCHEMA_TYPE:

+				setXmlSchemaType((EXmlSchemaType)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ATTRIBUTE__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)null);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER:

+				setXmlJavaTypeAdapter((EXmlJavaTypeAdapter)null);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__CONTAINER_TYPE:

+				setContainerType(CONTAINER_TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__READ_ONLY:

+				setReadOnly(READ_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__WRITE_ONLY:

+				setWriteOnly(WRITE_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__TYPE:

+				setType(TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_PROPERTIES:

+				getXmlProperties().clear();

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__NAME:

+				setName(NAME_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__NAMESPACE:

+				setNamespace(NAMESPACE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__REQUIRED:

+				setRequired(REQUIRED_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_ID:

+				setXmlId(XML_ID_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_ID_REF:

+				setXmlIdRef(XML_ID_REF_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_KEY:

+				setXmlKey(XML_KEY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_LIST:

+				setXmlList(XML_LIST_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_INLINE_BINARY_DATA:

+				setXmlInlineBinaryData(XML_INLINE_BINARY_DATA_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_ATTACHMENT_REF:

+				setXmlAttachmentRef(XML_ATTACHMENT_REF_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_MIME_TYPE:

+				setXmlMimeType(XML_MIME_TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_PATH:

+				setXmlPath(XML_PATH_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_ABSTRACT_NULL_POLICY:

+				setXmlAbstractNullPolicy((EAbstractXmlNullPolicy)null);

+				return;

+			case OxmPackage.EXML_ATTRIBUTE__XML_SCHEMA_TYPE:

+				setXmlSchemaType((EXmlSchemaType)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ATTRIBUTE__XML_ACCESS_METHODS:

+				return xmlAccessMethods != null;

+			case OxmPackage.EXML_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER:

+				return xmlJavaTypeAdapter != null;

+			case OxmPackage.EXML_ATTRIBUTE__CONTAINER_TYPE:

+				return CONTAINER_TYPE_EDEFAULT == null ? containerType != null : !CONTAINER_TYPE_EDEFAULT.equals(containerType);

+			case OxmPackage.EXML_ATTRIBUTE__READ_ONLY:

+				return readOnly != READ_ONLY_EDEFAULT;

+			case OxmPackage.EXML_ATTRIBUTE__WRITE_ONLY:

+				return writeOnly != WRITE_ONLY_EDEFAULT;

+			case OxmPackage.EXML_ATTRIBUTE__TYPE:

+				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

+			case OxmPackage.EXML_ATTRIBUTE__XML_PROPERTIES:

+				return xmlProperties != null && !xmlProperties.isEmpty();

+			case OxmPackage.EXML_ATTRIBUTE__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+			case OxmPackage.EXML_ATTRIBUTE__NAMESPACE:

+				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);

+			case OxmPackage.EXML_ATTRIBUTE__REQUIRED:

+				return required != REQUIRED_EDEFAULT;

+			case OxmPackage.EXML_ATTRIBUTE__XML_ID:

+				return xmlId != XML_ID_EDEFAULT;

+			case OxmPackage.EXML_ATTRIBUTE__XML_ID_REF:

+				return xmlIdRef != XML_ID_REF_EDEFAULT;

+			case OxmPackage.EXML_ATTRIBUTE__XML_KEY:

+				return xmlKey != XML_KEY_EDEFAULT;

+			case OxmPackage.EXML_ATTRIBUTE__XML_LIST:

+				return xmlList != XML_LIST_EDEFAULT;

+			case OxmPackage.EXML_ATTRIBUTE__XML_INLINE_BINARY_DATA:

+				return xmlInlineBinaryData != XML_INLINE_BINARY_DATA_EDEFAULT;

+			case OxmPackage.EXML_ATTRIBUTE__XML_ATTACHMENT_REF:

+				return xmlAttachmentRef != XML_ATTACHMENT_REF_EDEFAULT;

+			case OxmPackage.EXML_ATTRIBUTE__XML_MIME_TYPE:

+				return XML_MIME_TYPE_EDEFAULT == null ? xmlMimeType != null : !XML_MIME_TYPE_EDEFAULT.equals(xmlMimeType);

+			case OxmPackage.EXML_ATTRIBUTE__XML_PATH:

+				return XML_PATH_EDEFAULT == null ? xmlPath != null : !XML_PATH_EDEFAULT.equals(xmlPath);

+			case OxmPackage.EXML_ATTRIBUTE__XML_ABSTRACT_NULL_POLICY:

+				return xmlAbstractNullPolicy != null;

+			case OxmPackage.EXML_ATTRIBUTE__XML_SCHEMA_TYPE:

+				return xmlSchemaType != null;

+		}

+		return super.eIsSet(featureID);

+	}

+	

+	

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)

+	{

+		if (baseClass == EAccessibleJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ATTRIBUTE__XML_ACCESS_METHODS: return OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EAdaptableJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER: return OxmPackage.EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ATTRIBUTE__CONTAINER_TYPE: return OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ATTRIBUTE__READ_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY;

+				case OxmPackage.EXML_ATTRIBUTE__WRITE_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY;

+				default: return -1;

+			}

+		}

+		if (baseClass == ETypedJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ATTRIBUTE__TYPE: return OxmPackage.ETYPED_JAVA_ATTRIBUTE__TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ATTRIBUTE__XML_PROPERTIES: return OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES;

+				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 == EAccessibleJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS: return OxmPackage.EXML_ATTRIBUTE__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EAdaptableJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER: return OxmPackage.EXML_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE: return OxmPackage.EXML_ATTRIBUTE__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY: return OxmPackage.EXML_ATTRIBUTE__READ_ONLY;

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY: return OxmPackage.EXML_ATTRIBUTE__WRITE_ONLY;

+				default: return -1;

+			}

+		}

+		if (baseClass == ETypedJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.ETYPED_JAVA_ATTRIBUTE__TYPE: return OxmPackage.EXML_ATTRIBUTE__TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES: return OxmPackage.EXML_ATTRIBUTE__XML_PROPERTIES;

+				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(" (containerType: ");

+		result.append(containerType);

+		result.append(", readOnly: ");

+		result.append(readOnly);

+		result.append(", writeOnly: ");

+		result.append(writeOnly);

+		result.append(", type: ");

+		result.append(type);

+		result.append(", name: ");

+		result.append(name);

+		result.append(", namespace: ");

+		result.append(namespace);

+		result.append(", required: ");

+		result.append(required);

+		result.append(", xmlId: ");

+		result.append(xmlId);

+		result.append(", xmlIdRef: ");

+		result.append(xmlIdRef);

+		result.append(", xmlKey: ");

+		result.append(xmlKey);

+		result.append(", xmlList: ");

+		result.append(xmlList);

+		result.append(", xmlInlineBinaryData: ");

+		result.append(xmlInlineBinaryData);

+		result.append(", xmlAttachmentRef: ");

+		result.append(xmlAttachmentRef);

+		result.append(", xmlMimeType: ");

+		result.append(xmlMimeType);

+		result.append(", xmlPath: ");

+		result.append(xmlPath);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlAttributeTranslator

+			extends AbstractJavaAttributeTranslator {

+		

+		XmlAttributeTranslator(String domPathAndName, EStructuralFeature eStructuralFeature) {

+			super(domPathAndName, eStructuralFeature, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+				new EAbstractXmlNullPolicy.AbstractXmlNullPolicyTranslator()

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlAttribute();

+		}

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlBindings.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlBindings.java
new file mode 100644
index 0000000000..4a9bdbbf61
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlBindings.java
@@ -0,0 +1,969 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+import java.util.HashMap;

+import org.eclipse.core.runtime.content.IContentType;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.jpt.common.core.internal.utility.translators.SimpleRootTranslator;

+import org.eclipse.jpt.common.core.resource.xml.ERootObjectImpl;

+import org.eclipse.jpt.jaxb.eclipselink.core.internal.plugin.JptJaxbEclipseLinkCorePlugin;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Bindings</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlAccessorType <em>Xml Accessor Type</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlAccessorOrder <em>Xml Accessor Order</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#isXmlMappingMetadataComplete <em>Xml Mapping Metadata Complete</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getPackageName <em>Package Name</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlNameTransformer <em>Xml Name Transformer</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlSchema <em>Xml Schema</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlSchemaType <em>Xml Schema Type</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlSchemaTypes <em>Xml Schema Types</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlJavaTypeAdapters <em>Xml Java Type Adapters</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlRegistries <em>Xml Registries</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlEnums <em>Xml Enums</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getJavaTypes <em>Java Types</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlBindings extends ERootObjectImpl

+{

+	/**

+	 * The default value of the '{@link #getXmlAccessorType() <em>Xml Accessor Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessorType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final EXmlAccessType XML_ACCESSOR_TYPE_EDEFAULT = EXmlAccessType.FIELD;

+

+

+	/**

+	 * The cached value of the '{@link #getXmlAccessorType() <em>Xml Accessor Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessorType()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessType xmlAccessorType = XML_ACCESSOR_TYPE_EDEFAULT;

+

+

+	/**

+	 * The default value of the '{@link #getXmlAccessorOrder() <em>Xml Accessor Order</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessorOrder()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final EXmlAccessOrder XML_ACCESSOR_ORDER_EDEFAULT = EXmlAccessOrder.ALPHABETICAL;

+

+

+	/**

+	 * The cached value of the '{@link #getXmlAccessorOrder() <em>Xml Accessor Order</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessorOrder()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessOrder xmlAccessorOrder = XML_ACCESSOR_ORDER_EDEFAULT;

+

+

+	/**

+	 * The default value of the '{@link #isXmlMappingMetadataComplete() <em>Xml Mapping Metadata Complete</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlMappingMetadataComplete()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_MAPPING_METADATA_COMPLETE_EDEFAULT = false;

+

+

+	/**

+	 * The cached value of the '{@link #isXmlMappingMetadataComplete() <em>Xml Mapping Metadata Complete</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlMappingMetadataComplete()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlMappingMetadataComplete = XML_MAPPING_METADATA_COMPLETE_EDEFAULT;

+

+

+	/**

+	 * The default value of the '{@link #getPackageName() <em>Package Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getPackageName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String PACKAGE_NAME_EDEFAULT = null;

+

+

+	/**

+	 * The cached value of the '{@link #getPackageName() <em>Package Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getPackageName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String packageName = PACKAGE_NAME_EDEFAULT;

+

+

+	/**

+	 * The default value of the '{@link #getXmlNameTransformer() <em>Xml Name Transformer</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlNameTransformer()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String XML_NAME_TRANSFORMER_EDEFAULT = null;

+

+

+	/**

+	 * The cached value of the '{@link #getXmlNameTransformer() <em>Xml Name Transformer</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlNameTransformer()

+	 * @generated

+	 * @ordered

+	 */

+	protected String xmlNameTransformer = XML_NAME_TRANSFORMER_EDEFAULT;

+

+

+	/**

+	 * The cached value of the '{@link #getXmlSchema() <em>Xml Schema</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlSchema()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlSchema xmlSchema;

+

+

+	/**

+	 * The cached value of the '{@link #getXmlSchemaType() <em>Xml Schema Type</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlSchemaType()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlSchemaType xmlSchemaType;

+

+

+	/**

+	 * The cached value of the '{@link #getXmlSchemaTypes() <em>Xml Schema Types</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlSchemaTypes()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlSchemaType> xmlSchemaTypes;

+

+

+	/**

+	 * The cached value of the '{@link #getXmlJavaTypeAdapters() <em>Xml Java Type Adapters</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlJavaTypeAdapters()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlJavaTypeAdapter> xmlJavaTypeAdapters;

+

+

+	/**

+	 * The cached value of the '{@link #getXmlRegistries() <em>Xml Registries</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlRegistries()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlRegistry> xmlRegistries;

+

+

+	/**

+	 * The cached value of the '{@link #getXmlEnums() <em>Xml Enums</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlEnums()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlEnum> xmlEnums;

+

+

+	/**

+	 * The cached value of the '{@link #getJavaTypes() <em>Java Types</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getJavaTypes()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EJavaType> javaTypes;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlBindings()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_BINDINGS;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * The literals are from the enumeration {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Accessor Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Accessor Type</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType

+	 * @see #setXmlAccessorType(EXmlAccessType)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings_XmlAccessorType()

+	 * @model

+	 * @generated

+	 */

+	public EXmlAccessType getXmlAccessorType()

+	{

+		return xmlAccessorType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlAccessorType <em>Xml Accessor Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Accessor Type</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType

+	 * @see #getXmlAccessorType()

+	 * @generated

+	 */

+	public void setXmlAccessorType(EXmlAccessType newXmlAccessorType)

+	{

+		EXmlAccessType oldXmlAccessorType = xmlAccessorType;

+		xmlAccessorType = newXmlAccessorType == null ? XML_ACCESSOR_TYPE_EDEFAULT : newXmlAccessorType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_BINDINGS__XML_ACCESSOR_TYPE, oldXmlAccessorType, xmlAccessorType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Accessor Order</b></em>' attribute.

+	 * The literals are from the enumeration {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Accessor Order</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Accessor Order</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder

+	 * @see #setXmlAccessorOrder(EXmlAccessOrder)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings_XmlAccessorOrder()

+	 * @model

+	 * @generated

+	 */

+	public EXmlAccessOrder getXmlAccessorOrder()

+	{

+		return xmlAccessorOrder;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlAccessorOrder <em>Xml Accessor Order</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Accessor Order</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder

+	 * @see #getXmlAccessorOrder()

+	 * @generated

+	 */

+	public void setXmlAccessorOrder(EXmlAccessOrder newXmlAccessorOrder)

+	{

+		EXmlAccessOrder oldXmlAccessorOrder = xmlAccessorOrder;

+		xmlAccessorOrder = newXmlAccessorOrder == null ? XML_ACCESSOR_ORDER_EDEFAULT : newXmlAccessorOrder;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_BINDINGS__XML_ACCESSOR_ORDER, oldXmlAccessorOrder, xmlAccessorOrder));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Mapping Metadata Complete</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Mapping Metadata Complete</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Mapping Metadata Complete</em>' attribute.

+	 * @see #setXmlMappingMetadataComplete(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings_XmlMappingMetadataComplete()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlMappingMetadataComplete()

+	{

+		return xmlMappingMetadataComplete;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#isXmlMappingMetadataComplete <em>Xml Mapping Metadata Complete</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Mapping Metadata Complete</em>' attribute.

+	 * @see #isXmlMappingMetadataComplete()

+	 * @generated

+	 */

+	public void setXmlMappingMetadataComplete(boolean newXmlMappingMetadataComplete)

+	{

+		boolean oldXmlMappingMetadataComplete = xmlMappingMetadataComplete;

+		xmlMappingMetadataComplete = newXmlMappingMetadataComplete;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_BINDINGS__XML_MAPPING_METADATA_COMPLETE, oldXmlMappingMetadataComplete, xmlMappingMetadataComplete));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Package Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Package 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>Package Name</em>' attribute.

+	 * @see #setPackageName(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings_PackageName()

+	 * @model

+	 * @generated

+	 */

+	public String getPackageName()

+	{

+		return packageName;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getPackageName <em>Package Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Package Name</em>' attribute.

+	 * @see #getPackageName()

+	 * @generated

+	 */

+	public void setPackageName(String newPackageName)

+	{

+		String oldPackageName = packageName;

+		packageName = newPackageName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_BINDINGS__PACKAGE_NAME, oldPackageName, packageName));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Name Transformer</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Name Transformer</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Name Transformer</em>' attribute.

+	 * @see #setXmlNameTransformer(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings_XmlNameTransformer()

+	 * @model

+	 * @generated

+	 */

+	public String getXmlNameTransformer()

+	{

+		return xmlNameTransformer;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlNameTransformer <em>Xml Name Transformer</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Name Transformer</em>' attribute.

+	 * @see #getXmlNameTransformer()

+	 * @generated

+	 */

+	public void setXmlNameTransformer(String newXmlNameTransformer)

+	{

+		String oldXmlNameTransformer = xmlNameTransformer;

+		xmlNameTransformer = newXmlNameTransformer;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_BINDINGS__XML_NAME_TRANSFORMER, oldXmlNameTransformer, xmlNameTransformer));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Schema</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Schema</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Schema</em>' containment reference.

+	 * @see #setXmlSchema(EXmlSchema)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings_XmlSchema()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlSchema getXmlSchema()

+	{

+		return xmlSchema;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlSchema(EXmlSchema newXmlSchema, NotificationChain msgs)

+	{

+		EXmlSchema oldXmlSchema = xmlSchema;

+		xmlSchema = newXmlSchema;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_BINDINGS__XML_SCHEMA, oldXmlSchema, newXmlSchema);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlSchema <em>Xml Schema</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Schema</em>' containment reference.

+	 * @see #getXmlSchema()

+	 * @generated

+	 */

+	public void setXmlSchema(EXmlSchema newXmlSchema)

+	{

+		if (newXmlSchema != xmlSchema)

+		{

+			NotificationChain msgs = null;

+			if (xmlSchema != null)

+				msgs = ((InternalEObject)xmlSchema).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_BINDINGS__XML_SCHEMA, null, msgs);

+			if (newXmlSchema != null)

+				msgs = ((InternalEObject)newXmlSchema).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_BINDINGS__XML_SCHEMA, null, msgs);

+			msgs = basicSetXmlSchema(newXmlSchema, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_BINDINGS__XML_SCHEMA, newXmlSchema, newXmlSchema));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Schema Type</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Schema Type</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Schema Type</em>' containment reference.

+	 * @see #setXmlSchemaType(EXmlSchemaType)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings_XmlSchemaType()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlSchemaType getXmlSchemaType()

+	{

+		return xmlSchemaType;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlSchemaType(EXmlSchemaType newXmlSchemaType, NotificationChain msgs)

+	{

+		EXmlSchemaType oldXmlSchemaType = xmlSchemaType;

+		xmlSchemaType = newXmlSchemaType;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPE, oldXmlSchemaType, newXmlSchemaType);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlSchemaType <em>Xml Schema Type</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Schema Type</em>' containment reference.

+	 * @see #getXmlSchemaType()

+	 * @generated

+	 */

+	public void setXmlSchemaType(EXmlSchemaType newXmlSchemaType)

+	{

+		if (newXmlSchemaType != xmlSchemaType)

+		{

+			NotificationChain msgs = null;

+			if (xmlSchemaType != null)

+				msgs = ((InternalEObject)xmlSchemaType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPE, null, msgs);

+			if (newXmlSchemaType != null)

+				msgs = ((InternalEObject)newXmlSchemaType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPE, null, msgs);

+			msgs = basicSetXmlSchemaType(newXmlSchemaType, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPE, newXmlSchemaType, newXmlSchemaType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Schema Types</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Schema Types</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Schema Types</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings_XmlSchemaTypes()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlSchemaType> getXmlSchemaTypes()

+	{

+		if (xmlSchemaTypes == null)

+		{

+			xmlSchemaTypes = new EObjectContainmentEList<EXmlSchemaType>(EXmlSchemaType.class, this, OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPES);

+		}

+		return xmlSchemaTypes;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Java Type Adapters</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Java Type Adapters</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Java Type Adapters</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings_XmlJavaTypeAdapters()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlJavaTypeAdapter> getXmlJavaTypeAdapters()

+	{

+		if (xmlJavaTypeAdapters == null)

+		{

+			xmlJavaTypeAdapters = new EObjectContainmentEList<EXmlJavaTypeAdapter>(EXmlJavaTypeAdapter.class, this, OxmPackage.EXML_BINDINGS__XML_JAVA_TYPE_ADAPTERS);

+		}

+		return xmlJavaTypeAdapters;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Registries</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRegistry}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Registries</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Registries</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings_XmlRegistries()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlRegistry> getXmlRegistries()

+	{

+		if (xmlRegistries == null)

+		{

+			xmlRegistries = new EObjectContainmentEList<EXmlRegistry>(EXmlRegistry.class, this, OxmPackage.EXML_BINDINGS__XML_REGISTRIES);

+		}

+		return xmlRegistries;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Enums</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Enums</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Enums</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings_XmlEnums()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlEnum> getXmlEnums()

+	{

+		if (xmlEnums == null)

+		{

+			xmlEnums = new EObjectContainmentEList<EXmlEnum>(EXmlEnum.class, this, OxmPackage.EXML_BINDINGS__XML_ENUMS);

+		}

+		return xmlEnums;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Java Types</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Java Types</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Java Types</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings_JavaTypes()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EJavaType> getJavaTypes()

+	{

+		if (javaTypes == null)

+		{

+			javaTypes = new EObjectContainmentEList<EJavaType>(EJavaType.class, this, OxmPackage.EXML_BINDINGS__JAVA_TYPES);

+		}

+		return javaTypes;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA:

+				return basicSetXmlSchema(null, msgs);

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPE:

+				return basicSetXmlSchemaType(null, msgs);

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPES:

+				return ((InternalEList<?>)getXmlSchemaTypes()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EXML_BINDINGS__XML_JAVA_TYPE_ADAPTERS:

+				return ((InternalEList<?>)getXmlJavaTypeAdapters()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EXML_BINDINGS__XML_REGISTRIES:

+				return ((InternalEList<?>)getXmlRegistries()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EXML_BINDINGS__XML_ENUMS:

+				return ((InternalEList<?>)getXmlEnums()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EXML_BINDINGS__JAVA_TYPES:

+				return ((InternalEList<?>)getJavaTypes()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_BINDINGS__XML_ACCESSOR_TYPE:

+				return getXmlAccessorType();

+			case OxmPackage.EXML_BINDINGS__XML_ACCESSOR_ORDER:

+				return getXmlAccessorOrder();

+			case OxmPackage.EXML_BINDINGS__XML_MAPPING_METADATA_COMPLETE:

+				return isXmlMappingMetadataComplete();

+			case OxmPackage.EXML_BINDINGS__PACKAGE_NAME:

+				return getPackageName();

+			case OxmPackage.EXML_BINDINGS__XML_NAME_TRANSFORMER:

+				return getXmlNameTransformer();

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA:

+				return getXmlSchema();

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPE:

+				return getXmlSchemaType();

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPES:

+				return getXmlSchemaTypes();

+			case OxmPackage.EXML_BINDINGS__XML_JAVA_TYPE_ADAPTERS:

+				return getXmlJavaTypeAdapters();

+			case OxmPackage.EXML_BINDINGS__XML_REGISTRIES:

+				return getXmlRegistries();

+			case OxmPackage.EXML_BINDINGS__XML_ENUMS:

+				return getXmlEnums();

+			case OxmPackage.EXML_BINDINGS__JAVA_TYPES:

+				return getJavaTypes();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_BINDINGS__XML_ACCESSOR_TYPE:

+				setXmlAccessorType((EXmlAccessType)newValue);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_ACCESSOR_ORDER:

+				setXmlAccessorOrder((EXmlAccessOrder)newValue);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_MAPPING_METADATA_COMPLETE:

+				setXmlMappingMetadataComplete((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_BINDINGS__PACKAGE_NAME:

+				setPackageName((String)newValue);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_NAME_TRANSFORMER:

+				setXmlNameTransformer((String)newValue);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA:

+				setXmlSchema((EXmlSchema)newValue);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPE:

+				setXmlSchemaType((EXmlSchemaType)newValue);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPES:

+				getXmlSchemaTypes().clear();

+				getXmlSchemaTypes().addAll((Collection<? extends EXmlSchemaType>)newValue);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_JAVA_TYPE_ADAPTERS:

+				getXmlJavaTypeAdapters().clear();

+				getXmlJavaTypeAdapters().addAll((Collection<? extends EXmlJavaTypeAdapter>)newValue);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_REGISTRIES:

+				getXmlRegistries().clear();

+				getXmlRegistries().addAll((Collection<? extends EXmlRegistry>)newValue);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_ENUMS:

+				getXmlEnums().clear();

+				getXmlEnums().addAll((Collection<? extends EXmlEnum>)newValue);

+				return;

+			case OxmPackage.EXML_BINDINGS__JAVA_TYPES:

+				getJavaTypes().clear();

+				getJavaTypes().addAll((Collection<? extends EJavaType>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_BINDINGS__XML_ACCESSOR_TYPE:

+				setXmlAccessorType(XML_ACCESSOR_TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_ACCESSOR_ORDER:

+				setXmlAccessorOrder(XML_ACCESSOR_ORDER_EDEFAULT);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_MAPPING_METADATA_COMPLETE:

+				setXmlMappingMetadataComplete(XML_MAPPING_METADATA_COMPLETE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_BINDINGS__PACKAGE_NAME:

+				setPackageName(PACKAGE_NAME_EDEFAULT);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_NAME_TRANSFORMER:

+				setXmlNameTransformer(XML_NAME_TRANSFORMER_EDEFAULT);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA:

+				setXmlSchema((EXmlSchema)null);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPE:

+				setXmlSchemaType((EXmlSchemaType)null);

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPES:

+				getXmlSchemaTypes().clear();

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_JAVA_TYPE_ADAPTERS:

+				getXmlJavaTypeAdapters().clear();

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_REGISTRIES:

+				getXmlRegistries().clear();

+				return;

+			case OxmPackage.EXML_BINDINGS__XML_ENUMS:

+				getXmlEnums().clear();

+				return;

+			case OxmPackage.EXML_BINDINGS__JAVA_TYPES:

+				getJavaTypes().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_BINDINGS__XML_ACCESSOR_TYPE:

+				return xmlAccessorType != XML_ACCESSOR_TYPE_EDEFAULT;

+			case OxmPackage.EXML_BINDINGS__XML_ACCESSOR_ORDER:

+				return xmlAccessorOrder != XML_ACCESSOR_ORDER_EDEFAULT;

+			case OxmPackage.EXML_BINDINGS__XML_MAPPING_METADATA_COMPLETE:

+				return xmlMappingMetadataComplete != XML_MAPPING_METADATA_COMPLETE_EDEFAULT;

+			case OxmPackage.EXML_BINDINGS__PACKAGE_NAME:

+				return PACKAGE_NAME_EDEFAULT == null ? packageName != null : !PACKAGE_NAME_EDEFAULT.equals(packageName);

+			case OxmPackage.EXML_BINDINGS__XML_NAME_TRANSFORMER:

+				return XML_NAME_TRANSFORMER_EDEFAULT == null ? xmlNameTransformer != null : !XML_NAME_TRANSFORMER_EDEFAULT.equals(xmlNameTransformer);

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA:

+				return xmlSchema != null;

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPE:

+				return xmlSchemaType != null;

+			case OxmPackage.EXML_BINDINGS__XML_SCHEMA_TYPES:

+				return xmlSchemaTypes != null && !xmlSchemaTypes.isEmpty();

+			case OxmPackage.EXML_BINDINGS__XML_JAVA_TYPE_ADAPTERS:

+				return xmlJavaTypeAdapters != null && !xmlJavaTypeAdapters.isEmpty();

+			case OxmPackage.EXML_BINDINGS__XML_REGISTRIES:

+				return xmlRegistries != null && !xmlRegistries.isEmpty();

+			case OxmPackage.EXML_BINDINGS__XML_ENUMS:

+				return xmlEnums != null && !xmlEnums.isEmpty();

+			case OxmPackage.EXML_BINDINGS__JAVA_TYPES:

+				return javaTypes != null && !javaTypes.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+	

+	

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (xmlAccessorType: ");

+		result.append(xmlAccessorType);

+		result.append(", xmlAccessorOrder: ");

+		result.append(xmlAccessorOrder);

+		result.append(", xmlMappingMetadataComplete: ");

+		result.append(xmlMappingMetadataComplete);

+		result.append(", packageName: ");

+		result.append(packageName);

+		result.append(", xmlNameTransformer: ");

+		result.append(xmlNameTransformer);

+		result.append(')');

+		return result.toString();

+	}

+

+	// ********** version -> schema location mapping **********

+	

+	@Override

+	protected String getNamespace() {

+		return EclipseLink.SCHEMA_NAMESPACE;

+	}

+	

+	@Override

+	protected String getSchemaLocationForVersion(String schemaVersion) {

+		return SCHEMA_LOCATIONS.get(schemaVersion);

+	}

+	

+	private static HashMap<String, String> SCHEMA_LOCATIONS = buildSchemaLocations();

+	

+	private static HashMap<String, String> buildSchemaLocations() {

+		HashMap<String, String> map = new HashMap<String, String>();

+		map.put(EclipseLink.SCHEMA_VERSION_2_1, EclipseLink.SCHEMA_LOCATION_2_1);

+		map.put(EclipseLink.SCHEMA_VERSION_2_2, EclipseLink.SCHEMA_LOCATION_2_2);

+		map.put(EclipseLink.SCHEMA_VERSION_2_3, EclipseLink.SCHEMA_LOCATION_2_3);

+		map.put(EclipseLink.SCHEMA_VERSION_2_4, EclipseLink.SCHEMA_LOCATION_2_4);

+		return map;

+	}

+	

+	

+	// ********** content type **********

+

+	/**

+	 * The content type for <code>oxm.xml</code> mapping files.

+	 */

+	public static final IContentType CONTENT_TYPE = JptJaxbEclipseLinkCorePlugin.instance().getContentType("oxm"); //$NON-NLS-1$

+

+

+	// ********** translators **********

+	

+	private static final Translator ROOT_TRANSLATOR = buildRootTranslator();

+	

+	public static Translator getRootTranslator() {

+		return ROOT_TRANSLATOR;

+	}

+	

+	private static Translator buildRootTranslator() {

+		return new SimpleRootTranslator(EclipseLink.XML_BINDINGS, OxmPackage.eINSTANCE.getEXmlBindings(), buildTranslatorChildren());

+	}

+	

+	private static Translator[] buildTranslatorChildren() {

+		return new Translator[] {

+			buildVersionTranslator(SCHEMA_LOCATIONS),

+			buildNamespaceTranslator(EclipseLink.SCHEMA_NAMESPACE),

+			buildSchemaNamespaceTranslator(),

+			buildSchemaLocationTranslator(EclipseLink.SCHEMA_NAMESPACE, SCHEMA_LOCATIONS),

+			EJavaType.buildTranslator()

+		};

+	}

+}
\ No newline at end of file
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlClassExtractor.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlClassExtractor.java
new file mode 100644
index 0000000000..6fa51d0bae
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlClassExtractor.java
@@ -0,0 +1,192 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Class Extractor</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlClassExtractor#getClassName <em>Class Name</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlClassExtractor()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlClassExtractor extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * 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;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlClassExtractor()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_CLASS_EXTRACTOR;

+	}

+

+	/**

+	 * 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.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlClassExtractor_ClassName()

+	 * @model

+	 * @generated

+	 */

+	public String getClassName()

+	{

+		return className;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlClassExtractor#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, OxmPackage.EXML_CLASS_EXTRACTOR__CLASS_NAME, oldClassName, className));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_CLASS_EXTRACTOR__CLASS_NAME:

+				return getClassName();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_CLASS_EXTRACTOR__CLASS_NAME:

+				setClassName((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_CLASS_EXTRACTOR__CLASS_NAME:

+				setClassName(CLASS_NAME_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_CLASS_EXTRACTOR__CLASS_NAME:

+				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);

+		}

+		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(')');

+		return result.toString();

+	}

+

+} // EXmlClassExtractor

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElement.java
new file mode 100644
index 0000000000..c9156f3981
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElement.java
@@ -0,0 +1,1996 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Element</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getNamespace <em>Namespace</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getDefaultValue <em>Default Value</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isNillable <em>Nillable</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isRequired <em>Required</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlId <em>Xml Id</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlIdRef <em>Xml Id Ref</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlKey <em>Xml Key</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlList <em>Xml List</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlInlineBinaryData <em>Xml Inline Binary Data</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlAttachmentRef <em>Xml Attachment Ref</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlMimeType <em>Xml Mime Type</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isCdata <em>Cdata</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlPath <em>Xml Path</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlLocation <em>Xml Location</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlAbstractNullPolicy <em>Xml Abstract Null Policy</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlElementWrapper <em>Xml Element Wrapper</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlMap <em>Xml Map</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlSchemaType <em>Xml Schema Type</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlElement extends EJavaAttribute implements EAccessibleJavaAttribute, EAdaptableJavaAttribute, EContainerJavaAttribute, EPropertyHolder, EReadWriteJavaAttribute

+{

+	/**

+	 * The cached value of the '{@link #getXmlAccessMethods() <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessMethods xmlAccessMethods;

+	/**

+	 * The cached value of the '{@link #getXmlJavaTypeAdapter() <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlJavaTypeAdapter xmlJavaTypeAdapter;

+	/**

+	 * The default value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String CONTAINER_TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String containerType = CONTAINER_TYPE_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlProperties() <em>Xml Properties</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlProperties()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlProperty> xmlProperties;

+	/**

+	 * The default value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean READ_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean readOnly = READ_ONLY_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean WRITE_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean writeOnly = WRITE_ONLY_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAMESPACE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected String namespace = NAMESPACE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getDefaultValue() <em>Default Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getDefaultValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String DEFAULT_VALUE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getDefaultValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected String defaultValue = DEFAULT_VALUE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isNillable() <em>Nillable</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isNillable()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean NILLABLE_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isNillable() <em>Nillable</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isNillable()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean nillable = NILLABLE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isRequired() <em>Required</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isRequired()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean REQUIRED_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isRequired() <em>Required</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isRequired()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean required = REQUIRED_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlId() <em>Xml Id</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlId()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_ID_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlId() <em>Xml Id</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlId()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlId = XML_ID_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlIdRef() <em>Xml Id Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlIdRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_ID_REF_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlIdRef() <em>Xml Id Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlIdRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlIdRef = XML_ID_REF_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlKey() <em>Xml Key</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlKey()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_KEY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlKey() <em>Xml Key</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlKey()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlKey = XML_KEY_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlList() <em>Xml List</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlList()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_LIST_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlList() <em>Xml List</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlList()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlList = XML_LIST_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlInlineBinaryData() <em>Xml Inline Binary Data</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlInlineBinaryData()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_INLINE_BINARY_DATA_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlInlineBinaryData() <em>Xml Inline Binary Data</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlInlineBinaryData()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlInlineBinaryData = XML_INLINE_BINARY_DATA_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlAttachmentRef() <em>Xml Attachment Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlAttachmentRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_ATTACHMENT_REF_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlAttachmentRef() <em>Xml Attachment Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlAttachmentRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlAttachmentRef = XML_ATTACHMENT_REF_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getXmlMimeType() <em>Xml Mime Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlMimeType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String XML_MIME_TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getXmlMimeType() <em>Xml Mime Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlMimeType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String xmlMimeType = XML_MIME_TYPE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isCdata() <em>Cdata</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isCdata()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean CDATA_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isCdata() <em>Cdata</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isCdata()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean cdata = CDATA_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getXmlPath() <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlPath()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String XML_PATH_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getXmlPath() <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlPath()

+	 * @generated

+	 * @ordered

+	 */

+	protected String xmlPath = XML_PATH_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlLocation() <em>Xml Location</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlLocation()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_LOCATION_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlLocation() <em>Xml Location</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlLocation()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlLocation = XML_LOCATION_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlAbstractNullPolicy() <em>Xml Abstract Null Policy</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAbstractNullPolicy()

+	 * @generated

+	 * @ordered

+	 */

+	protected EAbstractXmlNullPolicy xmlAbstractNullPolicy;

+	/**

+	 * The cached value of the '{@link #getXmlElementWrapper() <em>Xml Element Wrapper</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlElementWrapper()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlElementWrapper xmlElementWrapper;

+	/**

+	 * The cached value of the '{@link #getXmlMap() <em>Xml Map</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlMap()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlElementWrapper xmlMap;

+	/**

+	 * The cached value of the '{@link #getXmlSchemaType() <em>Xml Schema Type</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlSchemaType()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlSchemaType xmlSchemaType;

+

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlElement()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_ELEMENT;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Access Methods</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #setXmlAccessMethods(EXmlAccessMethods)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAccessibleJavaAttribute_XmlAccessMethods()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlAccessMethods getXmlAccessMethods()

+	{

+		return xmlAccessMethods;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods, NotificationChain msgs)

+	{

+		EXmlAccessMethods oldXmlAccessMethods = xmlAccessMethods;

+		xmlAccessMethods = newXmlAccessMethods;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_ACCESS_METHODS, oldXmlAccessMethods, newXmlAccessMethods);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlAccessMethods <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 */

+	public void setXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods)

+	{

+		if (newXmlAccessMethods != xmlAccessMethods)

+		{

+			NotificationChain msgs = null;

+			if (xmlAccessMethods != null)

+				msgs = ((InternalEObject)xmlAccessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT__XML_ACCESS_METHODS, null, msgs);

+			if (newXmlAccessMethods != null)

+				msgs = ((InternalEObject)newXmlAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT__XML_ACCESS_METHODS, null, msgs);

+			msgs = basicSetXmlAccessMethods(newXmlAccessMethods, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_ACCESS_METHODS, newXmlAccessMethods, newXmlAccessMethods));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Java Type Adapter</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #setXmlJavaTypeAdapter(EXmlJavaTypeAdapter)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAdaptableJavaAttribute_XmlJavaTypeAdapter()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlJavaTypeAdapter getXmlJavaTypeAdapter()

+	{

+		return xmlJavaTypeAdapter;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlJavaTypeAdapter(EXmlJavaTypeAdapter newXmlJavaTypeAdapter, NotificationChain msgs)

+	{

+		EXmlJavaTypeAdapter oldXmlJavaTypeAdapter = xmlJavaTypeAdapter;

+		xmlJavaTypeAdapter = newXmlJavaTypeAdapter;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_JAVA_TYPE_ADAPTER, oldXmlJavaTypeAdapter, newXmlJavaTypeAdapter);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlJavaTypeAdapter <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 */

+	public void setXmlJavaTypeAdapter(EXmlJavaTypeAdapter newXmlJavaTypeAdapter)

+	{

+		if (newXmlJavaTypeAdapter != xmlJavaTypeAdapter)

+		{

+			NotificationChain msgs = null;

+			if (xmlJavaTypeAdapter != null)

+				msgs = ((InternalEObject)xmlJavaTypeAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT__XML_JAVA_TYPE_ADAPTER, null, msgs);

+			if (newXmlJavaTypeAdapter != null)

+				msgs = ((InternalEObject)newXmlJavaTypeAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT__XML_JAVA_TYPE_ADAPTER, null, msgs);

+			msgs = basicSetXmlJavaTypeAdapter(newXmlJavaTypeAdapter, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_JAVA_TYPE_ADAPTER, newXmlJavaTypeAdapter, newXmlJavaTypeAdapter));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Container Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Container Type</em>' attribute.

+	 * @see #setContainerType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEContainerJavaAttribute_ContainerType()

+	 * @model

+	 * @generated

+	 */

+	public String getContainerType()

+	{

+		return containerType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getContainerType <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Container Type</em>' attribute.

+	 * @see #getContainerType()

+	 * @generated

+	 */

+	public void setContainerType(String newContainerType)

+	{

+		String oldContainerType = containerType;

+		containerType = newContainerType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__CONTAINER_TYPE, oldContainerType, containerType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Properties</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Properties</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder_XmlProperties()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlProperty> getXmlProperties()

+	{

+		if (xmlProperties == null)

+		{

+			xmlProperties = new EObjectContainmentEList<EXmlProperty>(EXmlProperty.class, this, OxmPackage.EXML_ELEMENT__XML_PROPERTIES);

+		}

+		return xmlProperties;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Read Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Read Only</em>' attribute.

+	 * @see #setReadOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_ReadOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isReadOnly()

+	{

+		return readOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isReadOnly <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Read Only</em>' attribute.

+	 * @see #isReadOnly()

+	 * @generated

+	 */

+	public void setReadOnly(boolean newReadOnly)

+	{

+		boolean oldReadOnly = readOnly;

+		readOnly = newReadOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__READ_ONLY, oldReadOnly, readOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Write Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Write Only</em>' attribute.

+	 * @see #setWriteOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_WriteOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isWriteOnly()

+	{

+		return writeOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isWriteOnly <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Write Only</em>' attribute.

+	 * @see #isWriteOnly()

+	 * @generated

+	 */

+	public void setWriteOnly(boolean newWriteOnly)

+	{

+		boolean oldWriteOnly = writeOnly;

+		writeOnly = newWriteOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__WRITE_ONLY, oldWriteOnly, writeOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_Name()

+	 * @model

+	 * @generated

+	 */

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__NAME, oldName, name));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Namespace</em>' attribute.

+	 * @see #setNamespace(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_Namespace()

+	 * @model

+	 * @generated

+	 */

+	public String getNamespace()

+	{

+		return namespace;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getNamespace <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Namespace</em>' attribute.

+	 * @see #getNamespace()

+	 * @generated

+	 */

+	public void setNamespace(String newNamespace)

+	{

+		String oldNamespace = namespace;

+		namespace = newNamespace;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__NAMESPACE, oldNamespace, namespace));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Default Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Default Value</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Default Value</em>' attribute.

+	 * @see #setDefaultValue(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_DefaultValue()

+	 * @model

+	 * @generated

+	 */

+	public String getDefaultValue()

+	{

+		return defaultValue;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getDefaultValue <em>Default Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Default Value</em>' attribute.

+	 * @see #getDefaultValue()

+	 * @generated

+	 */

+	public void setDefaultValue(String newDefaultValue)

+	{

+		String oldDefaultValue = defaultValue;

+		defaultValue = newDefaultValue;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__DEFAULT_VALUE, oldDefaultValue, defaultValue));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Nillable</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Nillable</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Nillable</em>' attribute.

+	 * @see #setNillable(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_Nillable()

+	 * @model

+	 * @generated

+	 */

+	public boolean isNillable()

+	{

+		return nillable;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isNillable <em>Nillable</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Nillable</em>' attribute.

+	 * @see #isNillable()

+	 * @generated

+	 */

+	public void setNillable(boolean newNillable)

+	{

+		boolean oldNillable = nillable;

+		nillable = newNillable;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__NILLABLE, oldNillable, nillable));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Required</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Required</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Required</em>' attribute.

+	 * @see #setRequired(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_Required()

+	 * @model

+	 * @generated

+	 */

+	public boolean isRequired()

+	{

+		return required;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isRequired <em>Required</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Required</em>' attribute.

+	 * @see #isRequired()

+	 * @generated

+	 */

+	public void setRequired(boolean newRequired)

+	{

+		boolean oldRequired = required;

+		required = newRequired;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__REQUIRED, oldRequired, required));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Id</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Id</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Id</em>' attribute.

+	 * @see #setXmlId(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_XmlId()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlId()

+	{

+		return xmlId;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlId <em>Xml Id</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Id</em>' attribute.

+	 * @see #isXmlId()

+	 * @generated

+	 */

+	public void setXmlId(boolean newXmlId)

+	{

+		boolean oldXmlId = xmlId;

+		xmlId = newXmlId;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_ID, oldXmlId, xmlId));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Id Ref</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Id Ref</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Id Ref</em>' attribute.

+	 * @see #setXmlIdRef(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_XmlIdRef()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlIdRef()

+	{

+		return xmlIdRef;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlIdRef <em>Xml Id Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Id Ref</em>' attribute.

+	 * @see #isXmlIdRef()

+	 * @generated

+	 */

+	public void setXmlIdRef(boolean newXmlIdRef)

+	{

+		boolean oldXmlIdRef = xmlIdRef;

+		xmlIdRef = newXmlIdRef;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_ID_REF, oldXmlIdRef, xmlIdRef));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Key</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Key</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Key</em>' attribute.

+	 * @see #setXmlKey(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_XmlKey()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlKey()

+	{

+		return xmlKey;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlKey <em>Xml Key</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Key</em>' attribute.

+	 * @see #isXmlKey()

+	 * @generated

+	 */

+	public void setXmlKey(boolean newXmlKey)

+	{

+		boolean oldXmlKey = xmlKey;

+		xmlKey = newXmlKey;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_KEY, oldXmlKey, xmlKey));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml List</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml List</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml List</em>' attribute.

+	 * @see #setXmlList(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_XmlList()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlList()

+	{

+		return xmlList;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlList <em>Xml List</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml List</em>' attribute.

+	 * @see #isXmlList()

+	 * @generated

+	 */

+	public void setXmlList(boolean newXmlList)

+	{

+		boolean oldXmlList = xmlList;

+		xmlList = newXmlList;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_LIST, oldXmlList, xmlList));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Inline Binary Data</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Inline Binary Data</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Inline Binary Data</em>' attribute.

+	 * @see #setXmlInlineBinaryData(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_XmlInlineBinaryData()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlInlineBinaryData()

+	{

+		return xmlInlineBinaryData;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlInlineBinaryData <em>Xml Inline Binary Data</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Inline Binary Data</em>' attribute.

+	 * @see #isXmlInlineBinaryData()

+	 * @generated

+	 */

+	public void setXmlInlineBinaryData(boolean newXmlInlineBinaryData)

+	{

+		boolean oldXmlInlineBinaryData = xmlInlineBinaryData;

+		xmlInlineBinaryData = newXmlInlineBinaryData;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_INLINE_BINARY_DATA, oldXmlInlineBinaryData, xmlInlineBinaryData));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Attachment Ref</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Attachment Ref</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Attachment Ref</em>' attribute.

+	 * @see #setXmlAttachmentRef(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_XmlAttachmentRef()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlAttachmentRef()

+	{

+		return xmlAttachmentRef;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlAttachmentRef <em>Xml Attachment Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Attachment Ref</em>' attribute.

+	 * @see #isXmlAttachmentRef()

+	 * @generated

+	 */

+	public void setXmlAttachmentRef(boolean newXmlAttachmentRef)

+	{

+		boolean oldXmlAttachmentRef = xmlAttachmentRef;

+		xmlAttachmentRef = newXmlAttachmentRef;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_ATTACHMENT_REF, oldXmlAttachmentRef, xmlAttachmentRef));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Mime Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Mime Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Mime Type</em>' attribute.

+	 * @see #setXmlMimeType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_XmlMimeType()

+	 * @model

+	 * @generated

+	 */

+	public String getXmlMimeType()

+	{

+		return xmlMimeType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlMimeType <em>Xml Mime Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Mime Type</em>' attribute.

+	 * @see #getXmlMimeType()

+	 * @generated

+	 */

+	public void setXmlMimeType(String newXmlMimeType)

+	{

+		String oldXmlMimeType = xmlMimeType;

+		xmlMimeType = newXmlMimeType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_MIME_TYPE, oldXmlMimeType, xmlMimeType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Cdata</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Cdata</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Cdata</em>' attribute.

+	 * @see #setCdata(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_Cdata()

+	 * @model

+	 * @generated

+	 */

+	public boolean isCdata()

+	{

+		return cdata;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isCdata <em>Cdata</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Cdata</em>' attribute.

+	 * @see #isCdata()

+	 * @generated

+	 */

+	public void setCdata(boolean newCdata)

+	{

+		boolean oldCdata = cdata;

+		cdata = newCdata;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__CDATA, oldCdata, cdata));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Path</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Path</em>' attribute.

+	 * @see #setXmlPath(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_XmlPath()

+	 * @model

+	 * @generated

+	 */

+	public String getXmlPath()

+	{

+		return xmlPath;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlPath <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Path</em>' attribute.

+	 * @see #getXmlPath()

+	 * @generated

+	 */

+	public void setXmlPath(String newXmlPath)

+	{

+		String oldXmlPath = xmlPath;

+		xmlPath = newXmlPath;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_PATH, oldXmlPath, xmlPath));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Location</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Location</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Location</em>' attribute.

+	 * @see #setXmlLocation(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_XmlLocation()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlLocation()

+	{

+		return xmlLocation;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlLocation <em>Xml Location</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Location</em>' attribute.

+	 * @see #isXmlLocation()

+	 * @generated

+	 */

+	public void setXmlLocation(boolean newXmlLocation)

+	{

+		boolean oldXmlLocation = xmlLocation;

+		xmlLocation = newXmlLocation;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_LOCATION, oldXmlLocation, xmlLocation));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Abstract Null Policy</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Abstract Null Policy</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Abstract Null Policy</em>' containment reference.

+	 * @see #setXmlAbstractNullPolicy(EAbstractXmlNullPolicy)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_XmlAbstractNullPolicy()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EAbstractXmlNullPolicy getXmlAbstractNullPolicy()

+	{

+		return xmlAbstractNullPolicy;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlAbstractNullPolicy(EAbstractXmlNullPolicy newXmlAbstractNullPolicy, NotificationChain msgs)

+	{

+		EAbstractXmlNullPolicy oldXmlAbstractNullPolicy = xmlAbstractNullPolicy;

+		xmlAbstractNullPolicy = newXmlAbstractNullPolicy;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_ABSTRACT_NULL_POLICY, oldXmlAbstractNullPolicy, newXmlAbstractNullPolicy);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlAbstractNullPolicy <em>Xml Abstract Null Policy</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Abstract Null Policy</em>' containment reference.

+	 * @see #getXmlAbstractNullPolicy()

+	 * @generated

+	 */

+	public void setXmlAbstractNullPolicy(EAbstractXmlNullPolicy newXmlAbstractNullPolicy)

+	{

+		if (newXmlAbstractNullPolicy != xmlAbstractNullPolicy)

+		{

+			NotificationChain msgs = null;

+			if (xmlAbstractNullPolicy != null)

+				msgs = ((InternalEObject)xmlAbstractNullPolicy).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT__XML_ABSTRACT_NULL_POLICY, null, msgs);

+			if (newXmlAbstractNullPolicy != null)

+				msgs = ((InternalEObject)newXmlAbstractNullPolicy).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT__XML_ABSTRACT_NULL_POLICY, null, msgs);

+			msgs = basicSetXmlAbstractNullPolicy(newXmlAbstractNullPolicy, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_ABSTRACT_NULL_POLICY, newXmlAbstractNullPolicy, newXmlAbstractNullPolicy));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Element Wrapper</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Element Wrapper</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Element Wrapper</em>' containment reference.

+	 * @see #setXmlElementWrapper(EXmlElementWrapper)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_XmlElementWrapper()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlElementWrapper getXmlElementWrapper()

+	{

+		return xmlElementWrapper;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlElementWrapper(EXmlElementWrapper newXmlElementWrapper, NotificationChain msgs)

+	{

+		EXmlElementWrapper oldXmlElementWrapper = xmlElementWrapper;

+		xmlElementWrapper = newXmlElementWrapper;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_ELEMENT_WRAPPER, oldXmlElementWrapper, newXmlElementWrapper);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlElementWrapper <em>Xml Element Wrapper</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Element Wrapper</em>' containment reference.

+	 * @see #getXmlElementWrapper()

+	 * @generated

+	 */

+	public void setXmlElementWrapper(EXmlElementWrapper newXmlElementWrapper)

+	{

+		if (newXmlElementWrapper != xmlElementWrapper)

+		{

+			NotificationChain msgs = null;

+			if (xmlElementWrapper != null)

+				msgs = ((InternalEObject)xmlElementWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT__XML_ELEMENT_WRAPPER, null, msgs);

+			if (newXmlElementWrapper != null)

+				msgs = ((InternalEObject)newXmlElementWrapper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT__XML_ELEMENT_WRAPPER, null, msgs);

+			msgs = basicSetXmlElementWrapper(newXmlElementWrapper, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_ELEMENT_WRAPPER, newXmlElementWrapper, newXmlElementWrapper));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Map</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Map</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Map</em>' containment reference.

+	 * @see #setXmlMap(EXmlElementWrapper)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_XmlMap()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlElementWrapper getXmlMap()

+	{

+		return xmlMap;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlMap(EXmlElementWrapper newXmlMap, NotificationChain msgs)

+	{

+		EXmlElementWrapper oldXmlMap = xmlMap;

+		xmlMap = newXmlMap;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_MAP, oldXmlMap, newXmlMap);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlMap <em>Xml Map</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Map</em>' containment reference.

+	 * @see #getXmlMap()

+	 * @generated

+	 */

+	public void setXmlMap(EXmlElementWrapper newXmlMap)

+	{

+		if (newXmlMap != xmlMap)

+		{

+			NotificationChain msgs = null;

+			if (xmlMap != null)

+				msgs = ((InternalEObject)xmlMap).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT__XML_MAP, null, msgs);

+			if (newXmlMap != null)

+				msgs = ((InternalEObject)newXmlMap).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT__XML_MAP, null, msgs);

+			msgs = basicSetXmlMap(newXmlMap, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_MAP, newXmlMap, newXmlMap));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Schema Type</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Schema Type</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Schema Type</em>' containment reference.

+	 * @see #setXmlSchemaType(EXmlSchemaType)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement_XmlSchemaType()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlSchemaType getXmlSchemaType()

+	{

+		return xmlSchemaType;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlSchemaType(EXmlSchemaType newXmlSchemaType, NotificationChain msgs)

+	{

+		EXmlSchemaType oldXmlSchemaType = xmlSchemaType;

+		xmlSchemaType = newXmlSchemaType;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_SCHEMA_TYPE, oldXmlSchemaType, newXmlSchemaType);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlSchemaType <em>Xml Schema Type</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Schema Type</em>' containment reference.

+	 * @see #getXmlSchemaType()

+	 * @generated

+	 */

+	public void setXmlSchemaType(EXmlSchemaType newXmlSchemaType)

+	{

+		if (newXmlSchemaType != xmlSchemaType)

+		{

+			NotificationChain msgs = null;

+			if (xmlSchemaType != null)

+				msgs = ((InternalEObject)xmlSchemaType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT__XML_SCHEMA_TYPE, null, msgs);

+			if (newXmlSchemaType != null)

+				msgs = ((InternalEObject)newXmlSchemaType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT__XML_SCHEMA_TYPE, null, msgs);

+			msgs = basicSetXmlSchemaType(newXmlSchemaType, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT__XML_SCHEMA_TYPE, newXmlSchemaType, newXmlSchemaType));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT__XML_ACCESS_METHODS:

+				return basicSetXmlAccessMethods(null, msgs);

+			case OxmPackage.EXML_ELEMENT__XML_JAVA_TYPE_ADAPTER:

+				return basicSetXmlJavaTypeAdapter(null, msgs);

+			case OxmPackage.EXML_ELEMENT__XML_PROPERTIES:

+				return ((InternalEList<?>)getXmlProperties()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EXML_ELEMENT__XML_ABSTRACT_NULL_POLICY:

+				return basicSetXmlAbstractNullPolicy(null, msgs);

+			case OxmPackage.EXML_ELEMENT__XML_ELEMENT_WRAPPER:

+				return basicSetXmlElementWrapper(null, msgs);

+			case OxmPackage.EXML_ELEMENT__XML_MAP:

+				return basicSetXmlMap(null, msgs);

+			case OxmPackage.EXML_ELEMENT__XML_SCHEMA_TYPE:

+				return basicSetXmlSchemaType(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT__XML_ACCESS_METHODS:

+				return getXmlAccessMethods();

+			case OxmPackage.EXML_ELEMENT__XML_JAVA_TYPE_ADAPTER:

+				return getXmlJavaTypeAdapter();

+			case OxmPackage.EXML_ELEMENT__CONTAINER_TYPE:

+				return getContainerType();

+			case OxmPackage.EXML_ELEMENT__XML_PROPERTIES:

+				return getXmlProperties();

+			case OxmPackage.EXML_ELEMENT__READ_ONLY:

+				return isReadOnly();

+			case OxmPackage.EXML_ELEMENT__WRITE_ONLY:

+				return isWriteOnly();

+			case OxmPackage.EXML_ELEMENT__NAME:

+				return getName();

+			case OxmPackage.EXML_ELEMENT__NAMESPACE:

+				return getNamespace();

+			case OxmPackage.EXML_ELEMENT__DEFAULT_VALUE:

+				return getDefaultValue();

+			case OxmPackage.EXML_ELEMENT__NILLABLE:

+				return isNillable();

+			case OxmPackage.EXML_ELEMENT__REQUIRED:

+				return isRequired();

+			case OxmPackage.EXML_ELEMENT__XML_ID:

+				return isXmlId();

+			case OxmPackage.EXML_ELEMENT__XML_ID_REF:

+				return isXmlIdRef();

+			case OxmPackage.EXML_ELEMENT__XML_KEY:

+				return isXmlKey();

+			case OxmPackage.EXML_ELEMENT__XML_LIST:

+				return isXmlList();

+			case OxmPackage.EXML_ELEMENT__XML_INLINE_BINARY_DATA:

+				return isXmlInlineBinaryData();

+			case OxmPackage.EXML_ELEMENT__XML_ATTACHMENT_REF:

+				return isXmlAttachmentRef();

+			case OxmPackage.EXML_ELEMENT__XML_MIME_TYPE:

+				return getXmlMimeType();

+			case OxmPackage.EXML_ELEMENT__CDATA:

+				return isCdata();

+			case OxmPackage.EXML_ELEMENT__XML_PATH:

+				return getXmlPath();

+			case OxmPackage.EXML_ELEMENT__XML_LOCATION:

+				return isXmlLocation();

+			case OxmPackage.EXML_ELEMENT__XML_ABSTRACT_NULL_POLICY:

+				return getXmlAbstractNullPolicy();

+			case OxmPackage.EXML_ELEMENT__XML_ELEMENT_WRAPPER:

+				return getXmlElementWrapper();

+			case OxmPackage.EXML_ELEMENT__XML_MAP:

+				return getXmlMap();

+			case OxmPackage.EXML_ELEMENT__XML_SCHEMA_TYPE:

+				return getXmlSchemaType();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_JAVA_TYPE_ADAPTER:

+				setXmlJavaTypeAdapter((EXmlJavaTypeAdapter)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__CONTAINER_TYPE:

+				setContainerType((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_PROPERTIES:

+				getXmlProperties().clear();

+				getXmlProperties().addAll((Collection<? extends EXmlProperty>)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__READ_ONLY:

+				setReadOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__WRITE_ONLY:

+				setWriteOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__NAME:

+				setName((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__NAMESPACE:

+				setNamespace((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__DEFAULT_VALUE:

+				setDefaultValue((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__NILLABLE:

+				setNillable((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__REQUIRED:

+				setRequired((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_ID:

+				setXmlId((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_ID_REF:

+				setXmlIdRef((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_KEY:

+				setXmlKey((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_LIST:

+				setXmlList((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_INLINE_BINARY_DATA:

+				setXmlInlineBinaryData((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_ATTACHMENT_REF:

+				setXmlAttachmentRef((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_MIME_TYPE:

+				setXmlMimeType((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__CDATA:

+				setCdata((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_PATH:

+				setXmlPath((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_LOCATION:

+				setXmlLocation((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_ABSTRACT_NULL_POLICY:

+				setXmlAbstractNullPolicy((EAbstractXmlNullPolicy)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_ELEMENT_WRAPPER:

+				setXmlElementWrapper((EXmlElementWrapper)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_MAP:

+				setXmlMap((EXmlElementWrapper)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_SCHEMA_TYPE:

+				setXmlSchemaType((EXmlSchemaType)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)null);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_JAVA_TYPE_ADAPTER:

+				setXmlJavaTypeAdapter((EXmlJavaTypeAdapter)null);

+				return;

+			case OxmPackage.EXML_ELEMENT__CONTAINER_TYPE:

+				setContainerType(CONTAINER_TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_PROPERTIES:

+				getXmlProperties().clear();

+				return;

+			case OxmPackage.EXML_ELEMENT__READ_ONLY:

+				setReadOnly(READ_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__WRITE_ONLY:

+				setWriteOnly(WRITE_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__NAME:

+				setName(NAME_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__NAMESPACE:

+				setNamespace(NAMESPACE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__DEFAULT_VALUE:

+				setDefaultValue(DEFAULT_VALUE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__NILLABLE:

+				setNillable(NILLABLE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__REQUIRED:

+				setRequired(REQUIRED_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_ID:

+				setXmlId(XML_ID_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_ID_REF:

+				setXmlIdRef(XML_ID_REF_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_KEY:

+				setXmlKey(XML_KEY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_LIST:

+				setXmlList(XML_LIST_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_INLINE_BINARY_DATA:

+				setXmlInlineBinaryData(XML_INLINE_BINARY_DATA_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_ATTACHMENT_REF:

+				setXmlAttachmentRef(XML_ATTACHMENT_REF_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_MIME_TYPE:

+				setXmlMimeType(XML_MIME_TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__CDATA:

+				setCdata(CDATA_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_PATH:

+				setXmlPath(XML_PATH_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_LOCATION:

+				setXmlLocation(XML_LOCATION_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_ABSTRACT_NULL_POLICY:

+				setXmlAbstractNullPolicy((EAbstractXmlNullPolicy)null);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_ELEMENT_WRAPPER:

+				setXmlElementWrapper((EXmlElementWrapper)null);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_MAP:

+				setXmlMap((EXmlElementWrapper)null);

+				return;

+			case OxmPackage.EXML_ELEMENT__XML_SCHEMA_TYPE:

+				setXmlSchemaType((EXmlSchemaType)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT__XML_ACCESS_METHODS:

+				return xmlAccessMethods != null;

+			case OxmPackage.EXML_ELEMENT__XML_JAVA_TYPE_ADAPTER:

+				return xmlJavaTypeAdapter != null;

+			case OxmPackage.EXML_ELEMENT__CONTAINER_TYPE:

+				return CONTAINER_TYPE_EDEFAULT == null ? containerType != null : !CONTAINER_TYPE_EDEFAULT.equals(containerType);

+			case OxmPackage.EXML_ELEMENT__XML_PROPERTIES:

+				return xmlProperties != null && !xmlProperties.isEmpty();

+			case OxmPackage.EXML_ELEMENT__READ_ONLY:

+				return readOnly != READ_ONLY_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT__WRITE_ONLY:

+				return writeOnly != WRITE_ONLY_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+			case OxmPackage.EXML_ELEMENT__NAMESPACE:

+				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);

+			case OxmPackage.EXML_ELEMENT__DEFAULT_VALUE:

+				return DEFAULT_VALUE_EDEFAULT == null ? defaultValue != null : !DEFAULT_VALUE_EDEFAULT.equals(defaultValue);

+			case OxmPackage.EXML_ELEMENT__NILLABLE:

+				return nillable != NILLABLE_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT__REQUIRED:

+				return required != REQUIRED_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT__XML_ID:

+				return xmlId != XML_ID_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT__XML_ID_REF:

+				return xmlIdRef != XML_ID_REF_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT__XML_KEY:

+				return xmlKey != XML_KEY_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT__XML_LIST:

+				return xmlList != XML_LIST_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT__XML_INLINE_BINARY_DATA:

+				return xmlInlineBinaryData != XML_INLINE_BINARY_DATA_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT__XML_ATTACHMENT_REF:

+				return xmlAttachmentRef != XML_ATTACHMENT_REF_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT__XML_MIME_TYPE:

+				return XML_MIME_TYPE_EDEFAULT == null ? xmlMimeType != null : !XML_MIME_TYPE_EDEFAULT.equals(xmlMimeType);

+			case OxmPackage.EXML_ELEMENT__CDATA:

+				return cdata != CDATA_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT__XML_PATH:

+				return XML_PATH_EDEFAULT == null ? xmlPath != null : !XML_PATH_EDEFAULT.equals(xmlPath);

+			case OxmPackage.EXML_ELEMENT__XML_LOCATION:

+				return xmlLocation != XML_LOCATION_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT__XML_ABSTRACT_NULL_POLICY:

+				return xmlAbstractNullPolicy != null;

+			case OxmPackage.EXML_ELEMENT__XML_ELEMENT_WRAPPER:

+				return xmlElementWrapper != null;

+			case OxmPackage.EXML_ELEMENT__XML_MAP:

+				return xmlMap != null;

+			case OxmPackage.EXML_ELEMENT__XML_SCHEMA_TYPE:

+				return xmlSchemaType != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)

+	{

+		if (baseClass == EAccessibleJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT__XML_ACCESS_METHODS: return OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EAdaptableJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT__XML_JAVA_TYPE_ADAPTER: return OxmPackage.EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT__CONTAINER_TYPE: return OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT__XML_PROPERTIES: return OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT__READ_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY;

+				case OxmPackage.EXML_ELEMENT__WRITE_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY;

+				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 == EAccessibleJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS: return OxmPackage.EXML_ELEMENT__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EAdaptableJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER: return OxmPackage.EXML_ELEMENT__XML_JAVA_TYPE_ADAPTER;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE: return OxmPackage.EXML_ELEMENT__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES: return OxmPackage.EXML_ELEMENT__XML_PROPERTIES;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY: return OxmPackage.EXML_ELEMENT__READ_ONLY;

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY: return OxmPackage.EXML_ELEMENT__WRITE_ONLY;

+				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(" (containerType: ");

+		result.append(containerType);

+		result.append(", readOnly: ");

+		result.append(readOnly);

+		result.append(", writeOnly: ");

+		result.append(writeOnly);

+		result.append(", name: ");

+		result.append(name);

+		result.append(", namespace: ");

+		result.append(namespace);

+		result.append(", defaultValue: ");

+		result.append(defaultValue);

+		result.append(", nillable: ");

+		result.append(nillable);

+		result.append(", required: ");

+		result.append(required);

+		result.append(", xmlId: ");

+		result.append(xmlId);

+		result.append(", xmlIdRef: ");

+		result.append(xmlIdRef);

+		result.append(", xmlKey: ");

+		result.append(xmlKey);

+		result.append(", xmlList: ");

+		result.append(xmlList);

+		result.append(", xmlInlineBinaryData: ");

+		result.append(xmlInlineBinaryData);

+		result.append(", xmlAttachmentRef: ");

+		result.append(xmlAttachmentRef);

+		result.append(", xmlMimeType: ");

+		result.append(xmlMimeType);

+		result.append(", cdata: ");

+		result.append(cdata);

+		result.append(", xmlPath: ");

+		result.append(xmlPath);

+		result.append(", xmlLocation: ");

+		result.append(xmlLocation);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlElementTranslator

+			extends AbstractJavaAttributeTranslator {

+		

+		XmlElementTranslator(String domPathAndName, EStructuralFeature eStructuralFeature) {

+			super(domPathAndName, eStructuralFeature, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlElement();

+		}

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementDecl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementDecl.java
new file mode 100644
index 0000000000..b92d912570
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementDecl.java
@@ -0,0 +1,651 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Element Decl</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getJavaMethod <em>Java Method</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getNamespace <em>Namespace</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getDefaultValue <em>Default Value</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getScope <em>Scope</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getSubstitutionHeadName <em>Substitution Head Name</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getSubstitutionHeadNamespace <em>Substitution Head Namespace</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getType <em>Type</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementDecl()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlElementDecl extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getJavaMethod() <em>Java Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getJavaMethod()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String JAVA_METHOD_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getJavaMethod() <em>Java Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getJavaMethod()

+	 * @generated

+	 * @ordered

+	 */

+	protected String javaMethod = JAVA_METHOD_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAMESPACE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected String namespace = NAMESPACE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getDefaultValue() <em>Default Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getDefaultValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String DEFAULT_VALUE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getDefaultValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected String defaultValue = DEFAULT_VALUE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getScope() <em>Scope</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getScope()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String SCOPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getScope() <em>Scope</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getScope()

+	 * @generated

+	 * @ordered

+	 */

+	protected String scope = SCOPE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getSubstitutionHeadName() <em>Substitution Head Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getSubstitutionHeadName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String SUBSTITUTION_HEAD_NAME_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getSubstitutionHeadName() <em>Substitution Head Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getSubstitutionHeadName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String substitutionHeadName = SUBSTITUTION_HEAD_NAME_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getSubstitutionHeadNamespace() <em>Substitution Head Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getSubstitutionHeadNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String SUBSTITUTION_HEAD_NAMESPACE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getSubstitutionHeadNamespace() <em>Substitution Head Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getSubstitutionHeadNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected String substitutionHeadNamespace = SUBSTITUTION_HEAD_NAMESPACE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String type = TYPE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlElementDecl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_ELEMENT_DECL;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Java Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Java Method</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Java Method</em>' attribute.

+	 * @see #setJavaMethod(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementDecl_JavaMethod()

+	 * @model

+	 * @generated

+	 */

+	public String getJavaMethod()

+	{

+		return javaMethod;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getJavaMethod <em>Java Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Java Method</em>' attribute.

+	 * @see #getJavaMethod()

+	 * @generated

+	 */

+	public void setJavaMethod(String newJavaMethod)

+	{

+		String oldJavaMethod = javaMethod;

+		javaMethod = newJavaMethod;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_DECL__JAVA_METHOD, oldJavaMethod, javaMethod));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementDecl_Name()

+	 * @model

+	 * @generated

+	 */

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_DECL__NAME, oldName, name));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Namespace</em>' attribute.

+	 * @see #setNamespace(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementDecl_Namespace()

+	 * @model

+	 * @generated

+	 */

+	public String getNamespace()

+	{

+		return namespace;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getNamespace <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Namespace</em>' attribute.

+	 * @see #getNamespace()

+	 * @generated

+	 */

+	public void setNamespace(String newNamespace)

+	{

+		String oldNamespace = namespace;

+		namespace = newNamespace;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_DECL__NAMESPACE, oldNamespace, namespace));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Default Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Default Value</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Default Value</em>' attribute.

+	 * @see #setDefaultValue(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementDecl_DefaultValue()

+	 * @model

+	 * @generated

+	 */

+	public String getDefaultValue()

+	{

+		return defaultValue;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getDefaultValue <em>Default Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Default Value</em>' attribute.

+	 * @see #getDefaultValue()

+	 * @generated

+	 */

+	public void setDefaultValue(String newDefaultValue)

+	{

+		String oldDefaultValue = defaultValue;

+		defaultValue = newDefaultValue;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_DECL__DEFAULT_VALUE, oldDefaultValue, defaultValue));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Scope</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Scope</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Scope</em>' attribute.

+	 * @see #setScope(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementDecl_Scope()

+	 * @model

+	 * @generated

+	 */

+	public String getScope()

+	{

+		return scope;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getScope <em>Scope</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Scope</em>' attribute.

+	 * @see #getScope()

+	 * @generated

+	 */

+	public void setScope(String newScope)

+	{

+		String oldScope = scope;

+		scope = newScope;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_DECL__SCOPE, oldScope, scope));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Substitution Head Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Substitution Head 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>Substitution Head Name</em>' attribute.

+	 * @see #setSubstitutionHeadName(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementDecl_SubstitutionHeadName()

+	 * @model

+	 * @generated

+	 */

+	public String getSubstitutionHeadName()

+	{

+		return substitutionHeadName;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getSubstitutionHeadName <em>Substitution Head Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Substitution Head Name</em>' attribute.

+	 * @see #getSubstitutionHeadName()

+	 * @generated

+	 */

+	public void setSubstitutionHeadName(String newSubstitutionHeadName)

+	{

+		String oldSubstitutionHeadName = substitutionHeadName;

+		substitutionHeadName = newSubstitutionHeadName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAME, oldSubstitutionHeadName, substitutionHeadName));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Substitution Head Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Substitution Head Namespace</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Substitution Head Namespace</em>' attribute.

+	 * @see #setSubstitutionHeadNamespace(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementDecl_SubstitutionHeadNamespace()

+	 * @model

+	 * @generated

+	 */

+	public String getSubstitutionHeadNamespace()

+	{

+		return substitutionHeadNamespace;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getSubstitutionHeadNamespace <em>Substitution Head Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Substitution Head Namespace</em>' attribute.

+	 * @see #getSubstitutionHeadNamespace()

+	 * @generated

+	 */

+	public void setSubstitutionHeadNamespace(String newSubstitutionHeadNamespace)

+	{

+		String oldSubstitutionHeadNamespace = substitutionHeadNamespace;

+		substitutionHeadNamespace = newSubstitutionHeadNamespace;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAMESPACE, oldSubstitutionHeadNamespace, substitutionHeadNamespace));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Type</em>' attribute.

+	 * @see #setType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementDecl_Type()

+	 * @model

+	 * @generated

+	 */

+	public String getType()

+	{

+		return type;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getType <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Type</em>' attribute.

+	 * @see #getType()

+	 * @generated

+	 */

+	public void setType(String newType)

+	{

+		String oldType = type;

+		type = newType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_DECL__TYPE, oldType, type));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_DECL__JAVA_METHOD:

+				return getJavaMethod();

+			case OxmPackage.EXML_ELEMENT_DECL__NAME:

+				return getName();

+			case OxmPackage.EXML_ELEMENT_DECL__NAMESPACE:

+				return getNamespace();

+			case OxmPackage.EXML_ELEMENT_DECL__DEFAULT_VALUE:

+				return getDefaultValue();

+			case OxmPackage.EXML_ELEMENT_DECL__SCOPE:

+				return getScope();

+			case OxmPackage.EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAME:

+				return getSubstitutionHeadName();

+			case OxmPackage.EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAMESPACE:

+				return getSubstitutionHeadNamespace();

+			case OxmPackage.EXML_ELEMENT_DECL__TYPE:

+				return getType();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_DECL__JAVA_METHOD:

+				setJavaMethod((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_DECL__NAME:

+				setName((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_DECL__NAMESPACE:

+				setNamespace((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_DECL__DEFAULT_VALUE:

+				setDefaultValue((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_DECL__SCOPE:

+				setScope((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAME:

+				setSubstitutionHeadName((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAMESPACE:

+				setSubstitutionHeadNamespace((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_DECL__TYPE:

+				setType((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_DECL__JAVA_METHOD:

+				setJavaMethod(JAVA_METHOD_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_DECL__NAME:

+				setName(NAME_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_DECL__NAMESPACE:

+				setNamespace(NAMESPACE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_DECL__DEFAULT_VALUE:

+				setDefaultValue(DEFAULT_VALUE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_DECL__SCOPE:

+				setScope(SCOPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAME:

+				setSubstitutionHeadName(SUBSTITUTION_HEAD_NAME_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAMESPACE:

+				setSubstitutionHeadNamespace(SUBSTITUTION_HEAD_NAMESPACE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_DECL__TYPE:

+				setType(TYPE_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_DECL__JAVA_METHOD:

+				return JAVA_METHOD_EDEFAULT == null ? javaMethod != null : !JAVA_METHOD_EDEFAULT.equals(javaMethod);

+			case OxmPackage.EXML_ELEMENT_DECL__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+			case OxmPackage.EXML_ELEMENT_DECL__NAMESPACE:

+				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);

+			case OxmPackage.EXML_ELEMENT_DECL__DEFAULT_VALUE:

+				return DEFAULT_VALUE_EDEFAULT == null ? defaultValue != null : !DEFAULT_VALUE_EDEFAULT.equals(defaultValue);

+			case OxmPackage.EXML_ELEMENT_DECL__SCOPE:

+				return SCOPE_EDEFAULT == null ? scope != null : !SCOPE_EDEFAULT.equals(scope);

+			case OxmPackage.EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAME:

+				return SUBSTITUTION_HEAD_NAME_EDEFAULT == null ? substitutionHeadName != null : !SUBSTITUTION_HEAD_NAME_EDEFAULT.equals(substitutionHeadName);

+			case OxmPackage.EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAMESPACE:

+				return SUBSTITUTION_HEAD_NAMESPACE_EDEFAULT == null ? substitutionHeadNamespace != null : !SUBSTITUTION_HEAD_NAMESPACE_EDEFAULT.equals(substitutionHeadNamespace);

+			case OxmPackage.EXML_ELEMENT_DECL__TYPE:

+				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

+		}

+		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(" (javaMethod: ");

+		result.append(javaMethod);

+		result.append(", name: ");

+		result.append(name);

+		result.append(", namespace: ");

+		result.append(namespace);

+		result.append(", defaultValue: ");

+		result.append(defaultValue);

+		result.append(", scope: ");

+		result.append(scope);

+		result.append(", substitutionHeadName: ");

+		result.append(substitutionHeadName);

+		result.append(", substitutionHeadNamespace: ");

+		result.append(substitutionHeadNamespace);

+		result.append(", type: ");

+		result.append(type);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlElementDecl

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRef.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRef.java
new file mode 100644
index 0000000000..87425ab555
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRef.java
@@ -0,0 +1,1039 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Element Ref</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getNamespace <em>Namespace</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#isXmlMixed <em>Xml Mixed</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getXmlElementWrapper <em>Xml Element Wrapper</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementRef()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlElementRef extends EJavaAttribute implements EAccessibleJavaAttribute, EAdaptableJavaAttribute, EContainerJavaAttribute, EReadWriteJavaAttribute, ETypedJavaAttribute, EPropertyHolder

+{

+	/**

+	 * The cached value of the '{@link #getXmlAccessMethods() <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessMethods xmlAccessMethods;

+	/**

+	 * The cached value of the '{@link #getXmlJavaTypeAdapter() <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlJavaTypeAdapter xmlJavaTypeAdapter;

+	/**

+	 * The default value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String CONTAINER_TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String containerType = CONTAINER_TYPE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean READ_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean readOnly = READ_ONLY_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean WRITE_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean writeOnly = WRITE_ONLY_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String type = TYPE_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlProperties() <em>Xml Properties</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlProperties()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlProperty> xmlProperties;

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAMESPACE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected String namespace = NAMESPACE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlMixed() <em>Xml Mixed</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlMixed()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_MIXED_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlMixed() <em>Xml Mixed</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlMixed()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlMixed = XML_MIXED_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlElementWrapper() <em>Xml Element Wrapper</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlElementWrapper()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlElementWrapper xmlElementWrapper;

+

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlElementRef()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_ELEMENT_REF;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Access Methods</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #setXmlAccessMethods(EXmlAccessMethods)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAccessibleJavaAttribute_XmlAccessMethods()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlAccessMethods getXmlAccessMethods()

+	{

+		return xmlAccessMethods;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods, NotificationChain msgs)

+	{

+		EXmlAccessMethods oldXmlAccessMethods = xmlAccessMethods;

+		xmlAccessMethods = newXmlAccessMethods;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REF__XML_ACCESS_METHODS, oldXmlAccessMethods, newXmlAccessMethods);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getXmlAccessMethods <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 */

+	public void setXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods)

+	{

+		if (newXmlAccessMethods != xmlAccessMethods)

+		{

+			NotificationChain msgs = null;

+			if (xmlAccessMethods != null)

+				msgs = ((InternalEObject)xmlAccessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT_REF__XML_ACCESS_METHODS, null, msgs);

+			if (newXmlAccessMethods != null)

+				msgs = ((InternalEObject)newXmlAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT_REF__XML_ACCESS_METHODS, null, msgs);

+			msgs = basicSetXmlAccessMethods(newXmlAccessMethods, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REF__XML_ACCESS_METHODS, newXmlAccessMethods, newXmlAccessMethods));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Java Type Adapter</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #setXmlJavaTypeAdapter(EXmlJavaTypeAdapter)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAdaptableJavaAttribute_XmlJavaTypeAdapter()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlJavaTypeAdapter getXmlJavaTypeAdapter()

+	{

+		return xmlJavaTypeAdapter;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlJavaTypeAdapter(EXmlJavaTypeAdapter newXmlJavaTypeAdapter, NotificationChain msgs)

+	{

+		EXmlJavaTypeAdapter oldXmlJavaTypeAdapter = xmlJavaTypeAdapter;

+		xmlJavaTypeAdapter = newXmlJavaTypeAdapter;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REF__XML_JAVA_TYPE_ADAPTER, oldXmlJavaTypeAdapter, newXmlJavaTypeAdapter);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getXmlJavaTypeAdapter <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 */

+	public void setXmlJavaTypeAdapter(EXmlJavaTypeAdapter newXmlJavaTypeAdapter)

+	{

+		if (newXmlJavaTypeAdapter != xmlJavaTypeAdapter)

+		{

+			NotificationChain msgs = null;

+			if (xmlJavaTypeAdapter != null)

+				msgs = ((InternalEObject)xmlJavaTypeAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT_REF__XML_JAVA_TYPE_ADAPTER, null, msgs);

+			if (newXmlJavaTypeAdapter != null)

+				msgs = ((InternalEObject)newXmlJavaTypeAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT_REF__XML_JAVA_TYPE_ADAPTER, null, msgs);

+			msgs = basicSetXmlJavaTypeAdapter(newXmlJavaTypeAdapter, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REF__XML_JAVA_TYPE_ADAPTER, newXmlJavaTypeAdapter, newXmlJavaTypeAdapter));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Container Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Container Type</em>' attribute.

+	 * @see #setContainerType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEContainerJavaAttribute_ContainerType()

+	 * @model

+	 * @generated

+	 */

+	public String getContainerType()

+	{

+		return containerType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getContainerType <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Container Type</em>' attribute.

+	 * @see #getContainerType()

+	 * @generated

+	 */

+	public void setContainerType(String newContainerType)

+	{

+		String oldContainerType = containerType;

+		containerType = newContainerType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REF__CONTAINER_TYPE, oldContainerType, containerType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Read Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Read Only</em>' attribute.

+	 * @see #setReadOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_ReadOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isReadOnly()

+	{

+		return readOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#isReadOnly <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Read Only</em>' attribute.

+	 * @see #isReadOnly()

+	 * @generated

+	 */

+	public void setReadOnly(boolean newReadOnly)

+	{

+		boolean oldReadOnly = readOnly;

+		readOnly = newReadOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REF__READ_ONLY, oldReadOnly, readOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Write Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Write Only</em>' attribute.

+	 * @see #setWriteOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_WriteOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isWriteOnly()

+	{

+		return writeOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#isWriteOnly <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Write Only</em>' attribute.

+	 * @see #isWriteOnly()

+	 * @generated

+	 */

+	public void setWriteOnly(boolean newWriteOnly)

+	{

+		boolean oldWriteOnly = writeOnly;

+		writeOnly = newWriteOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REF__WRITE_ONLY, oldWriteOnly, writeOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Type</em>' attribute.

+	 * @see #setType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getETypedJavaAttribute_Type()

+	 * @model

+	 * @generated

+	 */

+	public String getType()

+	{

+		return type;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getType <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Type</em>' attribute.

+	 * @see #getType()

+	 * @generated

+	 */

+	public void setType(String newType)

+	{

+		String oldType = type;

+		type = newType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REF__TYPE, oldType, type));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Properties</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Properties</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder_XmlProperties()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlProperty> getXmlProperties()

+	{

+		if (xmlProperties == null)

+		{

+			xmlProperties = new EObjectContainmentEList<EXmlProperty>(EXmlProperty.class, this, OxmPackage.EXML_ELEMENT_REF__XML_PROPERTIES);

+		}

+		return xmlProperties;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementRef_Name()

+	 * @model

+	 * @generated

+	 */

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REF__NAME, oldName, name));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Namespace</em>' attribute.

+	 * @see #setNamespace(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementRef_Namespace()

+	 * @model

+	 * @generated

+	 */

+	public String getNamespace()

+	{

+		return namespace;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getNamespace <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Namespace</em>' attribute.

+	 * @see #getNamespace()

+	 * @generated

+	 */

+	public void setNamespace(String newNamespace)

+	{

+		String oldNamespace = namespace;

+		namespace = newNamespace;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REF__NAMESPACE, oldNamespace, namespace));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Mixed</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Mixed</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Mixed</em>' attribute.

+	 * @see #setXmlMixed(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementRef_XmlMixed()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlMixed()

+	{

+		return xmlMixed;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#isXmlMixed <em>Xml Mixed</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Mixed</em>' attribute.

+	 * @see #isXmlMixed()

+	 * @generated

+	 */

+	public void setXmlMixed(boolean newXmlMixed)

+	{

+		boolean oldXmlMixed = xmlMixed;

+		xmlMixed = newXmlMixed;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REF__XML_MIXED, oldXmlMixed, xmlMixed));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Element Wrapper</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Element Wrapper</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Element Wrapper</em>' containment reference.

+	 * @see #setXmlElementWrapper(EXmlElementWrapper)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementRef_XmlElementWrapper()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlElementWrapper getXmlElementWrapper()

+	{

+		return xmlElementWrapper;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlElementWrapper(EXmlElementWrapper newXmlElementWrapper, NotificationChain msgs)

+	{

+		EXmlElementWrapper oldXmlElementWrapper = xmlElementWrapper;

+		xmlElementWrapper = newXmlElementWrapper;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REF__XML_ELEMENT_WRAPPER, oldXmlElementWrapper, newXmlElementWrapper);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getXmlElementWrapper <em>Xml Element Wrapper</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Element Wrapper</em>' containment reference.

+	 * @see #getXmlElementWrapper()

+	 * @generated

+	 */

+	public void setXmlElementWrapper(EXmlElementWrapper newXmlElementWrapper)

+	{

+		if (newXmlElementWrapper != xmlElementWrapper)

+		{

+			NotificationChain msgs = null;

+			if (xmlElementWrapper != null)

+				msgs = ((InternalEObject)xmlElementWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT_REF__XML_ELEMENT_WRAPPER, null, msgs);

+			if (newXmlElementWrapper != null)

+				msgs = ((InternalEObject)newXmlElementWrapper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT_REF__XML_ELEMENT_WRAPPER, null, msgs);

+			msgs = basicSetXmlElementWrapper(newXmlElementWrapper, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REF__XML_ELEMENT_WRAPPER, newXmlElementWrapper, newXmlElementWrapper));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_REF__XML_ACCESS_METHODS:

+				return basicSetXmlAccessMethods(null, msgs);

+			case OxmPackage.EXML_ELEMENT_REF__XML_JAVA_TYPE_ADAPTER:

+				return basicSetXmlJavaTypeAdapter(null, msgs);

+			case OxmPackage.EXML_ELEMENT_REF__XML_PROPERTIES:

+				return ((InternalEList<?>)getXmlProperties()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EXML_ELEMENT_REF__XML_ELEMENT_WRAPPER:

+				return basicSetXmlElementWrapper(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_REF__XML_ACCESS_METHODS:

+				return getXmlAccessMethods();

+			case OxmPackage.EXML_ELEMENT_REF__XML_JAVA_TYPE_ADAPTER:

+				return getXmlJavaTypeAdapter();

+			case OxmPackage.EXML_ELEMENT_REF__CONTAINER_TYPE:

+				return getContainerType();

+			case OxmPackage.EXML_ELEMENT_REF__READ_ONLY:

+				return isReadOnly();

+			case OxmPackage.EXML_ELEMENT_REF__WRITE_ONLY:

+				return isWriteOnly();

+			case OxmPackage.EXML_ELEMENT_REF__TYPE:

+				return getType();

+			case OxmPackage.EXML_ELEMENT_REF__XML_PROPERTIES:

+				return getXmlProperties();

+			case OxmPackage.EXML_ELEMENT_REF__NAME:

+				return getName();

+			case OxmPackage.EXML_ELEMENT_REF__NAMESPACE:

+				return getNamespace();

+			case OxmPackage.EXML_ELEMENT_REF__XML_MIXED:

+				return isXmlMixed();

+			case OxmPackage.EXML_ELEMENT_REF__XML_ELEMENT_WRAPPER:

+				return getXmlElementWrapper();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_REF__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__XML_JAVA_TYPE_ADAPTER:

+				setXmlJavaTypeAdapter((EXmlJavaTypeAdapter)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__CONTAINER_TYPE:

+				setContainerType((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__READ_ONLY:

+				setReadOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__WRITE_ONLY:

+				setWriteOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__TYPE:

+				setType((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__XML_PROPERTIES:

+				getXmlProperties().clear();

+				getXmlProperties().addAll((Collection<? extends EXmlProperty>)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__NAME:

+				setName((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__NAMESPACE:

+				setNamespace((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__XML_MIXED:

+				setXmlMixed((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__XML_ELEMENT_WRAPPER:

+				setXmlElementWrapper((EXmlElementWrapper)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_REF__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)null);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__XML_JAVA_TYPE_ADAPTER:

+				setXmlJavaTypeAdapter((EXmlJavaTypeAdapter)null);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__CONTAINER_TYPE:

+				setContainerType(CONTAINER_TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__READ_ONLY:

+				setReadOnly(READ_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__WRITE_ONLY:

+				setWriteOnly(WRITE_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__TYPE:

+				setType(TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__XML_PROPERTIES:

+				getXmlProperties().clear();

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__NAME:

+				setName(NAME_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__NAMESPACE:

+				setNamespace(NAMESPACE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__XML_MIXED:

+				setXmlMixed(XML_MIXED_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_REF__XML_ELEMENT_WRAPPER:

+				setXmlElementWrapper((EXmlElementWrapper)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_REF__XML_ACCESS_METHODS:

+				return xmlAccessMethods != null;

+			case OxmPackage.EXML_ELEMENT_REF__XML_JAVA_TYPE_ADAPTER:

+				return xmlJavaTypeAdapter != null;

+			case OxmPackage.EXML_ELEMENT_REF__CONTAINER_TYPE:

+				return CONTAINER_TYPE_EDEFAULT == null ? containerType != null : !CONTAINER_TYPE_EDEFAULT.equals(containerType);

+			case OxmPackage.EXML_ELEMENT_REF__READ_ONLY:

+				return readOnly != READ_ONLY_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT_REF__WRITE_ONLY:

+				return writeOnly != WRITE_ONLY_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT_REF__TYPE:

+				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

+			case OxmPackage.EXML_ELEMENT_REF__XML_PROPERTIES:

+				return xmlProperties != null && !xmlProperties.isEmpty();

+			case OxmPackage.EXML_ELEMENT_REF__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+			case OxmPackage.EXML_ELEMENT_REF__NAMESPACE:

+				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);

+			case OxmPackage.EXML_ELEMENT_REF__XML_MIXED:

+				return xmlMixed != XML_MIXED_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT_REF__XML_ELEMENT_WRAPPER:

+				return xmlElementWrapper != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)

+	{

+		if (baseClass == EAccessibleJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT_REF__XML_ACCESS_METHODS: return OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EAdaptableJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT_REF__XML_JAVA_TYPE_ADAPTER: return OxmPackage.EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT_REF__CONTAINER_TYPE: return OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT_REF__READ_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY;

+				case OxmPackage.EXML_ELEMENT_REF__WRITE_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY;

+				default: return -1;

+			}

+		}

+		if (baseClass == ETypedJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT_REF__TYPE: return OxmPackage.ETYPED_JAVA_ATTRIBUTE__TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT_REF__XML_PROPERTIES: return OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES;

+				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 == EAccessibleJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS: return OxmPackage.EXML_ELEMENT_REF__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EAdaptableJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER: return OxmPackage.EXML_ELEMENT_REF__XML_JAVA_TYPE_ADAPTER;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE: return OxmPackage.EXML_ELEMENT_REF__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY: return OxmPackage.EXML_ELEMENT_REF__READ_ONLY;

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY: return OxmPackage.EXML_ELEMENT_REF__WRITE_ONLY;

+				default: return -1;

+			}

+		}

+		if (baseClass == ETypedJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.ETYPED_JAVA_ATTRIBUTE__TYPE: return OxmPackage.EXML_ELEMENT_REF__TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES: return OxmPackage.EXML_ELEMENT_REF__XML_PROPERTIES;

+				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(" (containerType: ");

+		result.append(containerType);

+		result.append(", readOnly: ");

+		result.append(readOnly);

+		result.append(", writeOnly: ");

+		result.append(writeOnly);

+		result.append(", type: ");

+		result.append(type);

+		result.append(", name: ");

+		result.append(name);

+		result.append(", namespace: ");

+		result.append(namespace);

+		result.append(", xmlMixed: ");

+		result.append(xmlMixed);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlElementRefTranslator

+			extends AbstractJavaAttributeTranslator {

+		

+		XmlElementRefTranslator(String domPathAndName, EStructuralFeature eStructuralFeature) {

+			super(domPathAndName, eStructuralFeature, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlElementRef();

+		}

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRefs.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRefs.java
new file mode 100644
index 0000000000..af98164163
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementRefs.java
@@ -0,0 +1,791 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Element Refs</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#isXmlMixed <em>Xml Mixed</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#getXmlElementRefs <em>Xml Element Refs</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#getXmlElementWrapper <em>Xml Element Wrapper</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementRefs()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlElementRefs extends EJavaAttribute implements EAccessibleJavaAttribute, EAdaptableJavaAttribute, EReadWriteJavaAttribute, EPropertyHolder

+{

+	/**

+	 * The cached value of the '{@link #getXmlAccessMethods() <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessMethods xmlAccessMethods;

+	/**

+	 * The cached value of the '{@link #getXmlJavaTypeAdapter() <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlJavaTypeAdapter xmlJavaTypeAdapter;

+	/**

+	 * The default value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean READ_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean readOnly = READ_ONLY_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean WRITE_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean writeOnly = WRITE_ONLY_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlProperties() <em>Xml Properties</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlProperties()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlProperty> xmlProperties;

+	/**

+	 * The default value of the '{@link #isXmlMixed() <em>Xml Mixed</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlMixed()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_MIXED_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlMixed() <em>Xml Mixed</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlMixed()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlMixed = XML_MIXED_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlElementRefs() <em>Xml Element Refs</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlElementRefs()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlElementRef> xmlElementRefs;

+	/**

+	 * The cached value of the '{@link #getXmlElementWrapper() <em>Xml Element Wrapper</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlElementWrapper()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlElementWrapper xmlElementWrapper;

+

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlElementRefs()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_ELEMENT_REFS;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Access Methods</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #setXmlAccessMethods(EXmlAccessMethods)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAccessibleJavaAttribute_XmlAccessMethods()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlAccessMethods getXmlAccessMethods()

+	{

+		return xmlAccessMethods;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods, NotificationChain msgs)

+	{

+		EXmlAccessMethods oldXmlAccessMethods = xmlAccessMethods;

+		xmlAccessMethods = newXmlAccessMethods;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REFS__XML_ACCESS_METHODS, oldXmlAccessMethods, newXmlAccessMethods);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#getXmlAccessMethods <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 */

+	public void setXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods)

+	{

+		if (newXmlAccessMethods != xmlAccessMethods)

+		{

+			NotificationChain msgs = null;

+			if (xmlAccessMethods != null)

+				msgs = ((InternalEObject)xmlAccessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT_REFS__XML_ACCESS_METHODS, null, msgs);

+			if (newXmlAccessMethods != null)

+				msgs = ((InternalEObject)newXmlAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT_REFS__XML_ACCESS_METHODS, null, msgs);

+			msgs = basicSetXmlAccessMethods(newXmlAccessMethods, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REFS__XML_ACCESS_METHODS, newXmlAccessMethods, newXmlAccessMethods));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Java Type Adapter</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #setXmlJavaTypeAdapter(EXmlJavaTypeAdapter)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAdaptableJavaAttribute_XmlJavaTypeAdapter()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlJavaTypeAdapter getXmlJavaTypeAdapter()

+	{

+		return xmlJavaTypeAdapter;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlJavaTypeAdapter(EXmlJavaTypeAdapter newXmlJavaTypeAdapter, NotificationChain msgs)

+	{

+		EXmlJavaTypeAdapter oldXmlJavaTypeAdapter = xmlJavaTypeAdapter;

+		xmlJavaTypeAdapter = newXmlJavaTypeAdapter;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REFS__XML_JAVA_TYPE_ADAPTER, oldXmlJavaTypeAdapter, newXmlJavaTypeAdapter);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#getXmlJavaTypeAdapter <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 */

+	public void setXmlJavaTypeAdapter(EXmlJavaTypeAdapter newXmlJavaTypeAdapter)

+	{

+		if (newXmlJavaTypeAdapter != xmlJavaTypeAdapter)

+		{

+			NotificationChain msgs = null;

+			if (xmlJavaTypeAdapter != null)

+				msgs = ((InternalEObject)xmlJavaTypeAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT_REFS__XML_JAVA_TYPE_ADAPTER, null, msgs);

+			if (newXmlJavaTypeAdapter != null)

+				msgs = ((InternalEObject)newXmlJavaTypeAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT_REFS__XML_JAVA_TYPE_ADAPTER, null, msgs);

+			msgs = basicSetXmlJavaTypeAdapter(newXmlJavaTypeAdapter, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REFS__XML_JAVA_TYPE_ADAPTER, newXmlJavaTypeAdapter, newXmlJavaTypeAdapter));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Read Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Read Only</em>' attribute.

+	 * @see #setReadOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_ReadOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isReadOnly()

+	{

+		return readOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#isReadOnly <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Read Only</em>' attribute.

+	 * @see #isReadOnly()

+	 * @generated

+	 */

+	public void setReadOnly(boolean newReadOnly)

+	{

+		boolean oldReadOnly = readOnly;

+		readOnly = newReadOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REFS__READ_ONLY, oldReadOnly, readOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Write Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Write Only</em>' attribute.

+	 * @see #setWriteOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_WriteOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isWriteOnly()

+	{

+		return writeOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#isWriteOnly <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Write Only</em>' attribute.

+	 * @see #isWriteOnly()

+	 * @generated

+	 */

+	public void setWriteOnly(boolean newWriteOnly)

+	{

+		boolean oldWriteOnly = writeOnly;

+		writeOnly = newWriteOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REFS__WRITE_ONLY, oldWriteOnly, writeOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Properties</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Properties</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder_XmlProperties()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlProperty> getXmlProperties()

+	{

+		if (xmlProperties == null)

+		{

+			xmlProperties = new EObjectContainmentEList<EXmlProperty>(EXmlProperty.class, this, OxmPackage.EXML_ELEMENT_REFS__XML_PROPERTIES);

+		}

+		return xmlProperties;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Mixed</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Mixed</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Mixed</em>' attribute.

+	 * @see #setXmlMixed(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementRefs_XmlMixed()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlMixed()

+	{

+		return xmlMixed;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#isXmlMixed <em>Xml Mixed</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Mixed</em>' attribute.

+	 * @see #isXmlMixed()

+	 * @generated

+	 */

+	public void setXmlMixed(boolean newXmlMixed)

+	{

+		boolean oldXmlMixed = xmlMixed;

+		xmlMixed = newXmlMixed;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REFS__XML_MIXED, oldXmlMixed, xmlMixed));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Element Refs</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Element Refs</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Element Refs</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementRefs_XmlElementRefs()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlElementRef> getXmlElementRefs()

+	{

+		if (xmlElementRefs == null)

+		{

+			xmlElementRefs = new EObjectContainmentEList<EXmlElementRef>(EXmlElementRef.class, this, OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_REFS);

+		}

+		return xmlElementRefs;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Element Wrapper</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Element Wrapper</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Element Wrapper</em>' containment reference.

+	 * @see #setXmlElementWrapper(EXmlElementWrapper)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementRefs_XmlElementWrapper()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlElementWrapper getXmlElementWrapper()

+	{

+		return xmlElementWrapper;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlElementWrapper(EXmlElementWrapper newXmlElementWrapper, NotificationChain msgs)

+	{

+		EXmlElementWrapper oldXmlElementWrapper = xmlElementWrapper;

+		xmlElementWrapper = newXmlElementWrapper;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_WRAPPER, oldXmlElementWrapper, newXmlElementWrapper);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#getXmlElementWrapper <em>Xml Element Wrapper</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Element Wrapper</em>' containment reference.

+	 * @see #getXmlElementWrapper()

+	 * @generated

+	 */

+	public void setXmlElementWrapper(EXmlElementWrapper newXmlElementWrapper)

+	{

+		if (newXmlElementWrapper != xmlElementWrapper)

+		{

+			NotificationChain msgs = null;

+			if (xmlElementWrapper != null)

+				msgs = ((InternalEObject)xmlElementWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_WRAPPER, null, msgs);

+			if (newXmlElementWrapper != null)

+				msgs = ((InternalEObject)newXmlElementWrapper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_WRAPPER, null, msgs);

+			msgs = basicSetXmlElementWrapper(newXmlElementWrapper, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_WRAPPER, newXmlElementWrapper, newXmlElementWrapper));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ACCESS_METHODS:

+				return basicSetXmlAccessMethods(null, msgs);

+			case OxmPackage.EXML_ELEMENT_REFS__XML_JAVA_TYPE_ADAPTER:

+				return basicSetXmlJavaTypeAdapter(null, msgs);

+			case OxmPackage.EXML_ELEMENT_REFS__XML_PROPERTIES:

+				return ((InternalEList<?>)getXmlProperties()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_REFS:

+				return ((InternalEList<?>)getXmlElementRefs()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_WRAPPER:

+				return basicSetXmlElementWrapper(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ACCESS_METHODS:

+				return getXmlAccessMethods();

+			case OxmPackage.EXML_ELEMENT_REFS__XML_JAVA_TYPE_ADAPTER:

+				return getXmlJavaTypeAdapter();

+			case OxmPackage.EXML_ELEMENT_REFS__READ_ONLY:

+				return isReadOnly();

+			case OxmPackage.EXML_ELEMENT_REFS__WRITE_ONLY:

+				return isWriteOnly();

+			case OxmPackage.EXML_ELEMENT_REFS__XML_PROPERTIES:

+				return getXmlProperties();

+			case OxmPackage.EXML_ELEMENT_REFS__XML_MIXED:

+				return isXmlMixed();

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_REFS:

+				return getXmlElementRefs();

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_WRAPPER:

+				return getXmlElementWrapper();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REFS__XML_JAVA_TYPE_ADAPTER:

+				setXmlJavaTypeAdapter((EXmlJavaTypeAdapter)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REFS__READ_ONLY:

+				setReadOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REFS__WRITE_ONLY:

+				setWriteOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REFS__XML_PROPERTIES:

+				getXmlProperties().clear();

+				getXmlProperties().addAll((Collection<? extends EXmlProperty>)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REFS__XML_MIXED:

+				setXmlMixed((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_REFS:

+				getXmlElementRefs().clear();

+				getXmlElementRefs().addAll((Collection<? extends EXmlElementRef>)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_WRAPPER:

+				setXmlElementWrapper((EXmlElementWrapper)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)null);

+				return;

+			case OxmPackage.EXML_ELEMENT_REFS__XML_JAVA_TYPE_ADAPTER:

+				setXmlJavaTypeAdapter((EXmlJavaTypeAdapter)null);

+				return;

+			case OxmPackage.EXML_ELEMENT_REFS__READ_ONLY:

+				setReadOnly(READ_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_REFS__WRITE_ONLY:

+				setWriteOnly(WRITE_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_REFS__XML_PROPERTIES:

+				getXmlProperties().clear();

+				return;

+			case OxmPackage.EXML_ELEMENT_REFS__XML_MIXED:

+				setXmlMixed(XML_MIXED_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_REFS:

+				getXmlElementRefs().clear();

+				return;

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_WRAPPER:

+				setXmlElementWrapper((EXmlElementWrapper)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ACCESS_METHODS:

+				return xmlAccessMethods != null;

+			case OxmPackage.EXML_ELEMENT_REFS__XML_JAVA_TYPE_ADAPTER:

+				return xmlJavaTypeAdapter != null;

+			case OxmPackage.EXML_ELEMENT_REFS__READ_ONLY:

+				return readOnly != READ_ONLY_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT_REFS__WRITE_ONLY:

+				return writeOnly != WRITE_ONLY_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT_REFS__XML_PROPERTIES:

+				return xmlProperties != null && !xmlProperties.isEmpty();

+			case OxmPackage.EXML_ELEMENT_REFS__XML_MIXED:

+				return xmlMixed != XML_MIXED_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_REFS:

+				return xmlElementRefs != null && !xmlElementRefs.isEmpty();

+			case OxmPackage.EXML_ELEMENT_REFS__XML_ELEMENT_WRAPPER:

+				return xmlElementWrapper != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)

+	{

+		if (baseClass == EAccessibleJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT_REFS__XML_ACCESS_METHODS: return OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EAdaptableJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT_REFS__XML_JAVA_TYPE_ADAPTER: return OxmPackage.EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT_REFS__READ_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY;

+				case OxmPackage.EXML_ELEMENT_REFS__WRITE_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENT_REFS__XML_PROPERTIES: return OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES;

+				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 == EAccessibleJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS: return OxmPackage.EXML_ELEMENT_REFS__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EAdaptableJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER: return OxmPackage.EXML_ELEMENT_REFS__XML_JAVA_TYPE_ADAPTER;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY: return OxmPackage.EXML_ELEMENT_REFS__READ_ONLY;

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY: return OxmPackage.EXML_ELEMENT_REFS__WRITE_ONLY;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES: return OxmPackage.EXML_ELEMENT_REFS__XML_PROPERTIES;

+				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(" (readOnly: ");

+		result.append(readOnly);

+		result.append(", writeOnly: ");

+		result.append(writeOnly);

+		result.append(", xmlMixed: ");

+		result.append(xmlMixed);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlElementRefsTranslator

+			extends AbstractJavaAttributeTranslator {

+		

+		XmlElementRefsTranslator(String domPathAndName, EStructuralFeature eStructuralFeature) {

+			super(domPathAndName, eStructuralFeature, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlElementRefs();

+		}

+	}

+} 

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementWrapper.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementWrapper.java
new file mode 100644
index 0000000000..85de5a2076
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElementWrapper.java
@@ -0,0 +1,396 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Element Wrapper</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#getNamespace <em>Namespace</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#isNillable <em>Nillable</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#isRequired <em>Required</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementWrapper()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlElementWrapper extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAMESPACE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected String namespace = NAMESPACE_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #isNillable() <em>Nillable</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isNillable()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean NILLABLE_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isNillable() <em>Nillable</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isNillable()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean nillable = NILLABLE_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #isRequired() <em>Required</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isRequired()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean REQUIRED_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isRequired() <em>Required</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isRequired()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean required = REQUIRED_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlElementWrapper()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_ELEMENT_WRAPPER;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementWrapper_Name()

+	 * @model

+	 * @generated

+	 */

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_WRAPPER__NAME, oldName, name));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Namespace</em>' attribute.

+	 * @see #setNamespace(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementWrapper_Namespace()

+	 * @model

+	 * @generated

+	 */

+	public String getNamespace()

+	{

+		return namespace;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#getNamespace <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Namespace</em>' attribute.

+	 * @see #getNamespace()

+	 * @generated

+	 */

+	public void setNamespace(String newNamespace)

+	{

+		String oldNamespace = namespace;

+		namespace = newNamespace;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_WRAPPER__NAMESPACE, oldNamespace, namespace));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Nillable</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Nillable</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Nillable</em>' attribute.

+	 * @see #setNillable(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementWrapper_Nillable()

+	 * @model

+	 * @generated

+	 */

+	public boolean isNillable()

+	{

+		return nillable;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#isNillable <em>Nillable</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Nillable</em>' attribute.

+	 * @see #isNillable()

+	 * @generated

+	 */

+	public void setNillable(boolean newNillable)

+	{

+		boolean oldNillable = nillable;

+		nillable = newNillable;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_WRAPPER__NILLABLE, oldNillable, nillable));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Required</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Required</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Required</em>' attribute.

+	 * @see #setRequired(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementWrapper_Required()

+	 * @model

+	 * @generated

+	 */

+	public boolean isRequired()

+	{

+		return required;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#isRequired <em>Required</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Required</em>' attribute.

+	 * @see #isRequired()

+	 * @generated

+	 */

+	public void setRequired(boolean newRequired)

+	{

+		boolean oldRequired = required;

+		required = newRequired;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENT_WRAPPER__REQUIRED, oldRequired, required));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_WRAPPER__NAME:

+				return getName();

+			case OxmPackage.EXML_ELEMENT_WRAPPER__NAMESPACE:

+				return getNamespace();

+			case OxmPackage.EXML_ELEMENT_WRAPPER__NILLABLE:

+				return isNillable();

+			case OxmPackage.EXML_ELEMENT_WRAPPER__REQUIRED:

+				return isRequired();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_WRAPPER__NAME:

+				setName((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_WRAPPER__NAMESPACE:

+				setNamespace((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_WRAPPER__NILLABLE:

+				setNillable((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENT_WRAPPER__REQUIRED:

+				setRequired((Boolean)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_WRAPPER__NAME:

+				setName(NAME_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_WRAPPER__NAMESPACE:

+				setNamespace(NAMESPACE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_WRAPPER__NILLABLE:

+				setNillable(NILLABLE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENT_WRAPPER__REQUIRED:

+				setRequired(REQUIRED_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENT_WRAPPER__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+			case OxmPackage.EXML_ELEMENT_WRAPPER__NAMESPACE:

+				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);

+			case OxmPackage.EXML_ELEMENT_WRAPPER__NILLABLE:

+				return nillable != NILLABLE_EDEFAULT;

+			case OxmPackage.EXML_ELEMENT_WRAPPER__REQUIRED:

+				return required != REQUIRED_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(", namespace: ");

+		result.append(namespace);

+		result.append(", nillable: ");

+		result.append(nillable);

+		result.append(", required: ");

+		result.append(required);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlElementWrapper

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElements.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElements.java
new file mode 100644
index 0000000000..dc61c43200
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlElements.java
@@ -0,0 +1,887 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Elements</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#isXmlIdRef <em>Xml Id Ref</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#isXmlList <em>Xml List</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#getXmlElements <em>Xml Elements</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#getXmlElementWrapper <em>Xml Element Wrapper</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#getXmlJoinNodes <em>Xml Join Nodes</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElements()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlElements extends EJavaAttribute implements EAccessibleJavaAttribute, EContainerJavaAttribute, EReadWriteJavaAttribute, EPropertyHolder

+{

+	/**

+	 * The cached value of the '{@link #getXmlAccessMethods() <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessMethods xmlAccessMethods;

+	/**

+	 * The default value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String CONTAINER_TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String containerType = CONTAINER_TYPE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean READ_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean readOnly = READ_ONLY_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean WRITE_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean writeOnly = WRITE_ONLY_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlProperties() <em>Xml Properties</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlProperties()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlProperty> xmlProperties;

+	/**

+	 * The default value of the '{@link #isXmlIdRef() <em>Xml Id Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlIdRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_ID_REF_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlIdRef() <em>Xml Id Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlIdRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlIdRef = XML_ID_REF_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isXmlList() <em>Xml List</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlList()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_LIST_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlList() <em>Xml List</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlList()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlList = XML_LIST_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlElements() <em>Xml Elements</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlElements()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlElement> xmlElements;

+	/**

+	 * The cached value of the '{@link #getXmlElementWrapper() <em>Xml Element Wrapper</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlElementWrapper()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlElementWrapper xmlElementWrapper;

+	/**

+	 * The cached value of the '{@link #getXmlJoinNodes() <em>Xml Join Nodes</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlJoinNodes()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlJoinNodes> xmlJoinNodes;

+

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlElements()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_ELEMENTS;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Access Methods</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #setXmlAccessMethods(EXmlAccessMethods)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAccessibleJavaAttribute_XmlAccessMethods()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlAccessMethods getXmlAccessMethods()

+	{

+		return xmlAccessMethods;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods, NotificationChain msgs)

+	{

+		EXmlAccessMethods oldXmlAccessMethods = xmlAccessMethods;

+		xmlAccessMethods = newXmlAccessMethods;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENTS__XML_ACCESS_METHODS, oldXmlAccessMethods, newXmlAccessMethods);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#getXmlAccessMethods <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 */

+	public void setXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods)

+	{

+		if (newXmlAccessMethods != xmlAccessMethods)

+		{

+			NotificationChain msgs = null;

+			if (xmlAccessMethods != null)

+				msgs = ((InternalEObject)xmlAccessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENTS__XML_ACCESS_METHODS, null, msgs);

+			if (newXmlAccessMethods != null)

+				msgs = ((InternalEObject)newXmlAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENTS__XML_ACCESS_METHODS, null, msgs);

+			msgs = basicSetXmlAccessMethods(newXmlAccessMethods, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENTS__XML_ACCESS_METHODS, newXmlAccessMethods, newXmlAccessMethods));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Container Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Container Type</em>' attribute.

+	 * @see #setContainerType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEContainerJavaAttribute_ContainerType()

+	 * @model

+	 * @generated

+	 */

+	public String getContainerType()

+	{

+		return containerType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#getContainerType <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Container Type</em>' attribute.

+	 * @see #getContainerType()

+	 * @generated

+	 */

+	public void setContainerType(String newContainerType)

+	{

+		String oldContainerType = containerType;

+		containerType = newContainerType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENTS__CONTAINER_TYPE, oldContainerType, containerType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Read Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Read Only</em>' attribute.

+	 * @see #setReadOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_ReadOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isReadOnly()

+	{

+		return readOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#isReadOnly <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Read Only</em>' attribute.

+	 * @see #isReadOnly()

+	 * @generated

+	 */

+	public void setReadOnly(boolean newReadOnly)

+	{

+		boolean oldReadOnly = readOnly;

+		readOnly = newReadOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENTS__READ_ONLY, oldReadOnly, readOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Write Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Write Only</em>' attribute.

+	 * @see #setWriteOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_WriteOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isWriteOnly()

+	{

+		return writeOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#isWriteOnly <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Write Only</em>' attribute.

+	 * @see #isWriteOnly()

+	 * @generated

+	 */

+	public void setWriteOnly(boolean newWriteOnly)

+	{

+		boolean oldWriteOnly = writeOnly;

+		writeOnly = newWriteOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENTS__WRITE_ONLY, oldWriteOnly, writeOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Properties</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Properties</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder_XmlProperties()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlProperty> getXmlProperties()

+	{

+		if (xmlProperties == null)

+		{

+			xmlProperties = new EObjectContainmentEList<EXmlProperty>(EXmlProperty.class, this, OxmPackage.EXML_ELEMENTS__XML_PROPERTIES);

+		}

+		return xmlProperties;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Id Ref</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Id Ref</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Id Ref</em>' attribute.

+	 * @see #setXmlIdRef(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElements_XmlIdRef()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlIdRef()

+	{

+		return xmlIdRef;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#isXmlIdRef <em>Xml Id Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Id Ref</em>' attribute.

+	 * @see #isXmlIdRef()

+	 * @generated

+	 */

+	public void setXmlIdRef(boolean newXmlIdRef)

+	{

+		boolean oldXmlIdRef = xmlIdRef;

+		xmlIdRef = newXmlIdRef;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENTS__XML_ID_REF, oldXmlIdRef, xmlIdRef));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml List</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml List</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml List</em>' attribute.

+	 * @see #setXmlList(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElements_XmlList()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlList()

+	{

+		return xmlList;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#isXmlList <em>Xml List</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml List</em>' attribute.

+	 * @see #isXmlList()

+	 * @generated

+	 */

+	public void setXmlList(boolean newXmlList)

+	{

+		boolean oldXmlList = xmlList;

+		xmlList = newXmlList;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENTS__XML_LIST, oldXmlList, xmlList));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Elements</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Elements</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Elements</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElements_XmlElements()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlElement> getXmlElements()

+	{

+		if (xmlElements == null)

+		{

+			xmlElements = new EObjectContainmentEList<EXmlElement>(EXmlElement.class, this, OxmPackage.EXML_ELEMENTS__XML_ELEMENTS);

+		}

+		return xmlElements;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Element Wrapper</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Element Wrapper</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Element Wrapper</em>' containment reference.

+	 * @see #setXmlElementWrapper(EXmlElementWrapper)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElements_XmlElementWrapper()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlElementWrapper getXmlElementWrapper()

+	{

+		return xmlElementWrapper;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlElementWrapper(EXmlElementWrapper newXmlElementWrapper, NotificationChain msgs)

+	{

+		EXmlElementWrapper oldXmlElementWrapper = xmlElementWrapper;

+		xmlElementWrapper = newXmlElementWrapper;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENTS__XML_ELEMENT_WRAPPER, oldXmlElementWrapper, newXmlElementWrapper);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#getXmlElementWrapper <em>Xml Element Wrapper</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Element Wrapper</em>' containment reference.

+	 * @see #getXmlElementWrapper()

+	 * @generated

+	 */

+	public void setXmlElementWrapper(EXmlElementWrapper newXmlElementWrapper)

+	{

+		if (newXmlElementWrapper != xmlElementWrapper)

+		{

+			NotificationChain msgs = null;

+			if (xmlElementWrapper != null)

+				msgs = ((InternalEObject)xmlElementWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENTS__XML_ELEMENT_WRAPPER, null, msgs);

+			if (newXmlElementWrapper != null)

+				msgs = ((InternalEObject)newXmlElementWrapper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_ELEMENTS__XML_ELEMENT_WRAPPER, null, msgs);

+			msgs = basicSetXmlElementWrapper(newXmlElementWrapper, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ELEMENTS__XML_ELEMENT_WRAPPER, newXmlElementWrapper, newXmlElementWrapper));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Join Nodes</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Join Nodes</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Join Nodes</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElements_XmlJoinNodes()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlJoinNodes> getXmlJoinNodes()

+	{

+		if (xmlJoinNodes == null)

+		{

+			xmlJoinNodes = new EObjectContainmentEList<EXmlJoinNodes>(EXmlJoinNodes.class, this, OxmPackage.EXML_ELEMENTS__XML_JOIN_NODES);

+		}

+		return xmlJoinNodes;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENTS__XML_ACCESS_METHODS:

+				return basicSetXmlAccessMethods(null, msgs);

+			case OxmPackage.EXML_ELEMENTS__XML_PROPERTIES:

+				return ((InternalEList<?>)getXmlProperties()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EXML_ELEMENTS__XML_ELEMENTS:

+				return ((InternalEList<?>)getXmlElements()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EXML_ELEMENTS__XML_ELEMENT_WRAPPER:

+				return basicSetXmlElementWrapper(null, msgs);

+			case OxmPackage.EXML_ELEMENTS__XML_JOIN_NODES:

+				return ((InternalEList<?>)getXmlJoinNodes()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENTS__XML_ACCESS_METHODS:

+				return getXmlAccessMethods();

+			case OxmPackage.EXML_ELEMENTS__CONTAINER_TYPE:

+				return getContainerType();

+			case OxmPackage.EXML_ELEMENTS__READ_ONLY:

+				return isReadOnly();

+			case OxmPackage.EXML_ELEMENTS__WRITE_ONLY:

+				return isWriteOnly();

+			case OxmPackage.EXML_ELEMENTS__XML_PROPERTIES:

+				return getXmlProperties();

+			case OxmPackage.EXML_ELEMENTS__XML_ID_REF:

+				return isXmlIdRef();

+			case OxmPackage.EXML_ELEMENTS__XML_LIST:

+				return isXmlList();

+			case OxmPackage.EXML_ELEMENTS__XML_ELEMENTS:

+				return getXmlElements();

+			case OxmPackage.EXML_ELEMENTS__XML_ELEMENT_WRAPPER:

+				return getXmlElementWrapper();

+			case OxmPackage.EXML_ELEMENTS__XML_JOIN_NODES:

+				return getXmlJoinNodes();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENTS__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENTS__CONTAINER_TYPE:

+				setContainerType((String)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENTS__READ_ONLY:

+				setReadOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENTS__WRITE_ONLY:

+				setWriteOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENTS__XML_PROPERTIES:

+				getXmlProperties().clear();

+				getXmlProperties().addAll((Collection<? extends EXmlProperty>)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENTS__XML_ID_REF:

+				setXmlIdRef((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENTS__XML_LIST:

+				setXmlList((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENTS__XML_ELEMENTS:

+				getXmlElements().clear();

+				getXmlElements().addAll((Collection<? extends EXmlElement>)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENTS__XML_ELEMENT_WRAPPER:

+				setXmlElementWrapper((EXmlElementWrapper)newValue);

+				return;

+			case OxmPackage.EXML_ELEMENTS__XML_JOIN_NODES:

+				getXmlJoinNodes().clear();

+				getXmlJoinNodes().addAll((Collection<? extends EXmlJoinNodes>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENTS__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)null);

+				return;

+			case OxmPackage.EXML_ELEMENTS__CONTAINER_TYPE:

+				setContainerType(CONTAINER_TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENTS__READ_ONLY:

+				setReadOnly(READ_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENTS__WRITE_ONLY:

+				setWriteOnly(WRITE_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENTS__XML_PROPERTIES:

+				getXmlProperties().clear();

+				return;

+			case OxmPackage.EXML_ELEMENTS__XML_ID_REF:

+				setXmlIdRef(XML_ID_REF_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENTS__XML_LIST:

+				setXmlList(XML_LIST_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ELEMENTS__XML_ELEMENTS:

+				getXmlElements().clear();

+				return;

+			case OxmPackage.EXML_ELEMENTS__XML_ELEMENT_WRAPPER:

+				setXmlElementWrapper((EXmlElementWrapper)null);

+				return;

+			case OxmPackage.EXML_ELEMENTS__XML_JOIN_NODES:

+				getXmlJoinNodes().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ELEMENTS__XML_ACCESS_METHODS:

+				return xmlAccessMethods != null;

+			case OxmPackage.EXML_ELEMENTS__CONTAINER_TYPE:

+				return CONTAINER_TYPE_EDEFAULT == null ? containerType != null : !CONTAINER_TYPE_EDEFAULT.equals(containerType);

+			case OxmPackage.EXML_ELEMENTS__READ_ONLY:

+				return readOnly != READ_ONLY_EDEFAULT;

+			case OxmPackage.EXML_ELEMENTS__WRITE_ONLY:

+				return writeOnly != WRITE_ONLY_EDEFAULT;

+			case OxmPackage.EXML_ELEMENTS__XML_PROPERTIES:

+				return xmlProperties != null && !xmlProperties.isEmpty();

+			case OxmPackage.EXML_ELEMENTS__XML_ID_REF:

+				return xmlIdRef != XML_ID_REF_EDEFAULT;

+			case OxmPackage.EXML_ELEMENTS__XML_LIST:

+				return xmlList != XML_LIST_EDEFAULT;

+			case OxmPackage.EXML_ELEMENTS__XML_ELEMENTS:

+				return xmlElements != null && !xmlElements.isEmpty();

+			case OxmPackage.EXML_ELEMENTS__XML_ELEMENT_WRAPPER:

+				return xmlElementWrapper != null;

+			case OxmPackage.EXML_ELEMENTS__XML_JOIN_NODES:

+				return xmlJoinNodes != null && !xmlJoinNodes.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)

+	{

+		if (baseClass == EAccessibleJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENTS__XML_ACCESS_METHODS: return OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENTS__CONTAINER_TYPE: return OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENTS__READ_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY;

+				case OxmPackage.EXML_ELEMENTS__WRITE_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_ELEMENTS__XML_PROPERTIES: return OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES;

+				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 == EAccessibleJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS: return OxmPackage.EXML_ELEMENTS__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE: return OxmPackage.EXML_ELEMENTS__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY: return OxmPackage.EXML_ELEMENTS__READ_ONLY;

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY: return OxmPackage.EXML_ELEMENTS__WRITE_ONLY;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES: return OxmPackage.EXML_ELEMENTS__XML_PROPERTIES;

+				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(" (containerType: ");

+		result.append(containerType);

+		result.append(", readOnly: ");

+		result.append(readOnly);

+		result.append(", writeOnly: ");

+		result.append(writeOnly);

+		result.append(", xmlIdRef: ");

+		result.append(xmlIdRef);

+		result.append(", xmlList: ");

+		result.append(xmlList);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlElementsTranslator

+			extends AbstractJavaAttributeTranslator {

+		

+		XmlElementsTranslator(String domPathAndName, EStructuralFeature eStructuralFeature) {

+			super(domPathAndName, eStructuralFeature, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlElements();

+		}

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlEnum.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlEnum.java
new file mode 100644
index 0000000000..33874bebc2
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlEnum.java
@@ -0,0 +1,331 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Enum</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum#getJavaEnum <em>Java Enum</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum#getValue <em>Value</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum#getXmlEnumValues <em>Xml Enum Values</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlEnum()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlEnum extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getJavaEnum() <em>Java Enum</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getJavaEnum()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String JAVA_ENUM_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getJavaEnum() <em>Java Enum</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getJavaEnum()

+	 * @generated

+	 * @ordered

+	 */

+	protected String javaEnum = JAVA_ENUM_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String VALUE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected String value = VALUE_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getXmlEnumValues() <em>Xml Enum Values</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlEnumValues()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlEnumValue> xmlEnumValues;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlEnum()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_ENUM;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Java Enum</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Java Enum</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Java Enum</em>' attribute.

+	 * @see #setJavaEnum(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlEnum_JavaEnum()

+	 * @model

+	 * @generated

+	 */

+	public String getJavaEnum()

+	{

+		return javaEnum;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum#getJavaEnum <em>Java Enum</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Java Enum</em>' attribute.

+	 * @see #getJavaEnum()

+	 * @generated

+	 */

+	public void setJavaEnum(String newJavaEnum)

+	{

+		String oldJavaEnum = javaEnum;

+		javaEnum = newJavaEnum;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ENUM__JAVA_ENUM, oldJavaEnum, javaEnum));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Value</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Value</em>' attribute.

+	 * @see #setValue(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlEnum_Value()

+	 * @model

+	 * @generated

+	 */

+	public String getValue()

+	{

+		return value;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum#getValue <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Value</em>' attribute.

+	 * @see #getValue()

+	 * @generated

+	 */

+	public void setValue(String newValue)

+	{

+		String oldValue = value;

+		value = newValue;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ENUM__VALUE, oldValue, value));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Enum Values</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnumValue}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Enum Values</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Enum Values</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlEnum_XmlEnumValues()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlEnumValue> getXmlEnumValues()

+	{

+		if (xmlEnumValues == null)

+		{

+			xmlEnumValues = new EObjectContainmentEList<EXmlEnumValue>(EXmlEnumValue.class, this, OxmPackage.EXML_ENUM__XML_ENUM_VALUES);

+		}

+		return xmlEnumValues;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ENUM__XML_ENUM_VALUES:

+				return ((InternalEList<?>)getXmlEnumValues()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ENUM__JAVA_ENUM:

+				return getJavaEnum();

+			case OxmPackage.EXML_ENUM__VALUE:

+				return getValue();

+			case OxmPackage.EXML_ENUM__XML_ENUM_VALUES:

+				return getXmlEnumValues();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ENUM__JAVA_ENUM:

+				setJavaEnum((String)newValue);

+				return;

+			case OxmPackage.EXML_ENUM__VALUE:

+				setValue((String)newValue);

+				return;

+			case OxmPackage.EXML_ENUM__XML_ENUM_VALUES:

+				getXmlEnumValues().clear();

+				getXmlEnumValues().addAll((Collection<? extends EXmlEnumValue>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ENUM__JAVA_ENUM:

+				setJavaEnum(JAVA_ENUM_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ENUM__VALUE:

+				setValue(VALUE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ENUM__XML_ENUM_VALUES:

+				getXmlEnumValues().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ENUM__JAVA_ENUM:

+				return JAVA_ENUM_EDEFAULT == null ? javaEnum != null : !JAVA_ENUM_EDEFAULT.equals(javaEnum);

+			case OxmPackage.EXML_ENUM__VALUE:

+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

+			case OxmPackage.EXML_ENUM__XML_ENUM_VALUES:

+				return xmlEnumValues != null && !xmlEnumValues.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (javaEnum: ");

+		result.append(javaEnum);

+		result.append(", value: ");

+		result.append(value);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlEnum

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlEnumValue.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlEnumValue.java
new file mode 100644
index 0000000000..536add223d
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlEnumValue.java
@@ -0,0 +1,192 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Enum Value</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnumValue#getJavaEnumValue <em>Java Enum Value</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlEnumValue()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlEnumValue extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getJavaEnumValue() <em>Java Enum Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getJavaEnumValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String JAVA_ENUM_VALUE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getJavaEnumValue() <em>Java Enum Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getJavaEnumValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected String javaEnumValue = JAVA_ENUM_VALUE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlEnumValue()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_ENUM_VALUE;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Java Enum Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Java Enum Value</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Java Enum Value</em>' attribute.

+	 * @see #setJavaEnumValue(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlEnumValue_JavaEnumValue()

+	 * @model

+	 * @generated

+	 */

+	public String getJavaEnumValue()

+	{

+		return javaEnumValue;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnumValue#getJavaEnumValue <em>Java Enum Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Java Enum Value</em>' attribute.

+	 * @see #getJavaEnumValue()

+	 * @generated

+	 */

+	public void setJavaEnumValue(String newJavaEnumValue)

+	{

+		String oldJavaEnumValue = javaEnumValue;

+		javaEnumValue = newJavaEnumValue;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ENUM_VALUE__JAVA_ENUM_VALUE, oldJavaEnumValue, javaEnumValue));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ENUM_VALUE__JAVA_ENUM_VALUE:

+				return getJavaEnumValue();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ENUM_VALUE__JAVA_ENUM_VALUE:

+				setJavaEnumValue((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ENUM_VALUE__JAVA_ENUM_VALUE:

+				setJavaEnumValue(JAVA_ENUM_VALUE_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ENUM_VALUE__JAVA_ENUM_VALUE:

+				return JAVA_ENUM_VALUE_EDEFAULT == null ? javaEnumValue != null : !JAVA_ENUM_VALUE_EDEFAULT.equals(javaEnumValue);

+		}

+		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(" (javaEnumValue: ");

+		result.append(javaEnumValue);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlEnumValue

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlInverseReference.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlInverseReference.java
new file mode 100644
index 0000000000..fdf90db7ac
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlInverseReference.java
@@ -0,0 +1,580 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Inverse Reference</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference#getMappedBy <em>Mapped By</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlInverseReference()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlInverseReference extends EJavaAttribute implements EAccessibleJavaAttribute, EContainerJavaAttribute, ETypedJavaAttribute, EPropertyHolder

+{

+	/**

+	 * The cached value of the '{@link #getXmlAccessMethods() <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessMethods xmlAccessMethods;

+	/**

+	 * The default value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String CONTAINER_TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String containerType = CONTAINER_TYPE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String type = TYPE_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlProperties() <em>Xml Properties</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlProperties()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlProperty> xmlProperties;

+	/**

+	 * The default value of the '{@link #getMappedBy() <em>Mapped By</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getMappedBy()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String MAPPED_BY_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getMappedBy() <em>Mapped By</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getMappedBy()

+	 * @generated

+	 * @ordered

+	 */

+	protected String mappedBy = MAPPED_BY_EDEFAULT;

+

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlInverseReference()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_INVERSE_REFERENCE;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Access Methods</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #setXmlAccessMethods(EXmlAccessMethods)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAccessibleJavaAttribute_XmlAccessMethods()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlAccessMethods getXmlAccessMethods()

+	{

+		return xmlAccessMethods;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods, NotificationChain msgs)

+	{

+		EXmlAccessMethods oldXmlAccessMethods = xmlAccessMethods;

+		xmlAccessMethods = newXmlAccessMethods;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_INVERSE_REFERENCE__XML_ACCESS_METHODS, oldXmlAccessMethods, newXmlAccessMethods);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference#getXmlAccessMethods <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 */

+	public void setXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods)

+	{

+		if (newXmlAccessMethods != xmlAccessMethods)

+		{

+			NotificationChain msgs = null;

+			if (xmlAccessMethods != null)

+				msgs = ((InternalEObject)xmlAccessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_INVERSE_REFERENCE__XML_ACCESS_METHODS, null, msgs);

+			if (newXmlAccessMethods != null)

+				msgs = ((InternalEObject)newXmlAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_INVERSE_REFERENCE__XML_ACCESS_METHODS, null, msgs);

+			msgs = basicSetXmlAccessMethods(newXmlAccessMethods, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_INVERSE_REFERENCE__XML_ACCESS_METHODS, newXmlAccessMethods, newXmlAccessMethods));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Container Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Container Type</em>' attribute.

+	 * @see #setContainerType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEContainerJavaAttribute_ContainerType()

+	 * @model

+	 * @generated

+	 */

+	public String getContainerType()

+	{

+		return containerType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference#getContainerType <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Container Type</em>' attribute.

+	 * @see #getContainerType()

+	 * @generated

+	 */

+	public void setContainerType(String newContainerType)

+	{

+		String oldContainerType = containerType;

+		containerType = newContainerType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_INVERSE_REFERENCE__CONTAINER_TYPE, oldContainerType, containerType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Type</em>' attribute.

+	 * @see #setType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getETypedJavaAttribute_Type()

+	 * @model

+	 * @generated

+	 */

+	public String getType()

+	{

+		return type;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference#getType <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Type</em>' attribute.

+	 * @see #getType()

+	 * @generated

+	 */

+	public void setType(String newType)

+	{

+		String oldType = type;

+		type = newType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_INVERSE_REFERENCE__TYPE, oldType, type));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Properties</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Properties</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder_XmlProperties()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlProperty> getXmlProperties()

+	{

+		if (xmlProperties == null)

+		{

+			xmlProperties = new EObjectContainmentEList<EXmlProperty>(EXmlProperty.class, this, OxmPackage.EXML_INVERSE_REFERENCE__XML_PROPERTIES);

+		}

+		return xmlProperties;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Mapped By</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Mapped By</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Mapped By</em>' attribute.

+	 * @see #setMappedBy(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlInverseReference_MappedBy()

+	 * @model

+	 * @generated

+	 */

+	public String getMappedBy()

+	{

+		return mappedBy;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference#getMappedBy <em>Mapped By</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Mapped By</em>' attribute.

+	 * @see #getMappedBy()

+	 * @generated

+	 */

+	public void setMappedBy(String newMappedBy)

+	{

+		String oldMappedBy = mappedBy;

+		mappedBy = newMappedBy;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_INVERSE_REFERENCE__MAPPED_BY, oldMappedBy, mappedBy));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_INVERSE_REFERENCE__XML_ACCESS_METHODS:

+				return basicSetXmlAccessMethods(null, msgs);

+			case OxmPackage.EXML_INVERSE_REFERENCE__XML_PROPERTIES:

+				return ((InternalEList<?>)getXmlProperties()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_INVERSE_REFERENCE__XML_ACCESS_METHODS:

+				return getXmlAccessMethods();

+			case OxmPackage.EXML_INVERSE_REFERENCE__CONTAINER_TYPE:

+				return getContainerType();

+			case OxmPackage.EXML_INVERSE_REFERENCE__TYPE:

+				return getType();

+			case OxmPackage.EXML_INVERSE_REFERENCE__XML_PROPERTIES:

+				return getXmlProperties();

+			case OxmPackage.EXML_INVERSE_REFERENCE__MAPPED_BY:

+				return getMappedBy();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_INVERSE_REFERENCE__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)newValue);

+				return;

+			case OxmPackage.EXML_INVERSE_REFERENCE__CONTAINER_TYPE:

+				setContainerType((String)newValue);

+				return;

+			case OxmPackage.EXML_INVERSE_REFERENCE__TYPE:

+				setType((String)newValue);

+				return;

+			case OxmPackage.EXML_INVERSE_REFERENCE__XML_PROPERTIES:

+				getXmlProperties().clear();

+				getXmlProperties().addAll((Collection<? extends EXmlProperty>)newValue);

+				return;

+			case OxmPackage.EXML_INVERSE_REFERENCE__MAPPED_BY:

+				setMappedBy((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_INVERSE_REFERENCE__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)null);

+				return;

+			case OxmPackage.EXML_INVERSE_REFERENCE__CONTAINER_TYPE:

+				setContainerType(CONTAINER_TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_INVERSE_REFERENCE__TYPE:

+				setType(TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_INVERSE_REFERENCE__XML_PROPERTIES:

+				getXmlProperties().clear();

+				return;

+			case OxmPackage.EXML_INVERSE_REFERENCE__MAPPED_BY:

+				setMappedBy(MAPPED_BY_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_INVERSE_REFERENCE__XML_ACCESS_METHODS:

+				return xmlAccessMethods != null;

+			case OxmPackage.EXML_INVERSE_REFERENCE__CONTAINER_TYPE:

+				return CONTAINER_TYPE_EDEFAULT == null ? containerType != null : !CONTAINER_TYPE_EDEFAULT.equals(containerType);

+			case OxmPackage.EXML_INVERSE_REFERENCE__TYPE:

+				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

+			case OxmPackage.EXML_INVERSE_REFERENCE__XML_PROPERTIES:

+				return xmlProperties != null && !xmlProperties.isEmpty();

+			case OxmPackage.EXML_INVERSE_REFERENCE__MAPPED_BY:

+				return MAPPED_BY_EDEFAULT == null ? mappedBy != null : !MAPPED_BY_EDEFAULT.equals(mappedBy);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)

+	{

+		if (baseClass == EAccessibleJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_INVERSE_REFERENCE__XML_ACCESS_METHODS: return OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_INVERSE_REFERENCE__CONTAINER_TYPE: return OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == ETypedJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_INVERSE_REFERENCE__TYPE: return OxmPackage.ETYPED_JAVA_ATTRIBUTE__TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_INVERSE_REFERENCE__XML_PROPERTIES: return OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES;

+				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 == EAccessibleJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS: return OxmPackage.EXML_INVERSE_REFERENCE__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE: return OxmPackage.EXML_INVERSE_REFERENCE__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == ETypedJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.ETYPED_JAVA_ATTRIBUTE__TYPE: return OxmPackage.EXML_INVERSE_REFERENCE__TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES: return OxmPackage.EXML_INVERSE_REFERENCE__XML_PROPERTIES;

+				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(" (containerType: ");

+		result.append(containerType);

+		result.append(", type: ");

+		result.append(type);

+		result.append(", mappedBy: ");

+		result.append(mappedBy);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlInverseReferenceTranslator

+			extends AbstractJavaAttributeTranslator {

+		

+		XmlInverseReferenceTranslator(String domPathAndName, EStructuralFeature eStructuralFeature) {

+			super(domPathAndName, eStructuralFeature, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlInverseReference();

+		}

+	}

+}
\ No newline at end of file
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlIsSetNullPolicy.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlIsSetNullPolicy.java
new file mode 100644
index 0000000000..ba045419b5
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlIsSetNullPolicy.java
@@ -0,0 +1,283 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Is Set Null Policy</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetNullPolicy#getIsSetMethodName <em>Is Set Method Name</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetNullPolicy#getXmlIsSetParameters <em>Xml Is Set Parameters</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlIsSetNullPolicy()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlIsSetNullPolicy extends EAbstractXmlNullPolicy

+{

+	/**

+	 * The default value of the '{@link #getIsSetMethodName() <em>Is Set Method Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getIsSetMethodName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String IS_SET_METHOD_NAME_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getIsSetMethodName() <em>Is Set Method Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getIsSetMethodName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String isSetMethodName = IS_SET_METHOD_NAME_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlIsSetParameters() <em>Xml Is Set Parameters</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlIsSetParameters()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlIsSetParameter> xmlIsSetParameters;

+

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlIsSetNullPolicy()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_IS_SET_NULL_POLICY;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Is Set Method Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Is Set Method 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>Is Set Method Name</em>' attribute.

+	 * @see #setIsSetMethodName(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlIsSetNullPolicy_IsSetMethodName()

+	 * @model

+	 * @generated

+	 */

+	public String getIsSetMethodName()

+	{

+		return isSetMethodName;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetNullPolicy#getIsSetMethodName <em>Is Set Method Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Is Set Method Name</em>' attribute.

+	 * @see #getIsSetMethodName()

+	 * @generated

+	 */

+	public void setIsSetMethodName(String newIsSetMethodName)

+	{

+		String oldIsSetMethodName = isSetMethodName;

+		isSetMethodName = newIsSetMethodName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_IS_SET_NULL_POLICY__IS_SET_METHOD_NAME, oldIsSetMethodName, isSetMethodName));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Is Set Parameters</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Is Set Parameters</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Is Set Parameters</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlIsSetNullPolicy_XmlIsSetParameters()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlIsSetParameter> getXmlIsSetParameters()

+	{

+		if (xmlIsSetParameters == null)

+		{

+			xmlIsSetParameters = new EObjectContainmentEList<EXmlIsSetParameter>(EXmlIsSetParameter.class, this, OxmPackage.EXML_IS_SET_NULL_POLICY__XML_IS_SET_PARAMETERS);

+		}

+		return xmlIsSetParameters;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_IS_SET_NULL_POLICY__XML_IS_SET_PARAMETERS:

+				return ((InternalEList<?>)getXmlIsSetParameters()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_IS_SET_NULL_POLICY__IS_SET_METHOD_NAME:

+				return getIsSetMethodName();

+			case OxmPackage.EXML_IS_SET_NULL_POLICY__XML_IS_SET_PARAMETERS:

+				return getXmlIsSetParameters();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_IS_SET_NULL_POLICY__IS_SET_METHOD_NAME:

+				setIsSetMethodName((String)newValue);

+				return;

+			case OxmPackage.EXML_IS_SET_NULL_POLICY__XML_IS_SET_PARAMETERS:

+				getXmlIsSetParameters().clear();

+				getXmlIsSetParameters().addAll((Collection<? extends EXmlIsSetParameter>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_IS_SET_NULL_POLICY__IS_SET_METHOD_NAME:

+				setIsSetMethodName(IS_SET_METHOD_NAME_EDEFAULT);

+				return;

+			case OxmPackage.EXML_IS_SET_NULL_POLICY__XML_IS_SET_PARAMETERS:

+				getXmlIsSetParameters().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_IS_SET_NULL_POLICY__IS_SET_METHOD_NAME:

+				return IS_SET_METHOD_NAME_EDEFAULT == null ? isSetMethodName != null : !IS_SET_METHOD_NAME_EDEFAULT.equals(isSetMethodName);

+			case OxmPackage.EXML_IS_SET_NULL_POLICY__XML_IS_SET_PARAMETERS:

+				return xmlIsSetParameters != null && !xmlIsSetParameters.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (isSetMethodName: ");

+		result.append(isSetMethodName);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlIsSetNullPolicyTranslator

+			extends AbstractAbstractXmlNullPolicyTranslator {

+		

+		public XmlIsSetNullPolicyTranslator() {

+			super(EclipseLink.XML_IS_SET_NULL_POLICY, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlIsSetNullPolicy();

+		}

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlIsSetParameter.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlIsSetParameter.java
new file mode 100644
index 0000000000..616da4d697
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlIsSetParameter.java
@@ -0,0 +1,260 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Is Set Parameter</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter#getValue <em>Value</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter#getType <em>Type</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlIsSetParameter()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlIsSetParameter extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String VALUE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected String value = VALUE_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String TYPE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String type = TYPE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlIsSetParameter()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_IS_SET_PARAMETER;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Value</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Value</em>' attribute.

+	 * @see #setValue(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlIsSetParameter_Value()

+	 * @model

+	 * @generated

+	 */

+	public String getValue()

+	{

+		return value;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter#getValue <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Value</em>' attribute.

+	 * @see #getValue()

+	 * @generated

+	 */

+	public void setValue(String newValue)

+	{

+		String oldValue = value;

+		value = newValue;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_IS_SET_PARAMETER__VALUE, oldValue, value));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Type</em>' attribute.

+	 * @see #setType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlIsSetParameter_Type()

+	 * @model

+	 * @generated

+	 */

+	public String getType()

+	{

+		return type;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter#getType <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Type</em>' attribute.

+	 * @see #getType()

+	 * @generated

+	 */

+	public void setType(String newType)

+	{

+		String oldType = type;

+		type = newType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_IS_SET_PARAMETER__TYPE, oldType, type));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_IS_SET_PARAMETER__VALUE:

+				return getValue();

+			case OxmPackage.EXML_IS_SET_PARAMETER__TYPE:

+				return getType();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_IS_SET_PARAMETER__VALUE:

+				setValue((String)newValue);

+				return;

+			case OxmPackage.EXML_IS_SET_PARAMETER__TYPE:

+				setType((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_IS_SET_PARAMETER__VALUE:

+				setValue(VALUE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_IS_SET_PARAMETER__TYPE:

+				setType(TYPE_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_IS_SET_PARAMETER__VALUE:

+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

+			case OxmPackage.EXML_IS_SET_PARAMETER__TYPE:

+				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

+		}

+		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(" (value: ");

+		result.append(value);

+		result.append(", type: ");

+		result.append(type);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlIsSetParameter

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJavaTypeAdapter.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJavaTypeAdapter.java
new file mode 100644
index 0000000000..cc2c094037
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJavaTypeAdapter.java
@@ -0,0 +1,349 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Java Type Adapter</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter#getValue <em>Value</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter#getType <em>Type</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter#getValueType <em>Value Type</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJavaTypeAdapter()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlJavaTypeAdapter extends EJavaAttribute

+{

+	/**

+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String VALUE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected String value = VALUE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String type = TYPE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getValueType() <em>Value Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getValueType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String VALUE_TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getValueType() <em>Value Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getValueType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String valueType = VALUE_TYPE_EDEFAULT;

+

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlJavaTypeAdapter()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_JAVA_TYPE_ADAPTER;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Value</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Value</em>' attribute.

+	 * @see #setValue(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJavaTypeAdapter_Value()

+	 * @model

+	 * @generated

+	 */

+	public String getValue()

+	{

+		return value;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter#getValue <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Value</em>' attribute.

+	 * @see #getValue()

+	 * @generated

+	 */

+	public void setValue(String newValue)

+	{

+		String oldValue = value;

+		value = newValue;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_JAVA_TYPE_ADAPTER__VALUE, oldValue, value));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Type</em>' attribute.

+	 * @see #setType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJavaTypeAdapter_Type()

+	 * @model

+	 * @generated

+	 */

+	public String getType()

+	{

+		return type;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter#getType <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Type</em>' attribute.

+	 * @see #getType()

+	 * @generated

+	 */

+	public void setType(String newType)

+	{

+		String oldType = type;

+		type = newType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_JAVA_TYPE_ADAPTER__TYPE, oldType, type));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Value Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Value Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Value Type</em>' attribute.

+	 * @see #setValueType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJavaTypeAdapter_ValueType()

+	 * @model

+	 * @generated

+	 */

+	public String getValueType()

+	{

+		return valueType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter#getValueType <em>Value Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Value Type</em>' attribute.

+	 * @see #getValueType()

+	 * @generated

+	 */

+	public void setValueType(String newValueType)

+	{

+		String oldValueType = valueType;

+		valueType = newValueType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_JAVA_TYPE_ADAPTER__VALUE_TYPE, oldValueType, valueType));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_JAVA_TYPE_ADAPTER__VALUE:

+				return getValue();

+			case OxmPackage.EXML_JAVA_TYPE_ADAPTER__TYPE:

+				return getType();

+			case OxmPackage.EXML_JAVA_TYPE_ADAPTER__VALUE_TYPE:

+				return getValueType();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_JAVA_TYPE_ADAPTER__VALUE:

+				setValue((String)newValue);

+				return;

+			case OxmPackage.EXML_JAVA_TYPE_ADAPTER__TYPE:

+				setType((String)newValue);

+				return;

+			case OxmPackage.EXML_JAVA_TYPE_ADAPTER__VALUE_TYPE:

+				setValueType((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_JAVA_TYPE_ADAPTER__VALUE:

+				setValue(VALUE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_JAVA_TYPE_ADAPTER__TYPE:

+				setType(TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_JAVA_TYPE_ADAPTER__VALUE_TYPE:

+				setValueType(VALUE_TYPE_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_JAVA_TYPE_ADAPTER__VALUE:

+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

+			case OxmPackage.EXML_JAVA_TYPE_ADAPTER__TYPE:

+				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

+			case OxmPackage.EXML_JAVA_TYPE_ADAPTER__VALUE_TYPE:

+				return VALUE_TYPE_EDEFAULT == null ? valueType != null : !VALUE_TYPE_EDEFAULT.equals(valueType);

+		}

+		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(" (value: ");

+		result.append(value);

+		result.append(", type: ");

+		result.append(type);

+		result.append(", valueType: ");

+		result.append(valueType);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlJavaTypeAdapterTranslator

+			extends AbstractJavaAttributeTranslator {

+		

+		XmlJavaTypeAdapterTranslator(String domPathAndName, EStructuralFeature eStructuralFeature) {

+			super(domPathAndName, eStructuralFeature, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlJavaTypeAdapter();

+		}

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNode.java
new file mode 100644
index 0000000000..9710f0cda5
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNode.java
@@ -0,0 +1,260 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Join Node</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode#getXmlPath <em>Xml Path</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode#getReferencedXmlPath <em>Referenced Xml Path</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJoinNode()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlJoinNode extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getXmlPath() <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlPath()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String XML_PATH_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getXmlPath() <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlPath()

+	 * @generated

+	 * @ordered

+	 */

+	protected String xmlPath = XML_PATH_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getReferencedXmlPath() <em>Referenced Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getReferencedXmlPath()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String REFERENCED_XML_PATH_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getReferencedXmlPath() <em>Referenced Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getReferencedXmlPath()

+	 * @generated

+	 * @ordered

+	 */

+	protected String referencedXmlPath = REFERENCED_XML_PATH_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlJoinNode()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_JOIN_NODE;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Path</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Path</em>' attribute.

+	 * @see #setXmlPath(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJoinNode_XmlPath()

+	 * @model

+	 * @generated

+	 */

+	public String getXmlPath()

+	{

+		return xmlPath;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode#getXmlPath <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Path</em>' attribute.

+	 * @see #getXmlPath()

+	 * @generated

+	 */

+	public void setXmlPath(String newXmlPath)

+	{

+		String oldXmlPath = xmlPath;

+		xmlPath = newXmlPath;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_JOIN_NODE__XML_PATH, oldXmlPath, xmlPath));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Referenced Xml Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Referenced Xml Path</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Referenced Xml Path</em>' attribute.

+	 * @see #setReferencedXmlPath(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJoinNode_ReferencedXmlPath()

+	 * @model

+	 * @generated

+	 */

+	public String getReferencedXmlPath()

+	{

+		return referencedXmlPath;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode#getReferencedXmlPath <em>Referenced Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Referenced Xml Path</em>' attribute.

+	 * @see #getReferencedXmlPath()

+	 * @generated

+	 */

+	public void setReferencedXmlPath(String newReferencedXmlPath)

+	{

+		String oldReferencedXmlPath = referencedXmlPath;

+		referencedXmlPath = newReferencedXmlPath;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_JOIN_NODE__REFERENCED_XML_PATH, oldReferencedXmlPath, referencedXmlPath));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_JOIN_NODE__XML_PATH:

+				return getXmlPath();

+			case OxmPackage.EXML_JOIN_NODE__REFERENCED_XML_PATH:

+				return getReferencedXmlPath();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_JOIN_NODE__XML_PATH:

+				setXmlPath((String)newValue);

+				return;

+			case OxmPackage.EXML_JOIN_NODE__REFERENCED_XML_PATH:

+				setReferencedXmlPath((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_JOIN_NODE__XML_PATH:

+				setXmlPath(XML_PATH_EDEFAULT);

+				return;

+			case OxmPackage.EXML_JOIN_NODE__REFERENCED_XML_PATH:

+				setReferencedXmlPath(REFERENCED_XML_PATH_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_JOIN_NODE__XML_PATH:

+				return XML_PATH_EDEFAULT == null ? xmlPath != null : !XML_PATH_EDEFAULT.equals(xmlPath);

+			case OxmPackage.EXML_JOIN_NODE__REFERENCED_XML_PATH:

+				return REFERENCED_XML_PATH_EDEFAULT == null ? referencedXmlPath != null : !REFERENCED_XML_PATH_EDEFAULT.equals(referencedXmlPath);

+		}

+		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(" (xmlPath: ");

+		result.append(xmlPath);

+		result.append(", referencedXmlPath: ");

+		result.append(referencedXmlPath);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlJoinNode

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNodes.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNodes.java
new file mode 100644
index 0000000000..a72f279878
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlJoinNodes.java
@@ -0,0 +1,402 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Join Nodes</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes#getXmlJoinNodes <em>Xml Join Nodes</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJoinNodes()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlJoinNodes extends EJavaAttribute implements EContainerJavaAttribute, ETypedJavaAttribute

+{

+	/**

+	 * The default value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String CONTAINER_TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String containerType = CONTAINER_TYPE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String type = TYPE_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlJoinNodes() <em>Xml Join Nodes</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlJoinNodes()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlJoinNode> xmlJoinNodes;

+

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlJoinNodes()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_JOIN_NODES;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Container Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Container Type</em>' attribute.

+	 * @see #setContainerType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEContainerJavaAttribute_ContainerType()

+	 * @model

+	 * @generated

+	 */

+	public String getContainerType()

+	{

+		return containerType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes#getContainerType <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Container Type</em>' attribute.

+	 * @see #getContainerType()

+	 * @generated

+	 */

+	public void setContainerType(String newContainerType)

+	{

+		String oldContainerType = containerType;

+		containerType = newContainerType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_JOIN_NODES__CONTAINER_TYPE, oldContainerType, containerType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Type</em>' attribute.

+	 * @see #setType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getETypedJavaAttribute_Type()

+	 * @model

+	 * @generated

+	 */

+	public String getType()

+	{

+		return type;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes#getType <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Type</em>' attribute.

+	 * @see #getType()

+	 * @generated

+	 */

+	public void setType(String newType)

+	{

+		String oldType = type;

+		type = newType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_JOIN_NODES__TYPE, oldType, type));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Join Nodes</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Join Nodes</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Join Nodes</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJoinNodes_XmlJoinNodes()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlJoinNode> getXmlJoinNodes()

+	{

+		if (xmlJoinNodes == null)

+		{

+			xmlJoinNodes = new EObjectContainmentEList<EXmlJoinNode>(EXmlJoinNode.class, this, OxmPackage.EXML_JOIN_NODES__XML_JOIN_NODES);

+		}

+		return xmlJoinNodes;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_JOIN_NODES__XML_JOIN_NODES:

+				return ((InternalEList<?>)getXmlJoinNodes()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_JOIN_NODES__CONTAINER_TYPE:

+				return getContainerType();

+			case OxmPackage.EXML_JOIN_NODES__TYPE:

+				return getType();

+			case OxmPackage.EXML_JOIN_NODES__XML_JOIN_NODES:

+				return getXmlJoinNodes();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_JOIN_NODES__CONTAINER_TYPE:

+				setContainerType((String)newValue);

+				return;

+			case OxmPackage.EXML_JOIN_NODES__TYPE:

+				setType((String)newValue);

+				return;

+			case OxmPackage.EXML_JOIN_NODES__XML_JOIN_NODES:

+				getXmlJoinNodes().clear();

+				getXmlJoinNodes().addAll((Collection<? extends EXmlJoinNode>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_JOIN_NODES__CONTAINER_TYPE:

+				setContainerType(CONTAINER_TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_JOIN_NODES__TYPE:

+				setType(TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_JOIN_NODES__XML_JOIN_NODES:

+				getXmlJoinNodes().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_JOIN_NODES__CONTAINER_TYPE:

+				return CONTAINER_TYPE_EDEFAULT == null ? containerType != null : !CONTAINER_TYPE_EDEFAULT.equals(containerType);

+			case OxmPackage.EXML_JOIN_NODES__TYPE:

+				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

+			case OxmPackage.EXML_JOIN_NODES__XML_JOIN_NODES:

+				return xmlJoinNodes != null && !xmlJoinNodes.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)

+	{

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_JOIN_NODES__CONTAINER_TYPE: return OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == ETypedJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_JOIN_NODES__TYPE: return OxmPackage.ETYPED_JAVA_ATTRIBUTE__TYPE;

+				default: return -1;

+			}

+		}

+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)

+	{

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE: return OxmPackage.EXML_JOIN_NODES__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == ETypedJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.ETYPED_JAVA_ATTRIBUTE__TYPE: return OxmPackage.EXML_JOIN_NODES__TYPE;

+				default: return -1;

+			}

+		}

+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (containerType: ");

+		result.append(containerType);

+		result.append(", type: ");

+		result.append(type);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlJoinNodesTranslator

+			extends AbstractJavaAttributeTranslator {

+		

+		XmlJoinNodesTranslator(String domPathAndName, EStructuralFeature eStructuralFeature) {

+			super(domPathAndName, eStructuralFeature, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlJoinNodes();

+		}

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlMap.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlMap.java
new file mode 100644
index 0000000000..31f9939892
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlMap.java
@@ -0,0 +1,260 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Map</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMap#getKey <em>Key</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMap#getValue <em>Value</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlMap()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlMap extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getKey() <em>Key</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getKey()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String KEY_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getKey() <em>Key</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getKey()

+	 * @generated

+	 * @ordered

+	 */

+	protected String key = KEY_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String VALUE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected String value = VALUE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlMap()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_MAP;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Key</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Key</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Key</em>' attribute.

+	 * @see #setKey(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlMap_Key()

+	 * @model

+	 * @generated

+	 */

+	public String getKey()

+	{

+		return key;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMap#getKey <em>Key</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Key</em>' attribute.

+	 * @see #getKey()

+	 * @generated

+	 */

+	public void setKey(String newKey)

+	{

+		String oldKey = key;

+		key = newKey;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_MAP__KEY, oldKey, key));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Value</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Value</em>' attribute.

+	 * @see #setValue(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlMap_Value()

+	 * @model

+	 * @generated

+	 */

+	public String getValue()

+	{

+		return value;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMap#getValue <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Value</em>' attribute.

+	 * @see #getValue()

+	 * @generated

+	 */

+	public void setValue(String newValue)

+	{

+		String oldValue = value;

+		value = newValue;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_MAP__VALUE, oldValue, value));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_MAP__KEY:

+				return getKey();

+			case OxmPackage.EXML_MAP__VALUE:

+				return getValue();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_MAP__KEY:

+				setKey((String)newValue);

+				return;

+			case OxmPackage.EXML_MAP__VALUE:

+				setValue((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_MAP__KEY:

+				setKey(KEY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_MAP__VALUE:

+				setValue(VALUE_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_MAP__KEY:

+				return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);

+			case OxmPackage.EXML_MAP__VALUE:

+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

+		}

+		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(" (key: ");

+		result.append(key);

+		result.append(", value: ");

+		result.append(value);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlMap

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlMarshalNullRepresentation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlMarshalNullRepresentation.java
new file mode 100644
index 0000000000..a903cc5188
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlMarshalNullRepresentation.java
@@ -0,0 +1,250 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.emf.common.util.Enumerator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the literals of the enumeration '<em><b>EXml Marshal Null Representation</b></em>',

+ * and utility methods for working with them.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlMarshalNullRepresentation()

+ * @model

+ * @generated

+ */

+public enum EXmlMarshalNullRepresentation implements Enumerator

+{

+	/**

+	 * The '<em><b>XSI NIL</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #XSI_NIL_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	XSI_NIL(0, "XSI_NIL", "XSI_NIL"),

+

+	/**

+	 * The '<em><b>ABSENT NODE</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #ABSENT_NODE_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	ABSENT_NODE(1, "ABSENT_NODE", "ABSENT_NODE"),

+

+	/**

+	 * The '<em><b>EMPTY NODE</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #EMPTY_NODE_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	EMPTY_NODE(2, "EMPTY_NODE", "EMPTY_NODE");

+

+	/**

+	 * The '<em><b>XSI NIL</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>XSI NIL</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #XSI_NIL

+	 * @model

+	 * @generated

+	 * @ordered

+	 */

+	public static final int XSI_NIL_VALUE = 0;

+

+	/**

+	 * The '<em><b>ABSENT NODE</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>ABSENT NODE</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #ABSENT_NODE

+	 * @model

+	 * @generated

+	 * @ordered

+	 */

+	public static final int ABSENT_NODE_VALUE = 1;

+

+	/**

+	 * The '<em><b>EMPTY NODE</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>EMPTY NODE</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #EMPTY_NODE

+	 * @model

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EMPTY_NODE_VALUE = 2;

+

+	/**

+	 * An array of all the '<em><b>EXml Marshal Null Representation</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static final EXmlMarshalNullRepresentation[] VALUES_ARRAY =

+		new EXmlMarshalNullRepresentation[]

+		{

+			XSI_NIL,

+			ABSENT_NODE,

+			EMPTY_NODE,

+		};

+

+	/**

+	 * A public read-only list of all the '<em><b>EXml Marshal Null Representation</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final List<EXmlMarshalNullRepresentation> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

+

+	/**

+	 * Returns the '<em><b>EXml Marshal Null Representation</b></em>' literal with the specified literal value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlMarshalNullRepresentation get(String literal)

+	{

+		for (int i = 0; i < VALUES_ARRAY.length; ++i)

+		{

+			EXmlMarshalNullRepresentation result = VALUES_ARRAY[i];

+			if (result.toString().equals(literal))

+			{

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>EXml Marshal Null Representation</b></em>' literal with the specified name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlMarshalNullRepresentation getByName(String name)

+	{

+		for (int i = 0; i < VALUES_ARRAY.length; ++i)

+		{

+			EXmlMarshalNullRepresentation result = VALUES_ARRAY[i];

+			if (result.getName().equals(name))

+			{

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>EXml Marshal Null Representation</b></em>' literal with the specified integer value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlMarshalNullRepresentation get(int value)

+	{

+		switch (value)

+		{

+			case XSI_NIL_VALUE: return XSI_NIL;

+			case ABSENT_NODE_VALUE: return ABSENT_NODE;

+			case EMPTY_NODE_VALUE: return EMPTY_NODE;

+		}

+		return null;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final int value;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final String name;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final String literal;

+

+	/**

+	 * Only this class can construct instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EXmlMarshalNullRepresentation(int value, String name, String literal)

+	{

+		this.value = value;

+		this.name = name;

+		this.literal = literal;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public int getValue()

+	{

+	  return value;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getName()

+	{

+	  return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getLiteral()

+	{

+	  return literal;

+	}

+

+	/**

+	 * Returns the literal value of the enumerator, which is its string representation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		return literal;

+	}

+	

+} //EXmlMarshalNullRepresentation

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlNs.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlNs.java
new file mode 100644
index 0000000000..6bf5e9b58e
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlNs.java
@@ -0,0 +1,260 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Ns</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs#getNamespaceUri <em>Namespace Uri</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs#getPrefix <em>Prefix</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlNs()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlNs extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getNamespaceUri() <em>Namespace Uri</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespaceUri()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAMESPACE_URI_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getNamespaceUri() <em>Namespace Uri</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespaceUri()

+	 * @generated

+	 * @ordered

+	 */

+	protected String namespaceUri = NAMESPACE_URI_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getPrefix() <em>Prefix</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getPrefix()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String PREFIX_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getPrefix() <em>Prefix</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getPrefix()

+	 * @generated

+	 * @ordered

+	 */

+	protected String prefix = PREFIX_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlNs()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_NS;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Namespace Uri</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Namespace Uri</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Namespace Uri</em>' attribute.

+	 * @see #setNamespaceUri(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlNs_NamespaceUri()

+	 * @model

+	 * @generated

+	 */

+	public String getNamespaceUri()

+	{

+		return namespaceUri;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs#getNamespaceUri <em>Namespace Uri</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Namespace Uri</em>' attribute.

+	 * @see #getNamespaceUri()

+	 * @generated

+	 */

+	public void setNamespaceUri(String newNamespaceUri)

+	{

+		String oldNamespaceUri = namespaceUri;

+		namespaceUri = newNamespaceUri;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_NS__NAMESPACE_URI, oldNamespaceUri, namespaceUri));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Prefix</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Prefix</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Prefix</em>' attribute.

+	 * @see #setPrefix(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlNs_Prefix()

+	 * @model

+	 * @generated

+	 */

+	public String getPrefix()

+	{

+		return prefix;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs#getPrefix <em>Prefix</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Prefix</em>' attribute.

+	 * @see #getPrefix()

+	 * @generated

+	 */

+	public void setPrefix(String newPrefix)

+	{

+		String oldPrefix = prefix;

+		prefix = newPrefix;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_NS__PREFIX, oldPrefix, prefix));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_NS__NAMESPACE_URI:

+				return getNamespaceUri();

+			case OxmPackage.EXML_NS__PREFIX:

+				return getPrefix();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_NS__NAMESPACE_URI:

+				setNamespaceUri((String)newValue);

+				return;

+			case OxmPackage.EXML_NS__PREFIX:

+				setPrefix((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_NS__NAMESPACE_URI:

+				setNamespaceUri(NAMESPACE_URI_EDEFAULT);

+				return;

+			case OxmPackage.EXML_NS__PREFIX:

+				setPrefix(PREFIX_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_NS__NAMESPACE_URI:

+				return NAMESPACE_URI_EDEFAULT == null ? namespaceUri != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceUri);

+			case OxmPackage.EXML_NS__PREFIX:

+				return PREFIX_EDEFAULT == null ? prefix != null : !PREFIX_EDEFAULT.equals(prefix);

+		}

+		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(" (namespaceUri: ");

+		result.append(namespaceUri);

+		result.append(", prefix: ");

+		result.append(prefix);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlNs

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlNsForm.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlNsForm.java
new file mode 100644
index 0000000000..9b7519d30f
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlNsForm.java
@@ -0,0 +1,250 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.emf.common.util.Enumerator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the literals of the enumeration '<em><b>EXml Ns Form</b></em>',

+ * and utility methods for working with them.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlNsForm()

+ * @model

+ * @generated

+ */

+public enum EXmlNsForm implements Enumerator

+{

+	/**

+	 * The '<em><b>UNQUALIFIED</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #UNQUALIFIED_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	UNQUALIFIED(0, "UNQUALIFIED", "UNQUALIFIED"),

+

+	/**

+	 * The '<em><b>QUALIFIED</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #QUALIFIED_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	QUALIFIED(1, "QUALIFIED", "QUALIFIED"),

+

+	/**

+	 * The '<em><b>UNSET</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #UNSET_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	UNSET(2, "UNSET", "UNSET");

+

+	/**

+	 * The '<em><b>UNQUALIFIED</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>UNQUALIFIED</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #UNQUALIFIED

+	 * @model

+	 * @generated

+	 * @ordered

+	 */

+	public static final int UNQUALIFIED_VALUE = 0;

+

+	/**

+	 * The '<em><b>QUALIFIED</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>QUALIFIED</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #QUALIFIED

+	 * @model

+	 * @generated

+	 * @ordered

+	 */

+	public static final int QUALIFIED_VALUE = 1;

+

+	/**

+	 * The '<em><b>UNSET</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>UNSET</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #UNSET

+	 * @model

+	 * @generated

+	 * @ordered

+	 */

+	public static final int UNSET_VALUE = 2;

+

+	/**

+	 * An array of all the '<em><b>EXml Ns Form</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static final EXmlNsForm[] VALUES_ARRAY =

+		new EXmlNsForm[]

+		{

+			UNQUALIFIED,

+			QUALIFIED,

+			UNSET,

+		};

+

+	/**

+	 * A public read-only list of all the '<em><b>EXml Ns Form</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final List<EXmlNsForm> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

+

+	/**

+	 * Returns the '<em><b>EXml Ns Form</b></em>' literal with the specified literal value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlNsForm get(String literal)

+	{

+		for (int i = 0; i < VALUES_ARRAY.length; ++i)

+		{

+			EXmlNsForm result = VALUES_ARRAY[i];

+			if (result.toString().equals(literal))

+			{

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>EXml Ns Form</b></em>' literal with the specified name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlNsForm getByName(String name)

+	{

+		for (int i = 0; i < VALUES_ARRAY.length; ++i)

+		{

+			EXmlNsForm result = VALUES_ARRAY[i];

+			if (result.getName().equals(name))

+			{

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>EXml Ns Form</b></em>' literal with the specified integer value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlNsForm get(int value)

+	{

+		switch (value)

+		{

+			case UNQUALIFIED_VALUE: return UNQUALIFIED;

+			case QUALIFIED_VALUE: return QUALIFIED;

+			case UNSET_VALUE: return UNSET;

+		}

+		return null;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final int value;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final String name;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final String literal;

+

+	/**

+	 * Only this class can construct instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EXmlNsForm(int value, String name, String literal)

+	{

+		this.value = value;

+		this.name = name;

+		this.literal = literal;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public int getValue()

+	{

+	  return value;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getName()

+	{

+	  return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getLiteral()

+	{

+	  return literal;

+	}

+

+	/**

+	 * Returns the literal value of the enumerator, which is its string representation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		return literal;

+	}

+	

+} //EXmlNsForm

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlNullPolicy.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlNullPolicy.java
new file mode 100644
index 0000000000..a17e04237e
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlNullPolicy.java
@@ -0,0 +1,216 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Null Policy</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNullPolicy#isIsSetPerformedForAbsentNode <em>Is Set Performed For Absent Node</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlNullPolicy()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlNullPolicy extends EAbstractXmlNullPolicy

+{

+	/**

+	 * The default value of the '{@link #isIsSetPerformedForAbsentNode() <em>Is Set Performed For Absent Node</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isIsSetPerformedForAbsentNode()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean IS_SET_PERFORMED_FOR_ABSENT_NODE_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isIsSetPerformedForAbsentNode() <em>Is Set Performed For Absent Node</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isIsSetPerformedForAbsentNode()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean isSetPerformedForAbsentNode = IS_SET_PERFORMED_FOR_ABSENT_NODE_EDEFAULT;

+

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlNullPolicy()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_NULL_POLICY;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Is Set Performed For Absent Node</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Is Set Performed For Absent Node</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Is Set Performed For Absent Node</em>' attribute.

+	 * @see #setIsSetPerformedForAbsentNode(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlNullPolicy_IsSetPerformedForAbsentNode()

+	 * @model

+	 * @generated

+	 */

+	public boolean isIsSetPerformedForAbsentNode()

+	{

+		return isSetPerformedForAbsentNode;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNullPolicy#isIsSetPerformedForAbsentNode <em>Is Set Performed For Absent Node</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Is Set Performed For Absent Node</em>' attribute.

+	 * @see #isIsSetPerformedForAbsentNode()

+	 * @generated

+	 */

+	public void setIsSetPerformedForAbsentNode(boolean newIsSetPerformedForAbsentNode)

+	{

+		boolean oldIsSetPerformedForAbsentNode = isSetPerformedForAbsentNode;

+		isSetPerformedForAbsentNode = newIsSetPerformedForAbsentNode;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_NULL_POLICY__IS_SET_PERFORMED_FOR_ABSENT_NODE, oldIsSetPerformedForAbsentNode, isSetPerformedForAbsentNode));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_NULL_POLICY__IS_SET_PERFORMED_FOR_ABSENT_NODE:

+				return isIsSetPerformedForAbsentNode();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_NULL_POLICY__IS_SET_PERFORMED_FOR_ABSENT_NODE:

+				setIsSetPerformedForAbsentNode((Boolean)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_NULL_POLICY__IS_SET_PERFORMED_FOR_ABSENT_NODE:

+				setIsSetPerformedForAbsentNode(IS_SET_PERFORMED_FOR_ABSENT_NODE_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_NULL_POLICY__IS_SET_PERFORMED_FOR_ABSENT_NODE:

+				return isSetPerformedForAbsentNode != IS_SET_PERFORMED_FOR_ABSENT_NODE_EDEFAULT;

+		}

+		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(" (isSetPerformedForAbsentNode: ");

+		result.append(isSetPerformedForAbsentNode);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlNullPolicyTranslator

+			extends AbstractAbstractXmlNullPolicyTranslator {

+		

+		public XmlNullPolicyTranslator() {

+			super(EclipseLink.XML_NULL_POLICY, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlNullPolicy();

+		}

+	}

+}
\ No newline at end of file
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlProperty.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlProperty.java
new file mode 100644
index 0000000000..889604e7eb
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlProperty.java
@@ -0,0 +1,328 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Property</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty#getValue <em>Value</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty#getValueType <em>Value Type</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlProperty()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlProperty extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String VALUE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected String value = VALUE_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getValueType() <em>Value Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getValueType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String VALUE_TYPE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getValueType() <em>Value Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getValueType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String valueType = VALUE_TYPE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlProperty()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_PROPERTY;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlProperty_Name()

+	 * @model

+	 * @generated

+	 */

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_PROPERTY__NAME, oldName, name));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Value</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Value</em>' attribute.

+	 * @see #setValue(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlProperty_Value()

+	 * @model

+	 * @generated

+	 */

+	public String getValue()

+	{

+		return value;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty#getValue <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Value</em>' attribute.

+	 * @see #getValue()

+	 * @generated

+	 */

+	public void setValue(String newValue)

+	{

+		String oldValue = value;

+		value = newValue;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_PROPERTY__VALUE, oldValue, value));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Value Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Value Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Value Type</em>' attribute.

+	 * @see #setValueType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlProperty_ValueType()

+	 * @model

+	 * @generated

+	 */

+	public String getValueType()

+	{

+		return valueType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty#getValueType <em>Value Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Value Type</em>' attribute.

+	 * @see #getValueType()

+	 * @generated

+	 */

+	public void setValueType(String newValueType)

+	{

+		String oldValueType = valueType;

+		valueType = newValueType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_PROPERTY__VALUE_TYPE, oldValueType, valueType));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_PROPERTY__NAME:

+				return getName();

+			case OxmPackage.EXML_PROPERTY__VALUE:

+				return getValue();

+			case OxmPackage.EXML_PROPERTY__VALUE_TYPE:

+				return getValueType();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_PROPERTY__NAME:

+				setName((String)newValue);

+				return;

+			case OxmPackage.EXML_PROPERTY__VALUE:

+				setValue((String)newValue);

+				return;

+			case OxmPackage.EXML_PROPERTY__VALUE_TYPE:

+				setValueType((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_PROPERTY__NAME:

+				setName(NAME_EDEFAULT);

+				return;

+			case OxmPackage.EXML_PROPERTY__VALUE:

+				setValue(VALUE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_PROPERTY__VALUE_TYPE:

+				setValueType(VALUE_TYPE_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_PROPERTY__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+			case OxmPackage.EXML_PROPERTY__VALUE:

+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

+			case OxmPackage.EXML_PROPERTY__VALUE_TYPE:

+				return VALUE_TYPE_EDEFAULT == null ? valueType != null : !VALUE_TYPE_EDEFAULT.equals(valueType);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(", value: ");

+		result.append(value);

+		result.append(", valueType: ");

+		result.append(valueType);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlProperty

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlReadTransformer.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlReadTransformer.java
new file mode 100644
index 0000000000..494e40559a
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlReadTransformer.java
@@ -0,0 +1,40 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.ecore.EClass;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Read Transformer</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlReadTransformer()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlReadTransformer extends EAbstractXmlTransformer

+{

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlReadTransformer()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_READ_TRANSFORMER;

+	}

+

+} // EXmlReadTransformer

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlRegistry.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlRegistry.java
new file mode 100644
index 0000000000..2c9ab1aa62
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlRegistry.java
@@ -0,0 +1,260 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Registry</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRegistry#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRegistry#getXmlElementDecls <em>Xml Element Decls</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlRegistry()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlRegistry extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getXmlElementDecls() <em>Xml Element Decls</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlElementDecls()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlElementDecl> xmlElementDecls;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlRegistry()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_REGISTRY;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlRegistry_Name()

+	 * @model

+	 * @generated

+	 */

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRegistry#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_REGISTRY__NAME, oldName, name));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Element Decls</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Element Decls</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Element Decls</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlRegistry_XmlElementDecls()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlElementDecl> getXmlElementDecls()

+	{

+		if (xmlElementDecls == null)

+		{

+			xmlElementDecls = new EObjectContainmentEList<EXmlElementDecl>(EXmlElementDecl.class, this, OxmPackage.EXML_REGISTRY__XML_ELEMENT_DECLS);

+		}

+		return xmlElementDecls;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_REGISTRY__XML_ELEMENT_DECLS:

+				return ((InternalEList<?>)getXmlElementDecls()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_REGISTRY__NAME:

+				return getName();

+			case OxmPackage.EXML_REGISTRY__XML_ELEMENT_DECLS:

+				return getXmlElementDecls();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_REGISTRY__NAME:

+				setName((String)newValue);

+				return;

+			case OxmPackage.EXML_REGISTRY__XML_ELEMENT_DECLS:

+				getXmlElementDecls().clear();

+				getXmlElementDecls().addAll((Collection<? extends EXmlElementDecl>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_REGISTRY__NAME:

+				setName(NAME_EDEFAULT);

+				return;

+			case OxmPackage.EXML_REGISTRY__XML_ELEMENT_DECLS:

+				getXmlElementDecls().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_REGISTRY__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+			case OxmPackage.EXML_REGISTRY__XML_ELEMENT_DECLS:

+				return xmlElementDecls != null && !xmlElementDecls.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlRegistry

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlRootElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlRootElement.java
new file mode 100644
index 0000000000..fae54e244c
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlRootElement.java
@@ -0,0 +1,255 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Root Element</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRootElement#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRootElement#getNamespace <em>Namespace</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlRootElement()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlRootElement extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAMESPACE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected String namespace = NAMESPACE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlRootElement()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_ROOT_ELEMENT;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlRootElement_Name()

+	 * @model

+	 * @generated

+	 */

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRootElement#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ROOT_ELEMENT__NAME, oldName, name));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Namespace</em>' attribute.

+	 * @see #setNamespace(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlRootElement_Namespace()

+	 * @model

+	 * @generated

+	 */

+	public String getNamespace()

+	{

+		return namespace;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRootElement#getNamespace <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Namespace</em>' attribute.

+	 * @see #getNamespace()

+	 * @generated

+	 */

+	public void setNamespace(String newNamespace)

+	{

+		String oldNamespace = namespace;

+		namespace = newNamespace;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_ROOT_ELEMENT__NAMESPACE, oldNamespace, namespace));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ROOT_ELEMENT__NAME:

+				return getName();

+			case OxmPackage.EXML_ROOT_ELEMENT__NAMESPACE:

+				return getNamespace();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ROOT_ELEMENT__NAME:

+				setName((String)newValue);

+				return;

+			case OxmPackage.EXML_ROOT_ELEMENT__NAMESPACE:

+				setNamespace((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ROOT_ELEMENT__NAME:

+				setName(NAME_EDEFAULT);

+				return;

+			case OxmPackage.EXML_ROOT_ELEMENT__NAMESPACE:

+				setNamespace(NAMESPACE_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_ROOT_ELEMENT__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+			case OxmPackage.EXML_ROOT_ELEMENT__NAMESPACE:

+				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(", namespace: ");

+		result.append(namespace);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlRootElement

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlSchema.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlSchema.java
new file mode 100644
index 0000000000..f76d6a7adb
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlSchema.java
@@ -0,0 +1,460 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Schema</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getAttributeFormDefault <em>Attribute Form Default</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getElementFormDefault <em>Element Form Default</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getLocation <em>Location</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getNamespace <em>Namespace</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getXmlns <em>Xmlns</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSchema()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlSchema extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getAttributeFormDefault() <em>Attribute Form Default</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getAttributeFormDefault()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final EXmlNsForm ATTRIBUTE_FORM_DEFAULT_EDEFAULT = EXmlNsForm.UNQUALIFIED;

+	/**

+	 * The cached value of the '{@link #getAttributeFormDefault() <em>Attribute Form Default</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getAttributeFormDefault()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlNsForm attributeFormDefault = ATTRIBUTE_FORM_DEFAULT_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getElementFormDefault() <em>Element Form Default</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getElementFormDefault()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final EXmlNsForm ELEMENT_FORM_DEFAULT_EDEFAULT = EXmlNsForm.UNQUALIFIED;

+	/**

+	 * The cached value of the '{@link #getElementFormDefault() <em>Element Form Default</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getElementFormDefault()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlNsForm elementFormDefault = ELEMENT_FORM_DEFAULT_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getLocation() <em>Location</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getLocation()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String LOCATION_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getLocation() <em>Location</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getLocation()

+	 * @generated

+	 * @ordered

+	 */

+	protected String location = LOCATION_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAMESPACE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected String namespace = NAMESPACE_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlns() <em>Xmlns</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlns()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlNs> xmlns;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlSchema()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_SCHEMA;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Attribute Form Default</b></em>' attribute.

+	 * The literals are from the enumeration {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNsForm}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Attribute Form Default</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Attribute Form Default</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNsForm

+	 * @see #setAttributeFormDefault(EXmlNsForm)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSchema_AttributeFormDefault()

+	 * @model

+	 * @generated

+	 */

+	public EXmlNsForm getAttributeFormDefault()

+	{

+		return attributeFormDefault;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getAttributeFormDefault <em>Attribute Form Default</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Attribute Form Default</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNsForm

+	 * @see #getAttributeFormDefault()

+	 * @generated

+	 */

+	public void setAttributeFormDefault(EXmlNsForm newAttributeFormDefault)

+	{

+		EXmlNsForm oldAttributeFormDefault = attributeFormDefault;

+		attributeFormDefault = newAttributeFormDefault == null ? ATTRIBUTE_FORM_DEFAULT_EDEFAULT : newAttributeFormDefault;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_SCHEMA__ATTRIBUTE_FORM_DEFAULT, oldAttributeFormDefault, attributeFormDefault));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Element Form Default</b></em>' attribute.

+	 * The literals are from the enumeration {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNsForm}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Element Form Default</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Element Form Default</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNsForm

+	 * @see #setElementFormDefault(EXmlNsForm)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSchema_ElementFormDefault()

+	 * @model

+	 * @generated

+	 */

+	public EXmlNsForm getElementFormDefault()

+	{

+		return elementFormDefault;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getElementFormDefault <em>Element Form Default</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Element Form Default</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNsForm

+	 * @see #getElementFormDefault()

+	 * @generated

+	 */

+	public void setElementFormDefault(EXmlNsForm newElementFormDefault)

+	{

+		EXmlNsForm oldElementFormDefault = elementFormDefault;

+		elementFormDefault = newElementFormDefault == null ? ELEMENT_FORM_DEFAULT_EDEFAULT : newElementFormDefault;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_SCHEMA__ELEMENT_FORM_DEFAULT, oldElementFormDefault, elementFormDefault));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Location</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Location</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Location</em>' attribute.

+	 * @see #setLocation(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSchema_Location()

+	 * @model

+	 * @generated

+	 */

+	public String getLocation()

+	{

+		return location;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getLocation <em>Location</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Location</em>' attribute.

+	 * @see #getLocation()

+	 * @generated

+	 */

+	public void setLocation(String newLocation)

+	{

+		String oldLocation = location;

+		location = newLocation;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_SCHEMA__LOCATION, oldLocation, location));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Namespace</em>' attribute.

+	 * @see #setNamespace(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSchema_Namespace()

+	 * @model

+	 * @generated

+	 */

+	public String getNamespace()

+	{

+		return namespace;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getNamespace <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Namespace</em>' attribute.

+	 * @see #getNamespace()

+	 * @generated

+	 */

+	public void setNamespace(String newNamespace)

+	{

+		String oldNamespace = namespace;

+		namespace = newNamespace;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_SCHEMA__NAMESPACE, oldNamespace, namespace));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xmlns</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xmlns</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xmlns</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSchema_Xmlns()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlNs> getXmlns()

+	{

+		if (xmlns == null)

+		{

+			xmlns = new EObjectContainmentEList<EXmlNs>(EXmlNs.class, this, OxmPackage.EXML_SCHEMA__XMLNS);

+		}

+		return xmlns;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_SCHEMA__XMLNS:

+				return ((InternalEList<?>)getXmlns()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_SCHEMA__ATTRIBUTE_FORM_DEFAULT:

+				return getAttributeFormDefault();

+			case OxmPackage.EXML_SCHEMA__ELEMENT_FORM_DEFAULT:

+				return getElementFormDefault();

+			case OxmPackage.EXML_SCHEMA__LOCATION:

+				return getLocation();

+			case OxmPackage.EXML_SCHEMA__NAMESPACE:

+				return getNamespace();

+			case OxmPackage.EXML_SCHEMA__XMLNS:

+				return getXmlns();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_SCHEMA__ATTRIBUTE_FORM_DEFAULT:

+				setAttributeFormDefault((EXmlNsForm)newValue);

+				return;

+			case OxmPackage.EXML_SCHEMA__ELEMENT_FORM_DEFAULT:

+				setElementFormDefault((EXmlNsForm)newValue);

+				return;

+			case OxmPackage.EXML_SCHEMA__LOCATION:

+				setLocation((String)newValue);

+				return;

+			case OxmPackage.EXML_SCHEMA__NAMESPACE:

+				setNamespace((String)newValue);

+				return;

+			case OxmPackage.EXML_SCHEMA__XMLNS:

+				getXmlns().clear();

+				getXmlns().addAll((Collection<? extends EXmlNs>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_SCHEMA__ATTRIBUTE_FORM_DEFAULT:

+				setAttributeFormDefault(ATTRIBUTE_FORM_DEFAULT_EDEFAULT);

+				return;

+			case OxmPackage.EXML_SCHEMA__ELEMENT_FORM_DEFAULT:

+				setElementFormDefault(ELEMENT_FORM_DEFAULT_EDEFAULT);

+				return;

+			case OxmPackage.EXML_SCHEMA__LOCATION:

+				setLocation(LOCATION_EDEFAULT);

+				return;

+			case OxmPackage.EXML_SCHEMA__NAMESPACE:

+				setNamespace(NAMESPACE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_SCHEMA__XMLNS:

+				getXmlns().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_SCHEMA__ATTRIBUTE_FORM_DEFAULT:

+				return attributeFormDefault != ATTRIBUTE_FORM_DEFAULT_EDEFAULT;

+			case OxmPackage.EXML_SCHEMA__ELEMENT_FORM_DEFAULT:

+				return elementFormDefault != ELEMENT_FORM_DEFAULT_EDEFAULT;

+			case OxmPackage.EXML_SCHEMA__LOCATION:

+				return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);

+			case OxmPackage.EXML_SCHEMA__NAMESPACE:

+				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);

+			case OxmPackage.EXML_SCHEMA__XMLNS:

+				return xmlns != null && !xmlns.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (attributeFormDefault: ");

+		result.append(attributeFormDefault);

+		result.append(", elementFormDefault: ");

+		result.append(elementFormDefault);

+		result.append(", location: ");

+		result.append(location);

+		result.append(", namespace: ");

+		result.append(namespace);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlSchema

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlSchemaType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlSchemaType.java
new file mode 100644
index 0000000000..f32845a235
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlSchemaType.java
@@ -0,0 +1,321 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Schema Type</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType#getNamespace <em>Namespace</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType#getType <em>Type</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSchemaType()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlSchemaType extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAMESPACE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected String namespace = NAMESPACE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String type = TYPE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlSchemaType()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_SCHEMA_TYPE;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSchemaType_Name()

+	 * @model

+	 * @generated

+	 */

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_SCHEMA_TYPE__NAME, oldName, name));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Namespace</em>' attribute.

+	 * @see #setNamespace(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSchemaType_Namespace()

+	 * @model

+	 * @generated

+	 */

+	public String getNamespace()

+	{

+		return namespace;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType#getNamespace <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Namespace</em>' attribute.

+	 * @see #getNamespace()

+	 * @generated

+	 */

+	public void setNamespace(String newNamespace)

+	{

+		String oldNamespace = namespace;

+		namespace = newNamespace;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_SCHEMA_TYPE__NAMESPACE, oldNamespace, namespace));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Type</em>' attribute.

+	 * @see #setType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSchemaType_Type()

+	 * @model

+	 * @generated

+	 */

+	public String getType()

+	{

+		return type;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType#getType <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Type</em>' attribute.

+	 * @see #getType()

+	 * @generated

+	 */

+	public void setType(String newType)

+	{

+		String oldType = type;

+		type = newType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_SCHEMA_TYPE__TYPE, oldType, type));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_SCHEMA_TYPE__NAME:

+				return getName();

+			case OxmPackage.EXML_SCHEMA_TYPE__NAMESPACE:

+				return getNamespace();

+			case OxmPackage.EXML_SCHEMA_TYPE__TYPE:

+				return getType();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_SCHEMA_TYPE__NAME:

+				setName((String)newValue);

+				return;

+			case OxmPackage.EXML_SCHEMA_TYPE__NAMESPACE:

+				setNamespace((String)newValue);

+				return;

+			case OxmPackage.EXML_SCHEMA_TYPE__TYPE:

+				setType((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_SCHEMA_TYPE__NAME:

+				setName(NAME_EDEFAULT);

+				return;

+			case OxmPackage.EXML_SCHEMA_TYPE__NAMESPACE:

+				setNamespace(NAMESPACE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_SCHEMA_TYPE__TYPE:

+				setType(TYPE_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_SCHEMA_TYPE__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+			case OxmPackage.EXML_SCHEMA_TYPE__NAMESPACE:

+				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);

+			case OxmPackage.EXML_SCHEMA_TYPE__TYPE:

+				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(", namespace: ");

+		result.append(namespace);

+		result.append(", type: ");

+		result.append(type);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlSchemaType

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransformation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransformation.java
new file mode 100644
index 0000000000..110a7278b9
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransformation.java
@@ -0,0 +1,546 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Transformation</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation#isOptional <em>Optional</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation#getXmlReadTransformer <em>Xml Read Transformer</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation#getXmlWriteTransformers <em>Xml Write Transformers</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlTransformation()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlTransformation extends EJavaAttribute implements EAccessibleJavaAttribute, EPropertyHolder

+{

+	/**

+	 * The cached value of the '{@link #getXmlAccessMethods() <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessMethods xmlAccessMethods;

+	/**

+	 * The cached value of the '{@link #getXmlProperties() <em>Xml Properties</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlProperties()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlProperty> xmlProperties;

+	/**

+	 * The default value of the '{@link #isOptional() <em>Optional</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isOptional()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean OPTIONAL_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isOptional() <em>Optional</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isOptional()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean optional = OPTIONAL_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlReadTransformer() <em>Xml Read Transformer</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlReadTransformer()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlReadTransformer xmlReadTransformer;

+	/**

+	 * The cached value of the '{@link #getXmlWriteTransformers() <em>Xml Write Transformers</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlWriteTransformers()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlWriteTransformer> xmlWriteTransformers;

+

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlTransformation()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_TRANSFORMATION;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Access Methods</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #setXmlAccessMethods(EXmlAccessMethods)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAccessibleJavaAttribute_XmlAccessMethods()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlAccessMethods getXmlAccessMethods()

+	{

+		return xmlAccessMethods;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods, NotificationChain msgs)

+	{

+		EXmlAccessMethods oldXmlAccessMethods = xmlAccessMethods;

+		xmlAccessMethods = newXmlAccessMethods;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_TRANSFORMATION__XML_ACCESS_METHODS, oldXmlAccessMethods, newXmlAccessMethods);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation#getXmlAccessMethods <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 */

+	public void setXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods)

+	{

+		if (newXmlAccessMethods != xmlAccessMethods)

+		{

+			NotificationChain msgs = null;

+			if (xmlAccessMethods != null)

+				msgs = ((InternalEObject)xmlAccessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_TRANSFORMATION__XML_ACCESS_METHODS, null, msgs);

+			if (newXmlAccessMethods != null)

+				msgs = ((InternalEObject)newXmlAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_TRANSFORMATION__XML_ACCESS_METHODS, null, msgs);

+			msgs = basicSetXmlAccessMethods(newXmlAccessMethods, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_TRANSFORMATION__XML_ACCESS_METHODS, newXmlAccessMethods, newXmlAccessMethods));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Properties</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Properties</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder_XmlProperties()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlProperty> getXmlProperties()

+	{

+		if (xmlProperties == null)

+		{

+			xmlProperties = new EObjectContainmentEList<EXmlProperty>(EXmlProperty.class, this, OxmPackage.EXML_TRANSFORMATION__XML_PROPERTIES);

+		}

+		return xmlProperties;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Optional</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Optional</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Optional</em>' attribute.

+	 * @see #setOptional(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlTransformation_Optional()

+	 * @model

+	 * @generated

+	 */

+	public boolean isOptional()

+	{

+		return optional;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation#isOptional <em>Optional</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Optional</em>' attribute.

+	 * @see #isOptional()

+	 * @generated

+	 */

+	public void setOptional(boolean newOptional)

+	{

+		boolean oldOptional = optional;

+		optional = newOptional;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_TRANSFORMATION__OPTIONAL, oldOptional, optional));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Read Transformer</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Read Transformer</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Read Transformer</em>' containment reference.

+	 * @see #setXmlReadTransformer(EXmlReadTransformer)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlTransformation_XmlReadTransformer()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlReadTransformer getXmlReadTransformer()

+	{

+		return xmlReadTransformer;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlReadTransformer(EXmlReadTransformer newXmlReadTransformer, NotificationChain msgs)

+	{

+		EXmlReadTransformer oldXmlReadTransformer = xmlReadTransformer;

+		xmlReadTransformer = newXmlReadTransformer;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_TRANSFORMATION__XML_READ_TRANSFORMER, oldXmlReadTransformer, newXmlReadTransformer);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation#getXmlReadTransformer <em>Xml Read Transformer</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Read Transformer</em>' containment reference.

+	 * @see #getXmlReadTransformer()

+	 * @generated

+	 */

+	public void setXmlReadTransformer(EXmlReadTransformer newXmlReadTransformer)

+	{

+		if (newXmlReadTransformer != xmlReadTransformer)

+		{

+			NotificationChain msgs = null;

+			if (xmlReadTransformer != null)

+				msgs = ((InternalEObject)xmlReadTransformer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_TRANSFORMATION__XML_READ_TRANSFORMER, null, msgs);

+			if (newXmlReadTransformer != null)

+				msgs = ((InternalEObject)newXmlReadTransformer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_TRANSFORMATION__XML_READ_TRANSFORMER, null, msgs);

+			msgs = basicSetXmlReadTransformer(newXmlReadTransformer, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_TRANSFORMATION__XML_READ_TRANSFORMER, newXmlReadTransformer, newXmlReadTransformer));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Write Transformers</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlWriteTransformer}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Write Transformers</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Write Transformers</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlTransformation_XmlWriteTransformers()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlWriteTransformer> getXmlWriteTransformers()

+	{

+		if (xmlWriteTransformers == null)

+		{

+			xmlWriteTransformers = new EObjectContainmentEList<EXmlWriteTransformer>(EXmlWriteTransformer.class, this, OxmPackage.EXML_TRANSFORMATION__XML_WRITE_TRANSFORMERS);

+		}

+		return xmlWriteTransformers;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_TRANSFORMATION__XML_ACCESS_METHODS:

+				return basicSetXmlAccessMethods(null, msgs);

+			case OxmPackage.EXML_TRANSFORMATION__XML_PROPERTIES:

+				return ((InternalEList<?>)getXmlProperties()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EXML_TRANSFORMATION__XML_READ_TRANSFORMER:

+				return basicSetXmlReadTransformer(null, msgs);

+			case OxmPackage.EXML_TRANSFORMATION__XML_WRITE_TRANSFORMERS:

+				return ((InternalEList<?>)getXmlWriteTransformers()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_TRANSFORMATION__XML_ACCESS_METHODS:

+				return getXmlAccessMethods();

+			case OxmPackage.EXML_TRANSFORMATION__XML_PROPERTIES:

+				return getXmlProperties();

+			case OxmPackage.EXML_TRANSFORMATION__OPTIONAL:

+				return isOptional();

+			case OxmPackage.EXML_TRANSFORMATION__XML_READ_TRANSFORMER:

+				return getXmlReadTransformer();

+			case OxmPackage.EXML_TRANSFORMATION__XML_WRITE_TRANSFORMERS:

+				return getXmlWriteTransformers();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_TRANSFORMATION__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)newValue);

+				return;

+			case OxmPackage.EXML_TRANSFORMATION__XML_PROPERTIES:

+				getXmlProperties().clear();

+				getXmlProperties().addAll((Collection<? extends EXmlProperty>)newValue);

+				return;

+			case OxmPackage.EXML_TRANSFORMATION__OPTIONAL:

+				setOptional((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_TRANSFORMATION__XML_READ_TRANSFORMER:

+				setXmlReadTransformer((EXmlReadTransformer)newValue);

+				return;

+			case OxmPackage.EXML_TRANSFORMATION__XML_WRITE_TRANSFORMERS:

+				getXmlWriteTransformers().clear();

+				getXmlWriteTransformers().addAll((Collection<? extends EXmlWriteTransformer>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_TRANSFORMATION__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)null);

+				return;

+			case OxmPackage.EXML_TRANSFORMATION__XML_PROPERTIES:

+				getXmlProperties().clear();

+				return;

+			case OxmPackage.EXML_TRANSFORMATION__OPTIONAL:

+				setOptional(OPTIONAL_EDEFAULT);

+				return;

+			case OxmPackage.EXML_TRANSFORMATION__XML_READ_TRANSFORMER:

+				setXmlReadTransformer((EXmlReadTransformer)null);

+				return;

+			case OxmPackage.EXML_TRANSFORMATION__XML_WRITE_TRANSFORMERS:

+				getXmlWriteTransformers().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_TRANSFORMATION__XML_ACCESS_METHODS:

+				return xmlAccessMethods != null;

+			case OxmPackage.EXML_TRANSFORMATION__XML_PROPERTIES:

+				return xmlProperties != null && !xmlProperties.isEmpty();

+			case OxmPackage.EXML_TRANSFORMATION__OPTIONAL:

+				return optional != OPTIONAL_EDEFAULT;

+			case OxmPackage.EXML_TRANSFORMATION__XML_READ_TRANSFORMER:

+				return xmlReadTransformer != null;

+			case OxmPackage.EXML_TRANSFORMATION__XML_WRITE_TRANSFORMERS:

+				return xmlWriteTransformers != null && !xmlWriteTransformers.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)

+	{

+		if (baseClass == EAccessibleJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_TRANSFORMATION__XML_ACCESS_METHODS: return OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_TRANSFORMATION__XML_PROPERTIES: return OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES;

+				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 == EAccessibleJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS: return OxmPackage.EXML_TRANSFORMATION__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES: return OxmPackage.EXML_TRANSFORMATION__XML_PROPERTIES;

+				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(" (optional: ");

+		result.append(optional);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlTransformationTranslator

+			extends AbstractJavaAttributeTranslator {

+		

+		XmlTransformationTranslator(String domPathAndName, EStructuralFeature eStructuralFeature) {

+			super(domPathAndName, eStructuralFeature, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlTransformation();

+		}

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransient.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransient.java
new file mode 100644
index 0000000000..f39adc6d70
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlTransient.java
@@ -0,0 +1,217 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Transient</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransient#isXmlLocation <em>Xml Location</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlTransient()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlTransient extends EJavaAttribute

+{

+	/**

+	 * The default value of the '{@link #isXmlLocation() <em>Xml Location</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlLocation()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean XML_LOCATION_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isXmlLocation() <em>Xml Location</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isXmlLocation()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean xmlLocation = XML_LOCATION_EDEFAULT;

+

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlTransient()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_TRANSIENT;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Xml Location</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Location</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Location</em>' attribute.

+	 * @see #setXmlLocation(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlTransient_XmlLocation()

+	 * @model

+	 * @generated

+	 */

+	public boolean isXmlLocation()

+	{

+		return xmlLocation;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransient#isXmlLocation <em>Xml Location</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Location</em>' attribute.

+	 * @see #isXmlLocation()

+	 * @generated

+	 */

+	public void setXmlLocation(boolean newXmlLocation)

+	{

+		boolean oldXmlLocation = xmlLocation;

+		xmlLocation = newXmlLocation;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_TRANSIENT__XML_LOCATION, oldXmlLocation, xmlLocation));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_TRANSIENT__XML_LOCATION:

+				return isXmlLocation();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_TRANSIENT__XML_LOCATION:

+				setXmlLocation((Boolean)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_TRANSIENT__XML_LOCATION:

+				setXmlLocation(XML_LOCATION_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_TRANSIENT__XML_LOCATION:

+				return xmlLocation != XML_LOCATION_EDEFAULT;

+		}

+		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(" (xmlLocation: ");

+		result.append(xmlLocation);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlTransientTranslator

+			extends AbstractJavaAttributeTranslator {

+		

+		XmlTransientTranslator(String domPathAndName, EStructuralFeature eStructuralFeature) {

+			super(domPathAndName, eStructuralFeature, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlTransient();

+		}

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlType.java
new file mode 100644
index 0000000000..fd1d3d413a
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlType.java
@@ -0,0 +1,466 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.List;

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Type</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getNamespace <em>Namespace</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getFactoryClass <em>Factory Class</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getFactoryMethod <em>Factory Method</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getPropOrder <em>Prop Order</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlType()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlType extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAMESPACE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected String namespace = NAMESPACE_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getFactoryClass() <em>Factory Class</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getFactoryClass()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String FACTORY_CLASS_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getFactoryClass() <em>Factory Class</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getFactoryClass()

+	 * @generated

+	 * @ordered

+	 */

+	protected String factoryClass = FACTORY_CLASS_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getFactoryMethod() <em>Factory Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getFactoryMethod()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String FACTORY_METHOD_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getFactoryMethod() <em>Factory Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getFactoryMethod()

+	 * @generated

+	 * @ordered

+	 */

+	protected String factoryMethod = FACTORY_METHOD_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getPropOrder() <em>Prop Order</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getPropOrder()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final List<String> PROP_ORDER_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getPropOrder() <em>Prop Order</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getPropOrder()

+	 * @generated

+	 * @ordered

+	 */

+	protected List<String> propOrder = PROP_ORDER_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlType()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_TYPE;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlType_Name()

+	 * @model

+	 * @generated

+	 */

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_TYPE__NAME, oldName, name));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Namespace</em>' attribute.

+	 * @see #setNamespace(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlType_Namespace()

+	 * @model

+	 * @generated

+	 */

+	public String getNamespace()

+	{

+		return namespace;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getNamespace <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Namespace</em>' attribute.

+	 * @see #getNamespace()

+	 * @generated

+	 */

+	public void setNamespace(String newNamespace)

+	{

+		String oldNamespace = namespace;

+		namespace = newNamespace;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_TYPE__NAMESPACE, oldNamespace, namespace));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Factory Class</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Factory Class</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Factory Class</em>' attribute.

+	 * @see #setFactoryClass(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlType_FactoryClass()

+	 * @model

+	 * @generated

+	 */

+	public String getFactoryClass()

+	{

+		return factoryClass;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getFactoryClass <em>Factory Class</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Factory Class</em>' attribute.

+	 * @see #getFactoryClass()

+	 * @generated

+	 */

+	public void setFactoryClass(String newFactoryClass)

+	{

+		String oldFactoryClass = factoryClass;

+		factoryClass = newFactoryClass;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_TYPE__FACTORY_CLASS, oldFactoryClass, factoryClass));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Factory Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Factory Method</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Factory Method</em>' attribute.

+	 * @see #setFactoryMethod(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlType_FactoryMethod()

+	 * @model

+	 * @generated

+	 */

+	public String getFactoryMethod()

+	{

+		return factoryMethod;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getFactoryMethod <em>Factory Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Factory Method</em>' attribute.

+	 * @see #getFactoryMethod()

+	 * @generated

+	 */

+	public void setFactoryMethod(String newFactoryMethod)

+	{

+		String oldFactoryMethod = factoryMethod;

+		factoryMethod = newFactoryMethod;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_TYPE__FACTORY_METHOD, oldFactoryMethod, factoryMethod));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Prop Order</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Prop Order</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Prop Order</em>' attribute.

+	 * @see #setPropOrder(List)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlType_PropOrder()

+	 * @model dataType="org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EPropOrder" many="false"

+	 * @generated

+	 */

+	public List<String> getPropOrder()

+	{

+		return propOrder;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getPropOrder <em>Prop Order</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Prop Order</em>' attribute.

+	 * @see #getPropOrder()

+	 * @generated

+	 */

+	public void setPropOrder(List<String> newPropOrder)

+	{

+		List<String> oldPropOrder = propOrder;

+		propOrder = newPropOrder;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_TYPE__PROP_ORDER, oldPropOrder, propOrder));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_TYPE__NAME:

+				return getName();

+			case OxmPackage.EXML_TYPE__NAMESPACE:

+				return getNamespace();

+			case OxmPackage.EXML_TYPE__FACTORY_CLASS:

+				return getFactoryClass();

+			case OxmPackage.EXML_TYPE__FACTORY_METHOD:

+				return getFactoryMethod();

+			case OxmPackage.EXML_TYPE__PROP_ORDER:

+				return getPropOrder();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_TYPE__NAME:

+				setName((String)newValue);

+				return;

+			case OxmPackage.EXML_TYPE__NAMESPACE:

+				setNamespace((String)newValue);

+				return;

+			case OxmPackage.EXML_TYPE__FACTORY_CLASS:

+				setFactoryClass((String)newValue);

+				return;

+			case OxmPackage.EXML_TYPE__FACTORY_METHOD:

+				setFactoryMethod((String)newValue);

+				return;

+			case OxmPackage.EXML_TYPE__PROP_ORDER:

+				setPropOrder((List<String>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_TYPE__NAME:

+				setName(NAME_EDEFAULT);

+				return;

+			case OxmPackage.EXML_TYPE__NAMESPACE:

+				setNamespace(NAMESPACE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_TYPE__FACTORY_CLASS:

+				setFactoryClass(FACTORY_CLASS_EDEFAULT);

+				return;

+			case OxmPackage.EXML_TYPE__FACTORY_METHOD:

+				setFactoryMethod(FACTORY_METHOD_EDEFAULT);

+				return;

+			case OxmPackage.EXML_TYPE__PROP_ORDER:

+				setPropOrder(PROP_ORDER_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_TYPE__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+			case OxmPackage.EXML_TYPE__NAMESPACE:

+				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);

+			case OxmPackage.EXML_TYPE__FACTORY_CLASS:

+				return FACTORY_CLASS_EDEFAULT == null ? factoryClass != null : !FACTORY_CLASS_EDEFAULT.equals(factoryClass);

+			case OxmPackage.EXML_TYPE__FACTORY_METHOD:

+				return FACTORY_METHOD_EDEFAULT == null ? factoryMethod != null : !FACTORY_METHOD_EDEFAULT.equals(factoryMethod);

+			case OxmPackage.EXML_TYPE__PROP_ORDER:

+				return PROP_ORDER_EDEFAULT == null ? propOrder != null : !PROP_ORDER_EDEFAULT.equals(propOrder);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(", namespace: ");

+		result.append(namespace);

+		result.append(", factoryClass: ");

+		result.append(factoryClass);

+		result.append(", factoryMethod: ");

+		result.append(factoryMethod);

+		result.append(", propOrder: ");

+		result.append(propOrder);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlType

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlValue.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlValue.java
new file mode 100644
index 0000000000..66897da10f
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlValue.java
@@ -0,0 +1,907 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Collection;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.wst.common.internal.emf.resource.Translator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Value</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue#isCdata <em>Cdata</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue#getXmlAbstractNullPolicy <em>Xml Abstract Null Policy</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlValue()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlValue extends EJavaAttribute implements EAccessibleJavaAttribute, EAdaptableJavaAttribute, EContainerJavaAttribute, EReadWriteJavaAttribute, ETypedJavaAttribute, EPropertyHolder

+{

+	/**

+	 * The cached value of the '{@link #getXmlAccessMethods() <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlAccessMethods xmlAccessMethods;

+	/**

+	 * The cached value of the '{@link #getXmlJavaTypeAdapter() <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlJavaTypeAdapter xmlJavaTypeAdapter;

+	/**

+	 * The default value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String CONTAINER_TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getContainerType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String containerType = CONTAINER_TYPE_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean READ_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isReadOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean readOnly = READ_ONLY_EDEFAULT;

+	/**

+	 * The default value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean WRITE_ONLY_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isWriteOnly() <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isWriteOnly()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean writeOnly = WRITE_ONLY_EDEFAULT;

+	/**

+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String TYPE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String type = TYPE_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlProperties() <em>Xml Properties</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlProperties()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EXmlProperty> xmlProperties;

+	/**

+	 * The default value of the '{@link #isCdata() <em>Cdata</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isCdata()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean CDATA_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isCdata() <em>Cdata</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isCdata()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean cdata = CDATA_EDEFAULT;

+	/**

+	 * The cached value of the '{@link #getXmlAbstractNullPolicy() <em>Xml Abstract Null Policy</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlAbstractNullPolicy()

+	 * @generated

+	 * @ordered

+	 */

+	protected EAbstractXmlNullPolicy xmlAbstractNullPolicy;

+

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlValue()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_VALUE;

+	}

+	

+	

+	/**

+	 * Returns the value of the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Access Methods</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #setXmlAccessMethods(EXmlAccessMethods)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAccessibleJavaAttribute_XmlAccessMethods()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlAccessMethods getXmlAccessMethods()

+	{

+		return xmlAccessMethods;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods, NotificationChain msgs)

+	{

+		EXmlAccessMethods oldXmlAccessMethods = xmlAccessMethods;

+		xmlAccessMethods = newXmlAccessMethods;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_VALUE__XML_ACCESS_METHODS, oldXmlAccessMethods, newXmlAccessMethods);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue#getXmlAccessMethods <em>Xml Access Methods</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Access Methods</em>' containment reference.

+	 * @see #getXmlAccessMethods()

+	 * @generated

+	 */

+	public void setXmlAccessMethods(EXmlAccessMethods newXmlAccessMethods)

+	{

+		if (newXmlAccessMethods != xmlAccessMethods)

+		{

+			NotificationChain msgs = null;

+			if (xmlAccessMethods != null)

+				msgs = ((InternalEObject)xmlAccessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_VALUE__XML_ACCESS_METHODS, null, msgs);

+			if (newXmlAccessMethods != null)

+				msgs = ((InternalEObject)newXmlAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_VALUE__XML_ACCESS_METHODS, null, msgs);

+			msgs = basicSetXmlAccessMethods(newXmlAccessMethods, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_VALUE__XML_ACCESS_METHODS, newXmlAccessMethods, newXmlAccessMethods));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Java Type Adapter</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #setXmlJavaTypeAdapter(EXmlJavaTypeAdapter)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAdaptableJavaAttribute_XmlJavaTypeAdapter()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EXmlJavaTypeAdapter getXmlJavaTypeAdapter()

+	{

+		return xmlJavaTypeAdapter;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlJavaTypeAdapter(EXmlJavaTypeAdapter newXmlJavaTypeAdapter, NotificationChain msgs)

+	{

+		EXmlJavaTypeAdapter oldXmlJavaTypeAdapter = xmlJavaTypeAdapter;

+		xmlJavaTypeAdapter = newXmlJavaTypeAdapter;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_VALUE__XML_JAVA_TYPE_ADAPTER, oldXmlJavaTypeAdapter, newXmlJavaTypeAdapter);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue#getXmlJavaTypeAdapter <em>Xml Java Type Adapter</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Java Type Adapter</em>' containment reference.

+	 * @see #getXmlJavaTypeAdapter()

+	 * @generated

+	 */

+	public void setXmlJavaTypeAdapter(EXmlJavaTypeAdapter newXmlJavaTypeAdapter)

+	{

+		if (newXmlJavaTypeAdapter != xmlJavaTypeAdapter)

+		{

+			NotificationChain msgs = null;

+			if (xmlJavaTypeAdapter != null)

+				msgs = ((InternalEObject)xmlJavaTypeAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_VALUE__XML_JAVA_TYPE_ADAPTER, null, msgs);

+			if (newXmlJavaTypeAdapter != null)

+				msgs = ((InternalEObject)newXmlJavaTypeAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_VALUE__XML_JAVA_TYPE_ADAPTER, null, msgs);

+			msgs = basicSetXmlJavaTypeAdapter(newXmlJavaTypeAdapter, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_VALUE__XML_JAVA_TYPE_ADAPTER, newXmlJavaTypeAdapter, newXmlJavaTypeAdapter));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Container Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Container Type</em>' attribute.

+	 * @see #setContainerType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEContainerJavaAttribute_ContainerType()

+	 * @model

+	 * @generated

+	 */

+	public String getContainerType()

+	{

+		return containerType;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue#getContainerType <em>Container Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Container Type</em>' attribute.

+	 * @see #getContainerType()

+	 * @generated

+	 */

+	public void setContainerType(String newContainerType)

+	{

+		String oldContainerType = containerType;

+		containerType = newContainerType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_VALUE__CONTAINER_TYPE, oldContainerType, containerType));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Read Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Read Only</em>' attribute.

+	 * @see #setReadOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_ReadOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isReadOnly()

+	{

+		return readOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue#isReadOnly <em>Read Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Read Only</em>' attribute.

+	 * @see #isReadOnly()

+	 * @generated

+	 */

+	public void setReadOnly(boolean newReadOnly)

+	{

+		boolean oldReadOnly = readOnly;

+		readOnly = newReadOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_VALUE__READ_ONLY, oldReadOnly, readOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Write Only</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Write Only</em>' attribute.

+	 * @see #setWriteOnly(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute_WriteOnly()

+	 * @model

+	 * @generated

+	 */

+	public boolean isWriteOnly()

+	{

+		return writeOnly;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue#isWriteOnly <em>Write Only</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Write Only</em>' attribute.

+	 * @see #isWriteOnly()

+	 * @generated

+	 */

+	public void setWriteOnly(boolean newWriteOnly)

+	{

+		boolean oldWriteOnly = writeOnly;

+		writeOnly = newWriteOnly;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_VALUE__WRITE_ONLY, oldWriteOnly, writeOnly));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Type</em>' attribute.

+	 * @see #setType(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getETypedJavaAttribute_Type()

+	 * @model

+	 * @generated

+	 */

+	public String getType()

+	{

+		return type;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue#getType <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Type</em>' attribute.

+	 * @see #getType()

+	 * @generated

+	 */

+	public void setType(String newType)

+	{

+		String oldType = type;

+		type = newType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_VALUE__TYPE, oldType, type));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Properties</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Properties</em>' containment reference list.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder_XmlProperties()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EList<EXmlProperty> getXmlProperties()

+	{

+		if (xmlProperties == null)

+		{

+			xmlProperties = new EObjectContainmentEList<EXmlProperty>(EXmlProperty.class, this, OxmPackage.EXML_VALUE__XML_PROPERTIES);

+		}

+		return xmlProperties;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Cdata</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Cdata</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Cdata</em>' attribute.

+	 * @see #setCdata(boolean)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlValue_Cdata()

+	 * @model

+	 * @generated

+	 */

+	public boolean isCdata()

+	{

+		return cdata;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue#isCdata <em>Cdata</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Cdata</em>' attribute.

+	 * @see #isCdata()

+	 * @generated

+	 */

+	public void setCdata(boolean newCdata)

+	{

+		boolean oldCdata = cdata;

+		cdata = newCdata;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_VALUE__CDATA, oldCdata, cdata));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Abstract Null Policy</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Abstract Null Policy</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Abstract Null Policy</em>' containment reference.

+	 * @see #setXmlAbstractNullPolicy(EAbstractXmlNullPolicy)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlValue_XmlAbstractNullPolicy()

+	 * @model containment="true"

+	 * @generated

+	 */

+	public EAbstractXmlNullPolicy getXmlAbstractNullPolicy()

+	{

+		return xmlAbstractNullPolicy;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetXmlAbstractNullPolicy(EAbstractXmlNullPolicy newXmlAbstractNullPolicy, NotificationChain msgs)

+	{

+		EAbstractXmlNullPolicy oldXmlAbstractNullPolicy = xmlAbstractNullPolicy;

+		xmlAbstractNullPolicy = newXmlAbstractNullPolicy;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_VALUE__XML_ABSTRACT_NULL_POLICY, oldXmlAbstractNullPolicy, newXmlAbstractNullPolicy);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue#getXmlAbstractNullPolicy <em>Xml Abstract Null Policy</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Abstract Null Policy</em>' containment reference.

+	 * @see #getXmlAbstractNullPolicy()

+	 * @generated

+	 */

+	public void setXmlAbstractNullPolicy(EAbstractXmlNullPolicy newXmlAbstractNullPolicy)

+	{

+		if (newXmlAbstractNullPolicy != xmlAbstractNullPolicy)

+		{

+			NotificationChain msgs = null;

+			if (xmlAbstractNullPolicy != null)

+				msgs = ((InternalEObject)xmlAbstractNullPolicy).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_VALUE__XML_ABSTRACT_NULL_POLICY, null, msgs);

+			if (newXmlAbstractNullPolicy != null)

+				msgs = ((InternalEObject)newXmlAbstractNullPolicy).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OxmPackage.EXML_VALUE__XML_ABSTRACT_NULL_POLICY, null, msgs);

+			msgs = basicSetXmlAbstractNullPolicy(newXmlAbstractNullPolicy, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_VALUE__XML_ABSTRACT_NULL_POLICY, newXmlAbstractNullPolicy, newXmlAbstractNullPolicy));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_VALUE__XML_ACCESS_METHODS:

+				return basicSetXmlAccessMethods(null, msgs);

+			case OxmPackage.EXML_VALUE__XML_JAVA_TYPE_ADAPTER:

+				return basicSetXmlJavaTypeAdapter(null, msgs);

+			case OxmPackage.EXML_VALUE__XML_PROPERTIES:

+				return ((InternalEList<?>)getXmlProperties()).basicRemove(otherEnd, msgs);

+			case OxmPackage.EXML_VALUE__XML_ABSTRACT_NULL_POLICY:

+				return basicSetXmlAbstractNullPolicy(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_VALUE__XML_ACCESS_METHODS:

+				return getXmlAccessMethods();

+			case OxmPackage.EXML_VALUE__XML_JAVA_TYPE_ADAPTER:

+				return getXmlJavaTypeAdapter();

+			case OxmPackage.EXML_VALUE__CONTAINER_TYPE:

+				return getContainerType();

+			case OxmPackage.EXML_VALUE__READ_ONLY:

+				return isReadOnly();

+			case OxmPackage.EXML_VALUE__WRITE_ONLY:

+				return isWriteOnly();

+			case OxmPackage.EXML_VALUE__TYPE:

+				return getType();

+			case OxmPackage.EXML_VALUE__XML_PROPERTIES:

+				return getXmlProperties();

+			case OxmPackage.EXML_VALUE__CDATA:

+				return isCdata();

+			case OxmPackage.EXML_VALUE__XML_ABSTRACT_NULL_POLICY:

+				return getXmlAbstractNullPolicy();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_VALUE__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)newValue);

+				return;

+			case OxmPackage.EXML_VALUE__XML_JAVA_TYPE_ADAPTER:

+				setXmlJavaTypeAdapter((EXmlJavaTypeAdapter)newValue);

+				return;

+			case OxmPackage.EXML_VALUE__CONTAINER_TYPE:

+				setContainerType((String)newValue);

+				return;

+			case OxmPackage.EXML_VALUE__READ_ONLY:

+				setReadOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_VALUE__WRITE_ONLY:

+				setWriteOnly((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_VALUE__TYPE:

+				setType((String)newValue);

+				return;

+			case OxmPackage.EXML_VALUE__XML_PROPERTIES:

+				getXmlProperties().clear();

+				getXmlProperties().addAll((Collection<? extends EXmlProperty>)newValue);

+				return;

+			case OxmPackage.EXML_VALUE__CDATA:

+				setCdata((Boolean)newValue);

+				return;

+			case OxmPackage.EXML_VALUE__XML_ABSTRACT_NULL_POLICY:

+				setXmlAbstractNullPolicy((EAbstractXmlNullPolicy)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_VALUE__XML_ACCESS_METHODS:

+				setXmlAccessMethods((EXmlAccessMethods)null);

+				return;

+			case OxmPackage.EXML_VALUE__XML_JAVA_TYPE_ADAPTER:

+				setXmlJavaTypeAdapter((EXmlJavaTypeAdapter)null);

+				return;

+			case OxmPackage.EXML_VALUE__CONTAINER_TYPE:

+				setContainerType(CONTAINER_TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_VALUE__READ_ONLY:

+				setReadOnly(READ_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_VALUE__WRITE_ONLY:

+				setWriteOnly(WRITE_ONLY_EDEFAULT);

+				return;

+			case OxmPackage.EXML_VALUE__TYPE:

+				setType(TYPE_EDEFAULT);

+				return;

+			case OxmPackage.EXML_VALUE__XML_PROPERTIES:

+				getXmlProperties().clear();

+				return;

+			case OxmPackage.EXML_VALUE__CDATA:

+				setCdata(CDATA_EDEFAULT);

+				return;

+			case OxmPackage.EXML_VALUE__XML_ABSTRACT_NULL_POLICY:

+				setXmlAbstractNullPolicy((EAbstractXmlNullPolicy)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_VALUE__XML_ACCESS_METHODS:

+				return xmlAccessMethods != null;

+			case OxmPackage.EXML_VALUE__XML_JAVA_TYPE_ADAPTER:

+				return xmlJavaTypeAdapter != null;

+			case OxmPackage.EXML_VALUE__CONTAINER_TYPE:

+				return CONTAINER_TYPE_EDEFAULT == null ? containerType != null : !CONTAINER_TYPE_EDEFAULT.equals(containerType);

+			case OxmPackage.EXML_VALUE__READ_ONLY:

+				return readOnly != READ_ONLY_EDEFAULT;

+			case OxmPackage.EXML_VALUE__WRITE_ONLY:

+				return writeOnly != WRITE_ONLY_EDEFAULT;

+			case OxmPackage.EXML_VALUE__TYPE:

+				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

+			case OxmPackage.EXML_VALUE__XML_PROPERTIES:

+				return xmlProperties != null && !xmlProperties.isEmpty();

+			case OxmPackage.EXML_VALUE__CDATA:

+				return cdata != CDATA_EDEFAULT;

+			case OxmPackage.EXML_VALUE__XML_ABSTRACT_NULL_POLICY:

+				return xmlAbstractNullPolicy != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)

+	{

+		if (baseClass == EAccessibleJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_VALUE__XML_ACCESS_METHODS: return OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EAdaptableJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_VALUE__XML_JAVA_TYPE_ADAPTER: return OxmPackage.EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_VALUE__CONTAINER_TYPE: return OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_VALUE__READ_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY;

+				case OxmPackage.EXML_VALUE__WRITE_ONLY: return OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY;

+				default: return -1;

+			}

+		}

+		if (baseClass == ETypedJavaAttribute.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_VALUE__TYPE: return OxmPackage.ETYPED_JAVA_ATTRIBUTE__TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (derivedFeatureID)

+			{

+				case OxmPackage.EXML_VALUE__XML_PROPERTIES: return OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES;

+				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 == EAccessibleJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS: return OxmPackage.EXML_VALUE__XML_ACCESS_METHODS;

+				default: return -1;

+			}

+		}

+		if (baseClass == EAdaptableJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER: return OxmPackage.EXML_VALUE__XML_JAVA_TYPE_ADAPTER;

+				default: return -1;

+			}

+		}

+		if (baseClass == EContainerJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE: return OxmPackage.EXML_VALUE__CONTAINER_TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EReadWriteJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY: return OxmPackage.EXML_VALUE__READ_ONLY;

+				case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY: return OxmPackage.EXML_VALUE__WRITE_ONLY;

+				default: return -1;

+			}

+		}

+		if (baseClass == ETypedJavaAttribute.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.ETYPED_JAVA_ATTRIBUTE__TYPE: return OxmPackage.EXML_VALUE__TYPE;

+				default: return -1;

+			}

+		}

+		if (baseClass == EPropertyHolder.class)

+		{

+			switch (baseFeatureID)

+			{

+				case OxmPackage.EPROPERTY_HOLDER__XML_PROPERTIES: return OxmPackage.EXML_VALUE__XML_PROPERTIES;

+				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(" (containerType: ");

+		result.append(containerType);

+		result.append(", readOnly: ");

+		result.append(readOnly);

+		result.append(", writeOnly: ");

+		result.append(writeOnly);

+		result.append(", type: ");

+		result.append(type);

+		result.append(", cdata: ");

+		result.append(cdata);

+		result.append(')');

+		return result.toString();

+	}

+

+

+	// ***** translators *****

+	

+	static class XmlValueTranslator

+			extends AbstractJavaAttributeTranslator {

+		

+		XmlValueTranslator(String domPathAndName, EStructuralFeature eStructuralFeature) {

+			super(domPathAndName, eStructuralFeature, buildTranslatorChildren());

+		}

+		

+		private static Translator[] buildTranslatorChildren() {

+			return new Translator[] {

+			};

+		}

+		

+		@Override

+		public EObject createEMFObject(String nodeName, String readAheadName) {

+			return OxmFactory.eINSTANCE.createEXmlValue();

+		}

+	}

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlVirtualAccessMethods.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlVirtualAccessMethods.java
new file mode 100644
index 0000000000..727f1d436e
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlVirtualAccessMethods.java
@@ -0,0 +1,331 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;

+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Virtual Access Methods</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods#getGetMethod <em>Get Method</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods#getSetMethod <em>Set Method</em>}</li>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods#getSchema <em>Schema</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlVirtualAccessMethods()

+ * @model kind="class"

+ * @extends EBaseObject

+ * @generated

+ */

+public class EXmlVirtualAccessMethods extends EBaseObjectImpl implements EBaseObject

+{

+	/**

+	 * The default value of the '{@link #getGetMethod() <em>Get Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getGetMethod()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String GET_METHOD_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getGetMethod() <em>Get Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getGetMethod()

+	 * @generated

+	 * @ordered

+	 */

+	protected String getMethod = GET_METHOD_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getSetMethod() <em>Set Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getSetMethod()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String SET_METHOD_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getSetMethod() <em>Set Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getSetMethod()

+	 * @generated

+	 * @ordered

+	 */

+	protected String setMethod = SET_METHOD_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getSchema() <em>Schema</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getSchema()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final EXmlVirtualAccessMethodsSchema SCHEMA_EDEFAULT = EXmlVirtualAccessMethodsSchema.NODES;

+

+	/**

+	 * The cached value of the '{@link #getSchema() <em>Schema</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getSchema()

+	 * @generated

+	 * @ordered

+	 */

+	protected EXmlVirtualAccessMethodsSchema schema = SCHEMA_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlVirtualAccessMethods()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_VIRTUAL_ACCESS_METHODS;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Get Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Get Method</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Get Method</em>' attribute.

+	 * @see #setGetMethod(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlVirtualAccessMethods_GetMethod()

+	 * @model

+	 * @generated

+	 */

+	public String getGetMethod()

+	{

+		return getMethod;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods#getGetMethod <em>Get Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Get Method</em>' attribute.

+	 * @see #getGetMethod()

+	 * @generated

+	 */

+	public void setGetMethod(String newGetMethod)

+	{

+		String oldGetMethod = getMethod;

+		getMethod = newGetMethod;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__GET_METHOD, oldGetMethod, getMethod));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Set Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Set Method</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Set Method</em>' attribute.

+	 * @see #setSetMethod(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlVirtualAccessMethods_SetMethod()

+	 * @model

+	 * @generated

+	 */

+	public String getSetMethod()

+	{

+		return setMethod;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods#getSetMethod <em>Set Method</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Set Method</em>' attribute.

+	 * @see #getSetMethod()

+	 * @generated

+	 */

+	public void setSetMethod(String newSetMethod)

+	{

+		String oldSetMethod = setMethod;

+		setMethod = newSetMethod;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__SET_METHOD, oldSetMethod, setMethod));

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Schema</b></em>' attribute.

+	 * The literals are from the enumeration {@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethodsSchema}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Schema</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Schema</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethodsSchema

+	 * @see #setSchema(EXmlVirtualAccessMethodsSchema)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlVirtualAccessMethods_Schema()

+	 * @model

+	 * @generated

+	 */

+	public EXmlVirtualAccessMethodsSchema getSchema()

+	{

+		return schema;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods#getSchema <em>Schema</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Schema</em>' attribute.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethodsSchema

+	 * @see #getSchema()

+	 * @generated

+	 */

+	public void setSchema(EXmlVirtualAccessMethodsSchema newSchema)

+	{

+		EXmlVirtualAccessMethodsSchema oldSchema = schema;

+		schema = newSchema == null ? SCHEMA_EDEFAULT : newSchema;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__SCHEMA, oldSchema, schema));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__GET_METHOD:

+				return getGetMethod();

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__SET_METHOD:

+				return getSetMethod();

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__SCHEMA:

+				return getSchema();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__GET_METHOD:

+				setGetMethod((String)newValue);

+				return;

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__SET_METHOD:

+				setSetMethod((String)newValue);

+				return;

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__SCHEMA:

+				setSchema((EXmlVirtualAccessMethodsSchema)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__GET_METHOD:

+				setGetMethod(GET_METHOD_EDEFAULT);

+				return;

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__SET_METHOD:

+				setSetMethod(SET_METHOD_EDEFAULT);

+				return;

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__SCHEMA:

+				setSchema(SCHEMA_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__GET_METHOD:

+				return GET_METHOD_EDEFAULT == null ? getMethod != null : !GET_METHOD_EDEFAULT.equals(getMethod);

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__SET_METHOD:

+				return SET_METHOD_EDEFAULT == null ? setMethod != null : !SET_METHOD_EDEFAULT.equals(setMethod);

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS__SCHEMA:

+				return schema != SCHEMA_EDEFAULT;

+		}

+		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(" (getMethod: ");

+		result.append(getMethod);

+		result.append(", setMethod: ");

+		result.append(setMethod);

+		result.append(", schema: ");

+		result.append(schema);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlVirtualAccessMethods

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlVirtualAccessMethodsSchema.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlVirtualAccessMethodsSchema.java
new file mode 100644
index 0000000000..a6697b2cba
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlVirtualAccessMethodsSchema.java
@@ -0,0 +1,223 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.emf.common.util.Enumerator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the literals of the enumeration '<em><b>EXml Virtual Access Methods Schema</b></em>',

+ * and utility methods for working with them.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlVirtualAccessMethodsSchema()

+ * @model

+ * @generated

+ */

+public enum EXmlVirtualAccessMethodsSchema implements Enumerator

+{

+	/**

+	 * The '<em><b>NODES</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #NODES_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	NODES(0, "NODES", "NODES"),

+

+	/**

+	 * The '<em><b>ANY</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #ANY_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	ANY(1, "ANY", "ANY");

+

+	/**

+	 * The '<em><b>NODES</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>NODES</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #NODES

+	 * @model

+	 * @generated

+	 * @ordered

+	 */

+	public static final int NODES_VALUE = 0;

+

+	/**

+	 * The '<em><b>ANY</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>ANY</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #ANY

+	 * @model

+	 * @generated

+	 * @ordered

+	 */

+	public static final int ANY_VALUE = 1;

+

+	/**

+	 * An array of all the '<em><b>EXml Virtual Access Methods Schema</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static final EXmlVirtualAccessMethodsSchema[] VALUES_ARRAY =

+		new EXmlVirtualAccessMethodsSchema[]

+		{

+			NODES,

+			ANY,

+		};

+

+	/**

+	 * A public read-only list of all the '<em><b>EXml Virtual Access Methods Schema</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final List<EXmlVirtualAccessMethodsSchema> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

+

+	/**

+	 * Returns the '<em><b>EXml Virtual Access Methods Schema</b></em>' literal with the specified literal value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlVirtualAccessMethodsSchema get(String literal)

+	{

+		for (int i = 0; i < VALUES_ARRAY.length; ++i)

+		{

+			EXmlVirtualAccessMethodsSchema result = VALUES_ARRAY[i];

+			if (result.toString().equals(literal))

+			{

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>EXml Virtual Access Methods Schema</b></em>' literal with the specified name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlVirtualAccessMethodsSchema getByName(String name)

+	{

+		for (int i = 0; i < VALUES_ARRAY.length; ++i)

+		{

+			EXmlVirtualAccessMethodsSchema result = VALUES_ARRAY[i];

+			if (result.getName().equals(name))

+			{

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>EXml Virtual Access Methods Schema</b></em>' literal with the specified integer value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static EXmlVirtualAccessMethodsSchema get(int value)

+	{

+		switch (value)

+		{

+			case NODES_VALUE: return NODES;

+			case ANY_VALUE: return ANY;

+		}

+		return null;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final int value;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final String name;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final String literal;

+

+	/**

+	 * Only this class can construct instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EXmlVirtualAccessMethodsSchema(int value, String name, String literal)

+	{

+		this.value = value;

+		this.name = name;

+		this.literal = literal;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public int getValue()

+	{

+	  return value;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getName()

+	{

+	  return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getLiteral()

+	{

+	  return literal;

+	}

+

+	/**

+	 * Returns the literal value of the enumerator, which is its string representation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		return literal;

+	}

+	

+} //EXmlVirtualAccessMethodsSchema

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlWriteTransformer.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlWriteTransformer.java
new file mode 100644
index 0000000000..94af609de0
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EXmlWriteTransformer.java
@@ -0,0 +1,188 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EXml Write Transformer</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlWriteTransformer#getXmlPath <em>Xml Path</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlWriteTransformer()

+ * @model kind="class"

+ * @generated

+ */

+public class EXmlWriteTransformer extends EAbstractXmlTransformer

+{

+	/**

+	 * The default value of the '{@link #getXmlPath() <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlPath()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String XML_PATH_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getXmlPath() <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getXmlPath()

+	 * @generated

+	 * @ordered

+	 */

+	protected String xmlPath = XML_PATH_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EXmlWriteTransformer()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return OxmPackage.Literals.EXML_WRITE_TRANSFORMER;

+	}

+

+	/**

+	 * Returns the value of the '<em><b>Xml Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Xml Path</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Xml Path</em>' attribute.

+	 * @see #setXmlPath(String)

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlWriteTransformer_XmlPath()

+	 * @model

+	 * @generated

+	 */

+	public String getXmlPath()

+	{

+		return xmlPath;

+	}

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlWriteTransformer#getXmlPath <em>Xml Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Xml Path</em>' attribute.

+	 * @see #getXmlPath()

+	 * @generated

+	 */

+	public void setXmlPath(String newXmlPath)

+	{

+		String oldXmlPath = xmlPath;

+		xmlPath = newXmlPath;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, OxmPackage.EXML_WRITE_TRANSFORMER__XML_PATH, oldXmlPath, xmlPath));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_WRITE_TRANSFORMER__XML_PATH:

+				return getXmlPath();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_WRITE_TRANSFORMER__XML_PATH:

+				setXmlPath((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_WRITE_TRANSFORMER__XML_PATH:

+				setXmlPath(XML_PATH_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+			case OxmPackage.EXML_WRITE_TRANSFORMER__XML_PATH:

+				return XML_PATH_EDEFAULT == null ? xmlPath != null : !XML_PATH_EDEFAULT.equals(xmlPath);

+		}

+		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(" (xmlPath: ");

+		result.append(xmlPath);

+		result.append(')');

+		return result.toString();

+	}

+

+} // EXmlWriteTransformer

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EclipseLink.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EclipseLink.java
new file mode 100644
index 0000000000..4e11f8e649
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/EclipseLink.java
@@ -0,0 +1,49 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+public interface EclipseLink {

+	

+	String SCHEMA_NAMESPACE = "http://www.eclipse.org/eclipselink/xsds/persistence/oxm";

+	

+	String SCHEMA_VERSION_2_1 = "2.1";

+	String SCHEMA_LOCATION_2_1 = "http://www.eclipse.org/eclipselink/xsds/eclipselink_oxm_2_1.xsd";

+	

+	String SCHEMA_VERSION_2_2 = "2.2";

+	String SCHEMA_LOCATION_2_2 = "http://www.eclipse.org/eclipselink/xsds/eclipselink_oxm_2_2.xsd";

+	

+	String SCHEMA_VERSION_2_3 = "2.3";

+	String SCHEMA_LOCATION_2_3 = "http://www.eclipse.org/eclipselink/xsds/eclipselink_oxm_2_3.xsd";

+	

+	String SCHEMA_VERSION_2_4 = "2.4";

+	String SCHEMA_LOCATION_2_4 = "http://www.eclipse.org/eclipselink/xsds/eclipselink_oxm_2_4.xsd";

+	

+	

+	// EclipseLink specific nodes

+	String JAVA_ATTRIBUTES = "java-attributes"; //$NON-NLS-1$

+	String JAVA_TYPE = "java-type"; //$NON-NLS-1$

+	String JAVA_TYPES = "java-types"; //$NON-NLS-1$

+	String XML_ANY_ATTRIBUTE = "xml-any-attribute"; //$NON-NLS-1$

+	String XML_ANY_ELEMENT = "xml-any-element"; //$NON-NLS-1$

+	String XML_ATTRIBUTE = "xml-attribute"; //$NON-NLS-1$

+	String XML_BINDINGS = "xml-bindings"; //$NON-NLS-1$

+	String XML_ELEMENT = "xml-element"; //$NON-NLS-1$

+	String XML_ELEMENT_REF = "xml-element-ref"; //$NON-NLS-1$

+	String XML_ELEMENT_REFS = "xml-element-refs"; //$NON-NLS-1$

+	String XML_ELEMENTS = "xml-elements"; //$NON-NLS-1$

+	String XML_INVERSE_REFERENCE = "xml-inverse-reference"; //$NON-NLS-1$

+	String XML_IS_SET_NULL_POLICY = "xml-is-set-null-policy"; //$NON-NLS-1$

+	String XML_JAVA_TYPE_ADAPTER = "xml-java-type-adapter"; //$NON-NLS-1$

+	String XML_JOIN_NODES = "xml-join-nodes"; //$NON-NLS-1$

+	String XML_NULL_POLICY = "xml-null-policy"; //$NON-NLS-1$

+	String XML_TRANSFORMATION = "xml-transformation"; //$NON-NLS-1$

+	String XML_TRANSIENT = "xml-transient"; //$NON-NLS-1$

+	String XML_VALUE = "xml-value"; //$NON-NLS-1$

+}

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmFactory.java
new file mode 100644
index 0000000000..8839682485
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmFactory.java
@@ -0,0 +1,782 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.ArrayList;

+import java.util.List;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EDataType;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.impl.EFactoryImpl;

+import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;

+import org.eclipse.emf.ecore.xml.type.XMLTypePackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Factory</b> for the model.

+ * It provides a create method for each non-abstract class of the model.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage

+ * @generated

+ */

+public class OxmFactory extends EFactoryImpl

+{

+	/**

+	 * The singleton instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final OxmFactory eINSTANCE = init();

+

+	/**

+	 * Creates the default factory implementation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static OxmFactory init()

+	{

+		try

+		{

+			OxmFactory theOxmFactory = (OxmFactory)EPackage.Registry.INSTANCE.getEFactory("jpt.eclipselink.oxm.xmi"); 

+			if (theOxmFactory != null)

+			{

+				return theOxmFactory;

+			}

+		}

+		catch (Exception exception)

+		{

+			EcorePlugin.INSTANCE.log(exception);

+		}

+		return new OxmFactory();

+	}

+

+	/**

+	 * Creates an instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public OxmFactory()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public EObject create(EClass eClass)

+	{

+		switch (eClass.getClassifierID())

+		{

+			case OxmPackage.EJAVA_TYPE: return (EObject)createEJavaType();

+			case OxmPackage.EXML_ACCESS_METHODS: return (EObject)createEXmlAccessMethods();

+			case OxmPackage.EXML_ANY_ATTRIBUTE: return (EObject)createEXmlAnyAttribute();

+			case OxmPackage.EXML_ANY_ELEMENT: return (EObject)createEXmlAnyElement();

+			case OxmPackage.EXML_ATTRIBUTE: return (EObject)createEXmlAttribute();

+			case OxmPackage.EXML_BINDINGS: return (EObject)createEXmlBindings();

+			case OxmPackage.EXML_CLASS_EXTRACTOR: return (EObject)createEXmlClassExtractor();

+			case OxmPackage.EXML_ELEMENT: return (EObject)createEXmlElement();

+			case OxmPackage.EXML_ELEMENT_DECL: return (EObject)createEXmlElementDecl();

+			case OxmPackage.EXML_ELEMENT_REF: return (EObject)createEXmlElementRef();

+			case OxmPackage.EXML_ELEMENT_REFS: return (EObject)createEXmlElementRefs();

+			case OxmPackage.EXML_ELEMENTS: return (EObject)createEXmlElements();

+			case OxmPackage.EXML_ELEMENT_WRAPPER: return (EObject)createEXmlElementWrapper();

+			case OxmPackage.EXML_ENUM: return (EObject)createEXmlEnum();

+			case OxmPackage.EXML_ENUM_VALUE: return (EObject)createEXmlEnumValue();

+			case OxmPackage.EXML_INVERSE_REFERENCE: return (EObject)createEXmlInverseReference();

+			case OxmPackage.EXML_IS_SET_NULL_POLICY: return (EObject)createEXmlIsSetNullPolicy();

+			case OxmPackage.EXML_IS_SET_PARAMETER: return (EObject)createEXmlIsSetParameter();

+			case OxmPackage.EXML_JAVA_TYPE_ADAPTER: return (EObject)createEXmlJavaTypeAdapter();

+			case OxmPackage.EXML_JOIN_NODE: return (EObject)createEXmlJoinNode();

+			case OxmPackage.EXML_JOIN_NODES: return (EObject)createEXmlJoinNodes();

+			case OxmPackage.EXML_MAP: return (EObject)createEXmlMap();

+			case OxmPackage.EXML_NULL_POLICY: return (EObject)createEXmlNullPolicy();

+			case OxmPackage.EXML_NS: return (EObject)createEXmlNs();

+			case OxmPackage.EXML_PROPERTY: return (EObject)createEXmlProperty();

+			case OxmPackage.EXML_READ_TRANSFORMER: return (EObject)createEXmlReadTransformer();

+			case OxmPackage.EXML_REGISTRY: return (EObject)createEXmlRegistry();

+			case OxmPackage.EXML_ROOT_ELEMENT: return (EObject)createEXmlRootElement();

+			case OxmPackage.EXML_SCHEMA: return (EObject)createEXmlSchema();

+			case OxmPackage.EXML_SCHEMA_TYPE: return (EObject)createEXmlSchemaType();

+			case OxmPackage.EXML_TRANSFORMATION: return (EObject)createEXmlTransformation();

+			case OxmPackage.EXML_TRANSIENT: return (EObject)createEXmlTransient();

+			case OxmPackage.EXML_TYPE: return (EObject)createEXmlType();

+			case OxmPackage.EXML_VALUE: return (EObject)createEXmlValue();

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS: return (EObject)createEXmlVirtualAccessMethods();

+			case OxmPackage.EXML_WRITE_TRANSFORMER: return (EObject)createEXmlWriteTransformer();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object createFromString(EDataType eDataType, String initialValue)

+	{

+		switch (eDataType.getClassifierID())

+		{

+			case OxmPackage.EXML_ACCESS_ORDER:

+				return createEXmlAccessOrderFromString(eDataType, initialValue);

+			case OxmPackage.EXML_ACCESS_TYPE:

+				return createEXmlAccessTypeFromString(eDataType, initialValue);

+			case OxmPackage.EXML_MARSHAL_NULL_REPRESENTATION:

+				return createEXmlMarshalNullRepresentationFromString(eDataType, initialValue);

+			case OxmPackage.EXML_NS_FORM:

+				return createEXmlNsFormFromString(eDataType, initialValue);

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS_SCHEMA:

+				return createEXmlVirtualAccessMethodsSchemaFromString(eDataType, initialValue);

+			case OxmPackage.EPROP_ORDER:

+				return createEPropOrderFromString(eDataType, initialValue);

+			case OxmPackage.EXML_SEE_ALSO:

+				return createEXmlSeeAlsoFromString(eDataType, initialValue);

+			default:

+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String convertToString(EDataType eDataType, Object instanceValue)

+	{

+		switch (eDataType.getClassifierID())

+		{

+			case OxmPackage.EXML_ACCESS_ORDER:

+				return convertEXmlAccessOrderToString(eDataType, instanceValue);

+			case OxmPackage.EXML_ACCESS_TYPE:

+				return convertEXmlAccessTypeToString(eDataType, instanceValue);

+			case OxmPackage.EXML_MARSHAL_NULL_REPRESENTATION:

+				return convertEXmlMarshalNullRepresentationToString(eDataType, instanceValue);

+			case OxmPackage.EXML_NS_FORM:

+				return convertEXmlNsFormToString(eDataType, instanceValue);

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS_SCHEMA:

+				return convertEXmlVirtualAccessMethodsSchemaToString(eDataType, instanceValue);

+			case OxmPackage.EPROP_ORDER:

+				return convertEPropOrderToString(eDataType, instanceValue);

+			case OxmPackage.EXML_SEE_ALSO:

+				return convertEXmlSeeAlsoToString(eDataType, instanceValue);

+			default:

+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EJavaType createEJavaType()

+	{

+		EJavaType eJavaType = new EJavaType();

+		return eJavaType;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlAccessMethods createEXmlAccessMethods()

+	{

+		EXmlAccessMethods eXmlAccessMethods = new EXmlAccessMethods();

+		return eXmlAccessMethods;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlAnyAttribute createEXmlAnyAttribute()

+	{

+		EXmlAnyAttribute eXmlAnyAttribute = new EXmlAnyAttribute();

+		return eXmlAnyAttribute;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlAnyElement createEXmlAnyElement()

+	{

+		EXmlAnyElement eXmlAnyElement = new EXmlAnyElement();

+		return eXmlAnyElement;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlAttribute createEXmlAttribute()

+	{

+		EXmlAttribute eXmlAttribute = new EXmlAttribute();

+		return eXmlAttribute;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlBindings createEXmlBindings()

+	{

+		EXmlBindings eXmlBindings = new EXmlBindings();

+		return eXmlBindings;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlClassExtractor createEXmlClassExtractor()

+	{

+		EXmlClassExtractor eXmlClassExtractor = new EXmlClassExtractor();

+		return eXmlClassExtractor;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlElement createEXmlElement()

+	{

+		EXmlElement eXmlElement = new EXmlElement();

+		return eXmlElement;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlElementDecl createEXmlElementDecl()

+	{

+		EXmlElementDecl eXmlElementDecl = new EXmlElementDecl();

+		return eXmlElementDecl;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlElementRef createEXmlElementRef()

+	{

+		EXmlElementRef eXmlElementRef = new EXmlElementRef();

+		return eXmlElementRef;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlElementRefs createEXmlElementRefs()

+	{

+		EXmlElementRefs eXmlElementRefs = new EXmlElementRefs();

+		return eXmlElementRefs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlElements createEXmlElements()

+	{

+		EXmlElements eXmlElements = new EXmlElements();

+		return eXmlElements;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlElementWrapper createEXmlElementWrapper()

+	{

+		EXmlElementWrapper eXmlElementWrapper = new EXmlElementWrapper();

+		return eXmlElementWrapper;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlEnum createEXmlEnum()

+	{

+		EXmlEnum eXmlEnum = new EXmlEnum();

+		return eXmlEnum;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlEnumValue createEXmlEnumValue()

+	{

+		EXmlEnumValue eXmlEnumValue = new EXmlEnumValue();

+		return eXmlEnumValue;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlInverseReference createEXmlInverseReference()

+	{

+		EXmlInverseReference eXmlInverseReference = new EXmlInverseReference();

+		return eXmlInverseReference;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlIsSetNullPolicy createEXmlIsSetNullPolicy()

+	{

+		EXmlIsSetNullPolicy eXmlIsSetNullPolicy = new EXmlIsSetNullPolicy();

+		return eXmlIsSetNullPolicy;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlIsSetParameter createEXmlIsSetParameter()

+	{

+		EXmlIsSetParameter eXmlIsSetParameter = new EXmlIsSetParameter();

+		return eXmlIsSetParameter;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlJavaTypeAdapter createEXmlJavaTypeAdapter()

+	{

+		EXmlJavaTypeAdapter eXmlJavaTypeAdapter = new EXmlJavaTypeAdapter();

+		return eXmlJavaTypeAdapter;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlJoinNode createEXmlJoinNode()

+	{

+		EXmlJoinNode eXmlJoinNode = new EXmlJoinNode();

+		return eXmlJoinNode;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlJoinNodes createEXmlJoinNodes()

+	{

+		EXmlJoinNodes eXmlJoinNodes = new EXmlJoinNodes();

+		return eXmlJoinNodes;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlMap createEXmlMap()

+	{

+		EXmlMap eXmlMap = new EXmlMap();

+		return eXmlMap;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlNullPolicy createEXmlNullPolicy()

+	{

+		EXmlNullPolicy eXmlNullPolicy = new EXmlNullPolicy();

+		return eXmlNullPolicy;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlNs createEXmlNs()

+	{

+		EXmlNs eXmlNs = new EXmlNs();

+		return eXmlNs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlProperty createEXmlProperty()

+	{

+		EXmlProperty eXmlProperty = new EXmlProperty();

+		return eXmlProperty;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlReadTransformer createEXmlReadTransformer()

+	{

+		EXmlReadTransformer eXmlReadTransformer = new EXmlReadTransformer();

+		return eXmlReadTransformer;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlRegistry createEXmlRegistry()

+	{

+		EXmlRegistry eXmlRegistry = new EXmlRegistry();

+		return eXmlRegistry;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlRootElement createEXmlRootElement()

+	{

+		EXmlRootElement eXmlRootElement = new EXmlRootElement();

+		return eXmlRootElement;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlSchema createEXmlSchema()

+	{

+		EXmlSchema eXmlSchema = new EXmlSchema();

+		return eXmlSchema;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlSchemaType createEXmlSchemaType()

+	{

+		EXmlSchemaType eXmlSchemaType = new EXmlSchemaType();

+		return eXmlSchemaType;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlTransformation createEXmlTransformation()

+	{

+		EXmlTransformation eXmlTransformation = new EXmlTransformation();

+		return eXmlTransformation;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlTransient createEXmlTransient()

+	{

+		EXmlTransient eXmlTransient = new EXmlTransient();

+		return eXmlTransient;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlType createEXmlType()

+	{

+		EXmlType eXmlType = new EXmlType();

+		return eXmlType;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlValue createEXmlValue()

+	{

+		EXmlValue eXmlValue = new EXmlValue();

+		return eXmlValue;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlVirtualAccessMethods createEXmlVirtualAccessMethods()

+	{

+		EXmlVirtualAccessMethods eXmlVirtualAccessMethods = new EXmlVirtualAccessMethods();

+		return eXmlVirtualAccessMethods;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlWriteTransformer createEXmlWriteTransformer()

+	{

+		EXmlWriteTransformer eXmlWriteTransformer = new EXmlWriteTransformer();

+		return eXmlWriteTransformer;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlAccessOrder createEXmlAccessOrderFromString(EDataType eDataType, String initialValue)

+	{

+		EXmlAccessOrder result = EXmlAccessOrder.get(initialValue);

+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		return result;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String convertEXmlAccessOrderToString(EDataType eDataType, Object instanceValue)

+	{

+		return instanceValue == null ? null : instanceValue.toString();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlAccessType createEXmlAccessTypeFromString(EDataType eDataType, String initialValue)

+	{

+		EXmlAccessType result = EXmlAccessType.get(initialValue);

+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		return result;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String convertEXmlAccessTypeToString(EDataType eDataType, Object instanceValue)

+	{

+		return instanceValue == null ? null : instanceValue.toString();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlMarshalNullRepresentation createEXmlMarshalNullRepresentationFromString(EDataType eDataType, String initialValue)

+	{

+		EXmlMarshalNullRepresentation result = EXmlMarshalNullRepresentation.get(initialValue);

+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		return result;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String convertEXmlMarshalNullRepresentationToString(EDataType eDataType, Object instanceValue)

+	{

+		return instanceValue == null ? null : instanceValue.toString();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlNsForm createEXmlNsFormFromString(EDataType eDataType, String initialValue)

+	{

+		EXmlNsForm result = EXmlNsForm.get(initialValue);

+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		return result;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String convertEXmlNsFormToString(EDataType eDataType, Object instanceValue)

+	{

+		return instanceValue == null ? null : instanceValue.toString();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EXmlVirtualAccessMethodsSchema createEXmlVirtualAccessMethodsSchemaFromString(EDataType eDataType, String initialValue)

+	{

+		EXmlVirtualAccessMethodsSchema result = EXmlVirtualAccessMethodsSchema.get(initialValue);

+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		return result;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String convertEXmlVirtualAccessMethodsSchemaToString(EDataType eDataType, Object instanceValue)

+	{

+		return instanceValue == null ? null : instanceValue.toString();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public List<String> createEPropOrderFromString(EDataType eDataType, String initialValue)

+	{

+		if (initialValue == null) return null;

+		List<String> result = new ArrayList<String>();

+		for (String item : split(initialValue))

+		{

+			result.add((String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, item));

+		}

+		return result;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String convertEPropOrderToString(EDataType eDataType, Object instanceValue)

+	{

+		if (instanceValue == null) return null;

+		List<?> list = (List<?>)instanceValue;

+		if (list.isEmpty()) return "";

+		StringBuffer result = new StringBuffer();

+		for (Object item : list)

+		{

+			result.append(XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.STRING, item));

+			result.append(' ');

+		}

+		return result.substring(0, result.length() - 1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public List<String> createEXmlSeeAlsoFromString(EDataType eDataType, String initialValue)

+	{

+		if (initialValue == null) return null;

+		List<String> result = new ArrayList<String>();

+		for (String item : split(initialValue))

+		{

+			result.add((String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, item));

+		}

+		return result;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String convertEXmlSeeAlsoToString(EDataType eDataType, Object instanceValue)

+	{

+		if (instanceValue == null) return null;

+		List<?> list = (List<?>)instanceValue;

+		if (list.isEmpty()) return "";

+		StringBuffer result = new StringBuffer();

+		for (Object item : list)

+		{

+			result.append(XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.STRING, item));

+			result.append(' ');

+		}

+		return result.substring(0, result.length() - 1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public OxmPackage getOxmPackage()

+	{

+		return (OxmPackage)getEPackage();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @deprecated

+	 * @generated

+	 */

+	@Deprecated

+	public static OxmPackage getPackage()

+	{

+		return OxmPackage.eINSTANCE;

+	}

+

+} //OxmFactory

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmPackage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmPackage.java
new file mode 100644
index 0000000000..9074a07988
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmPackage.java
@@ -0,0 +1,9301 @@
+/*******************************************************************************

+ *  Copyright (c) 2012  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.jaxb.eclipselink.core.resource.oxm;

+

+import java.util.List;

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EDataType;

+import org.eclipse.emf.ecore.EEnum;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+import org.eclipse.emf.ecore.EValidator;

+import org.eclipse.emf.ecore.impl.EPackageImpl;

+import org.eclipse.jpt.common.core.resource.xml.CommonPackage;

+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.util.OxmValidator;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Package</b> for the model.

+ * It contains accessors for the meta objects to represent

+ * <ul>

+ *   <li>each class,</li>

+ *   <li>each feature of each class,</li>

+ *   <li>each enum,</li>

+ *   <li>and each data type</li>

+ * </ul>

+ * <!-- end-user-doc -->

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmFactory

+ * @model kind="package"

+ * @generated

+ */

+public class OxmPackage extends EPackageImpl

+{

+	/**

+	 * The package name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final String eNAME = "oxm";

+

+	/**

+	 * The package namespace URI.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final String eNS_URI = "jpt.eclipselink.oxm.xmi";

+

+	/**

+	 * The package namespace name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final String eNS_PREFIX = "org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm";

+

+	/**

+	 * The singleton instance of the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final OxmPackage eINSTANCE = org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage.init();

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy <em>EAbstract Xml Null Policy</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAbstractXmlNullPolicy()

+	 * @generated

+	 */

+	public static final int EABSTRACT_XML_NULL_POLICY = 0;

+

+	/**

+	 * The feature id for the '<em><b>Xsi Nil Represents Null</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EABSTRACT_XML_NULL_POLICY__XSI_NIL_REPRESENTS_NULL = 0;

+

+	/**

+	 * The feature id for the '<em><b>Empty Node Represents Null</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EABSTRACT_XML_NULL_POLICY__EMPTY_NODE_REPRESENTS_NULL = 1;

+

+	/**

+	 * The feature id for the '<em><b>Null Representation For Xml</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EABSTRACT_XML_NULL_POLICY__NULL_REPRESENTATION_FOR_XML = 2;

+

+	/**

+	 * The number of structural features of the '<em>EAbstract Xml Null Policy</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EABSTRACT_XML_NULL_POLICY_FEATURE_COUNT = 3;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlTransformer <em>EAbstract Xml Transformer</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlTransformer

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAbstractXmlTransformer()

+	 * @generated

+	 */

+	public static final int EABSTRACT_XML_TRANSFORMER = 1;

+

+	/**

+	 * The feature id for the '<em><b>Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EABSTRACT_XML_TRANSFORMER__METHOD = 0;

+

+	/**

+	 * The feature id for the '<em><b>Transformer Class</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EABSTRACT_XML_TRANSFORMER__TRANSFORMER_CLASS = 1;

+

+	/**

+	 * The number of structural features of the '<em>EAbstract Xml Transformer</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EABSTRACT_XML_TRANSFORMER_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAccessibleJavaAttribute <em>EAccessible Java Attribute</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAccessibleJavaAttribute

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAccessibleJavaAttribute()

+	 * @generated

+	 */

+	public static final int EACCESSIBLE_JAVA_ATTRIBUTE = 2;

+

+	/**

+	 * The feature id for the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS = 0;

+

+	/**

+	 * The number of structural features of the '<em>EAccessible Java Attribute</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EACCESSIBLE_JAVA_ATTRIBUTE_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAdaptableJavaAttribute <em>EAdaptable Java Attribute</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAdaptableJavaAttribute

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAdaptableJavaAttribute()

+	 * @generated

+	 */

+	public static final int EADAPTABLE_JAVA_ATTRIBUTE = 3;

+

+	/**

+	 * The feature id for the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER = 0;

+

+	/**

+	 * The number of structural features of the '<em>EAdaptable Java Attribute</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EADAPTABLE_JAVA_ATTRIBUTE_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EContainerJavaAttribute <em>EContainer Java Attribute</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EContainerJavaAttribute

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEContainerJavaAttribute()

+	 * @generated

+	 */

+	public static final int ECONTAINER_JAVA_ATTRIBUTE = 4;

+

+	/**

+	 * The feature id for the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE = 0;

+

+	/**

+	 * The number of structural features of the '<em>EContainer Java Attribute</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int ECONTAINER_JAVA_ATTRIBUTE_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute <em>EJava Attribute</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaAttribute()

+	 * @generated

+	 */

+	public static final int EJAVA_ATTRIBUTE = 5;

+

+	/**

+	 * The feature id for the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE = 0;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE = 1;

+

+	/**

+	 * The number of structural features of the '<em>EJava Attribute</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_ATTRIBUTE_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EPropertyHolder <em>EProperty Holder</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EPropertyHolder

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder()

+	 * @generated

+	 */

+	public static final int EPROPERTY_HOLDER = 7;

+

+	/**

+	 * The feature id for the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EPROPERTY_HOLDER__XML_PROPERTIES = 0;

+

+	/**

+	 * The number of structural features of the '<em>EProperty Holder</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EPROPERTY_HOLDER_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType <em>EJava Type</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType()

+	 * @generated

+	 */

+	public static final int EJAVA_TYPE = 6;

+

+	/**

+	 * The feature id for the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_PROPERTIES = EPROPERTY_HOLDER__XML_PROPERTIES;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__NAME = EPROPERTY_HOLDER_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Super Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__SUPER_TYPE = EPROPERTY_HOLDER_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Order</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_ACCESSOR_ORDER = EPROPERTY_HOLDER_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_ACCESSOR_TYPE = EPROPERTY_HOLDER_FEATURE_COUNT + 3;

+

+	/**

+	 * The feature id for the '<em><b>Xml Customizer</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_CUSTOMIZER = EPROPERTY_HOLDER_FEATURE_COUNT + 4;

+

+	/**

+	 * The feature id for the '<em><b>Xml Discriminator Node</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_DISCRIMINATOR_NODE = EPROPERTY_HOLDER_FEATURE_COUNT + 5;

+

+	/**

+	 * The feature id for the '<em><b>Xml Discriminator Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_DISCRIMINATOR_VALUE = EPROPERTY_HOLDER_FEATURE_COUNT + 6;

+

+	/**

+	 * The feature id for the '<em><b>Xml Inline Binary Data</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_INLINE_BINARY_DATA = EPROPERTY_HOLDER_FEATURE_COUNT + 7;

+

+	/**

+	 * The feature id for the '<em><b>Xml Transient</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_TRANSIENT = EPROPERTY_HOLDER_FEATURE_COUNT + 8;

+

+	/**

+	 * The feature id for the '<em><b>Xml Name Transformer</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_NAME_TRANSFORMER = EPROPERTY_HOLDER_FEATURE_COUNT + 9;

+

+	/**

+	 * The feature id for the '<em><b>Xml Type</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_TYPE = EPROPERTY_HOLDER_FEATURE_COUNT + 10;

+

+	/**

+	 * The feature id for the '<em><b>Xml Root Element</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_ROOT_ELEMENT = EPROPERTY_HOLDER_FEATURE_COUNT + 11;

+

+	/**

+	 * The feature id for the '<em><b>Xml Virtual Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_VIRTUAL_ACCESS_METHODS = EPROPERTY_HOLDER_FEATURE_COUNT + 12;

+

+	/**

+	 * The feature id for the '<em><b>Xml See Also</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_SEE_ALSO = EPROPERTY_HOLDER_FEATURE_COUNT + 13;

+

+	/**

+	 * The feature id for the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_JAVA_TYPE_ADAPTER = EPROPERTY_HOLDER_FEATURE_COUNT + 14;

+

+	/**

+	 * The feature id for the '<em><b>Xml Class Extractor</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__XML_CLASS_EXTRACTOR = EPROPERTY_HOLDER_FEATURE_COUNT + 15;

+

+	/**

+	 * The feature id for the '<em><b>Java Attributes</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE__JAVA_ATTRIBUTES = EPROPERTY_HOLDER_FEATURE_COUNT + 16;

+

+	/**

+	 * The number of structural features of the '<em>EJava Type</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EJAVA_TYPE_FEATURE_COUNT = EPROPERTY_HOLDER_FEATURE_COUNT + 17;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EReadWriteJavaAttribute <em>ERead Write Java Attribute</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EReadWriteJavaAttribute

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute()

+	 * @generated

+	 */

+	public static final int EREAD_WRITE_JAVA_ATTRIBUTE = 8;

+

+	/**

+	 * The feature id for the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY = 0;

+

+	/**

+	 * The feature id for the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY = 1;

+

+	/**

+	 * The number of structural features of the '<em>ERead Write Java Attribute</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EREAD_WRITE_JAVA_ATTRIBUTE_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.ETypedJavaAttribute <em>ETyped Java Attribute</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.ETypedJavaAttribute

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getETypedJavaAttribute()

+	 * @generated

+	 */

+	public static final int ETYPED_JAVA_ATTRIBUTE = 9;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int ETYPED_JAVA_ATTRIBUTE__TYPE = 0;

+

+	/**

+	 * The number of structural features of the '<em>ETyped Java Attribute</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int ETYPED_JAVA_ATTRIBUTE_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessMethods <em>EXml Access Methods</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessMethods

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAccessMethods()

+	 * @generated

+	 */

+	public static final int EXML_ACCESS_METHODS = 10;

+

+	/**

+	 * The feature id for the '<em><b>Get Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ACCESS_METHODS__GET_METHOD = 0;

+

+	/**

+	 * The feature id for the '<em><b>Set Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ACCESS_METHODS__SET_METHOD = 1;

+

+	/**

+	 * The number of structural features of the '<em>EXml Access Methods</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ACCESS_METHODS_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute <em>EXml Any Attribute</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAnyAttribute()

+	 * @generated

+	 */

+	public static final int EXML_ANY_ATTRIBUTE = 11;

+

+	/**

+	 * The feature id for the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ATTRIBUTE__JAVA_ATTRIBUTE = EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ATTRIBUTE__XML_ACCESSOR_TYPE = EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ATTRIBUTE__XML_ACCESS_METHODS = EJAVA_ATTRIBUTE_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ATTRIBUTE__CONTAINER_TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ATTRIBUTE__READ_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ATTRIBUTE__WRITE_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 3;

+

+	/**

+	 * The feature id for the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ATTRIBUTE__XML_PROPERTIES = EJAVA_ATTRIBUTE_FEATURE_COUNT + 4;

+

+	/**

+	 * The feature id for the '<em><b>Xml Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ATTRIBUTE__XML_PATH = EJAVA_ATTRIBUTE_FEATURE_COUNT + 5;

+

+	/**

+	 * The number of structural features of the '<em>EXml Any Attribute</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ATTRIBUTE_FEATURE_COUNT = EJAVA_ATTRIBUTE_FEATURE_COUNT + 6;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement <em>EXml Any Element</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAnyElement()

+	 * @generated

+	 */

+	public static final int EXML_ANY_ELEMENT = 12;

+

+	/**

+	 * The feature id for the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ELEMENT__JAVA_ATTRIBUTE = EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ELEMENT__XML_ACCESSOR_TYPE = EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ELEMENT__XML_ACCESS_METHODS = EJAVA_ATTRIBUTE_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ELEMENT__XML_JAVA_TYPE_ADAPTER = EJAVA_ATTRIBUTE_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ELEMENT__CONTAINER_TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ELEMENT__READ_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 3;

+

+	/**

+	 * The feature id for the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ELEMENT__WRITE_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 4;

+

+	/**

+	 * The feature id for the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ELEMENT__XML_PROPERTIES = EJAVA_ATTRIBUTE_FEATURE_COUNT + 5;

+

+	/**

+	 * The feature id for the '<em><b>Xml Mixed</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ELEMENT__XML_MIXED = EJAVA_ATTRIBUTE_FEATURE_COUNT + 6;

+

+	/**

+	 * The feature id for the '<em><b>Lax</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ELEMENT__LAX = EJAVA_ATTRIBUTE_FEATURE_COUNT + 7;

+

+	/**

+	 * The feature id for the '<em><b>Dom Handler</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ELEMENT__DOM_HANDLER = EJAVA_ATTRIBUTE_FEATURE_COUNT + 8;

+

+	/**

+	 * The feature id for the '<em><b>Xml Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ELEMENT__XML_PATH = EJAVA_ATTRIBUTE_FEATURE_COUNT + 9;

+

+	/**

+	 * The feature id for the '<em><b>Xml Element Refs</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ELEMENT__XML_ELEMENT_REFS = EJAVA_ATTRIBUTE_FEATURE_COUNT + 10;

+

+	/**

+	 * The number of structural features of the '<em>EXml Any Element</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ANY_ELEMENT_FEATURE_COUNT = EJAVA_ATTRIBUTE_FEATURE_COUNT + 11;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute <em>EXml Attribute</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute()

+	 * @generated

+	 */

+	public static final int EXML_ATTRIBUTE = 13;

+

+	/**

+	 * The feature id for the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__JAVA_ATTRIBUTE = EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__XML_ACCESSOR_TYPE = EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__XML_ACCESS_METHODS = EJAVA_ATTRIBUTE_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER = EJAVA_ATTRIBUTE_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__CONTAINER_TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__READ_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 3;

+

+	/**

+	 * The feature id for the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__WRITE_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 4;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 5;

+

+	/**

+	 * The feature id for the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__XML_PROPERTIES = EJAVA_ATTRIBUTE_FEATURE_COUNT + 6;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__NAME = EJAVA_ATTRIBUTE_FEATURE_COUNT + 7;

+

+	/**

+	 * The feature id for the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__NAMESPACE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 8;

+

+	/**

+	 * The feature id for the '<em><b>Required</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__REQUIRED = EJAVA_ATTRIBUTE_FEATURE_COUNT + 9;

+

+	/**

+	 * The feature id for the '<em><b>Xml Id</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__XML_ID = EJAVA_ATTRIBUTE_FEATURE_COUNT + 10;

+

+	/**

+	 * The feature id for the '<em><b>Xml Id Ref</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__XML_ID_REF = EJAVA_ATTRIBUTE_FEATURE_COUNT + 11;

+

+	/**

+	 * The feature id for the '<em><b>Xml Key</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__XML_KEY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 12;

+

+	/**

+	 * The feature id for the '<em><b>Xml List</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__XML_LIST = EJAVA_ATTRIBUTE_FEATURE_COUNT + 13;

+

+	/**

+	 * The feature id for the '<em><b>Xml Inline Binary Data</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__XML_INLINE_BINARY_DATA = EJAVA_ATTRIBUTE_FEATURE_COUNT + 14;

+

+	/**

+	 * The feature id for the '<em><b>Xml Attachment Ref</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__XML_ATTACHMENT_REF = EJAVA_ATTRIBUTE_FEATURE_COUNT + 15;

+

+	/**

+	 * The feature id for the '<em><b>Xml Mime Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__XML_MIME_TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 16;

+

+	/**

+	 * The feature id for the '<em><b>Xml Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__XML_PATH = EJAVA_ATTRIBUTE_FEATURE_COUNT + 17;

+

+	/**

+	 * The feature id for the '<em><b>Xml Abstract Null Policy</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__XML_ABSTRACT_NULL_POLICY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 18;

+

+	/**

+	 * The feature id for the '<em><b>Xml Schema Type</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE__XML_SCHEMA_TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 19;

+

+	/**

+	 * The number of structural features of the '<em>EXml Attribute</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ATTRIBUTE_FEATURE_COUNT = EJAVA_ATTRIBUTE_FEATURE_COUNT + 20;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings <em>EXml Bindings</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings()

+	 * @generated

+	 */

+	public static final int EXML_BINDINGS = 14;

+

+	/**

+	 * The feature id for the '<em><b>Version</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS__VERSION = CommonPackage.EROOT_OBJECT_IMPL__VERSION;

+

+	/**

+	 * The feature id for the '<em><b>Schema Location</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS__SCHEMA_LOCATION = CommonPackage.EROOT_OBJECT_IMPL__SCHEMA_LOCATION;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS__XML_ACCESSOR_TYPE = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Order</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS__XML_ACCESSOR_ORDER = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Xml Mapping Metadata Complete</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS__XML_MAPPING_METADATA_COMPLETE = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Package Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS__PACKAGE_NAME = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 3;

+

+	/**

+	 * The feature id for the '<em><b>Xml Name Transformer</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS__XML_NAME_TRANSFORMER = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 4;

+

+	/**

+	 * The feature id for the '<em><b>Xml Schema</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS__XML_SCHEMA = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 5;

+

+	/**

+	 * The feature id for the '<em><b>Xml Schema Type</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS__XML_SCHEMA_TYPE = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 6;

+

+	/**

+	 * The feature id for the '<em><b>Xml Schema Types</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS__XML_SCHEMA_TYPES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 7;

+

+	/**

+	 * The feature id for the '<em><b>Xml Java Type Adapters</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS__XML_JAVA_TYPE_ADAPTERS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 8;

+

+	/**

+	 * The feature id for the '<em><b>Xml Registries</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS__XML_REGISTRIES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 9;

+

+	/**

+	 * The feature id for the '<em><b>Xml Enums</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS__XML_ENUMS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 10;

+

+	/**

+	 * The feature id for the '<em><b>Java Types</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS__JAVA_TYPES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 11;

+

+	/**

+	 * The number of structural features of the '<em>EXml Bindings</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_BINDINGS_FEATURE_COUNT = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 12;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlClassExtractor <em>EXml Class Extractor</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlClassExtractor

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlClassExtractor()

+	 * @generated

+	 */

+	public static final int EXML_CLASS_EXTRACTOR = 15;

+

+	/**

+	 * The feature id for the '<em><b>Class Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_CLASS_EXTRACTOR__CLASS_NAME = 0;

+

+	/**

+	 * The number of structural features of the '<em>EXml Class Extractor</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_CLASS_EXTRACTOR_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement <em>EXml Element</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement()

+	 * @generated

+	 */

+	public static final int EXML_ELEMENT = 16;

+

+	/**

+	 * The feature id for the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__JAVA_ATTRIBUTE = EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_ACCESSOR_TYPE = EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_ACCESS_METHODS = EJAVA_ATTRIBUTE_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_JAVA_TYPE_ADAPTER = EJAVA_ATTRIBUTE_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__CONTAINER_TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_PROPERTIES = EJAVA_ATTRIBUTE_FEATURE_COUNT + 3;

+

+	/**

+	 * The feature id for the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__READ_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 4;

+

+	/**

+	 * The feature id for the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__WRITE_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 5;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__NAME = EJAVA_ATTRIBUTE_FEATURE_COUNT + 6;

+

+	/**

+	 * The feature id for the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__NAMESPACE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 7;

+

+	/**

+	 * The feature id for the '<em><b>Default Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__DEFAULT_VALUE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 8;

+

+	/**

+	 * The feature id for the '<em><b>Nillable</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__NILLABLE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 9;

+

+	/**

+	 * The feature id for the '<em><b>Required</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__REQUIRED = EJAVA_ATTRIBUTE_FEATURE_COUNT + 10;

+

+	/**

+	 * The feature id for the '<em><b>Xml Id</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_ID = EJAVA_ATTRIBUTE_FEATURE_COUNT + 11;

+

+	/**

+	 * The feature id for the '<em><b>Xml Id Ref</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_ID_REF = EJAVA_ATTRIBUTE_FEATURE_COUNT + 12;

+

+	/**

+	 * The feature id for the '<em><b>Xml Key</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_KEY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 13;

+

+	/**

+	 * The feature id for the '<em><b>Xml List</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_LIST = EJAVA_ATTRIBUTE_FEATURE_COUNT + 14;

+

+	/**

+	 * The feature id for the '<em><b>Xml Inline Binary Data</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_INLINE_BINARY_DATA = EJAVA_ATTRIBUTE_FEATURE_COUNT + 15;

+

+	/**

+	 * The feature id for the '<em><b>Xml Attachment Ref</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_ATTACHMENT_REF = EJAVA_ATTRIBUTE_FEATURE_COUNT + 16;

+

+	/**

+	 * The feature id for the '<em><b>Xml Mime Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_MIME_TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 17;

+

+	/**

+	 * The feature id for the '<em><b>Cdata</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__CDATA = EJAVA_ATTRIBUTE_FEATURE_COUNT + 18;

+

+	/**

+	 * The feature id for the '<em><b>Xml Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_PATH = EJAVA_ATTRIBUTE_FEATURE_COUNT + 19;

+

+	/**

+	 * The feature id for the '<em><b>Xml Location</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_LOCATION = EJAVA_ATTRIBUTE_FEATURE_COUNT + 20;

+

+	/**

+	 * The feature id for the '<em><b>Xml Abstract Null Policy</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_ABSTRACT_NULL_POLICY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 21;

+

+	/**

+	 * The feature id for the '<em><b>Xml Element Wrapper</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_ELEMENT_WRAPPER = EJAVA_ATTRIBUTE_FEATURE_COUNT + 22;

+

+	/**

+	 * The feature id for the '<em><b>Xml Map</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_MAP = EJAVA_ATTRIBUTE_FEATURE_COUNT + 23;

+

+	/**

+	 * The feature id for the '<em><b>Xml Schema Type</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT__XML_SCHEMA_TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 24;

+

+	/**

+	 * The number of structural features of the '<em>EXml Element</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_FEATURE_COUNT = EJAVA_ATTRIBUTE_FEATURE_COUNT + 25;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl <em>EXml Element Decl</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementDecl()

+	 * @generated

+	 */

+	public static final int EXML_ELEMENT_DECL = 17;

+

+	/**

+	 * The feature id for the '<em><b>Java Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_DECL__JAVA_METHOD = 0;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_DECL__NAME = 1;

+

+	/**

+	 * The feature id for the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_DECL__NAMESPACE = 2;

+

+	/**

+	 * The feature id for the '<em><b>Default Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_DECL__DEFAULT_VALUE = 3;

+

+	/**

+	 * The feature id for the '<em><b>Scope</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_DECL__SCOPE = 4;

+

+	/**

+	 * The feature id for the '<em><b>Substitution Head Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAME = 5;

+

+	/**

+	 * The feature id for the '<em><b>Substitution Head Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAMESPACE = 6;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_DECL__TYPE = 7;

+

+	/**

+	 * The number of structural features of the '<em>EXml Element Decl</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_DECL_FEATURE_COUNT = 8;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef <em>EXml Element Ref</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementRef()

+	 * @generated

+	 */

+	public static final int EXML_ELEMENT_REF = 18;

+

+	/**

+	 * The feature id for the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REF__JAVA_ATTRIBUTE = EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REF__XML_ACCESSOR_TYPE = EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REF__XML_ACCESS_METHODS = EJAVA_ATTRIBUTE_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REF__XML_JAVA_TYPE_ADAPTER = EJAVA_ATTRIBUTE_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REF__CONTAINER_TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REF__READ_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 3;

+

+	/**

+	 * The feature id for the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REF__WRITE_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 4;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REF__TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 5;

+

+	/**

+	 * The feature id for the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REF__XML_PROPERTIES = EJAVA_ATTRIBUTE_FEATURE_COUNT + 6;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REF__NAME = EJAVA_ATTRIBUTE_FEATURE_COUNT + 7;

+

+	/**

+	 * The feature id for the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REF__NAMESPACE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 8;

+

+	/**

+	 * The feature id for the '<em><b>Xml Mixed</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REF__XML_MIXED = EJAVA_ATTRIBUTE_FEATURE_COUNT + 9;

+

+	/**

+	 * The feature id for the '<em><b>Xml Element Wrapper</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REF__XML_ELEMENT_WRAPPER = EJAVA_ATTRIBUTE_FEATURE_COUNT + 10;

+

+	/**

+	 * The number of structural features of the '<em>EXml Element Ref</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REF_FEATURE_COUNT = EJAVA_ATTRIBUTE_FEATURE_COUNT + 11;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs <em>EXml Element Refs</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementRefs()

+	 * @generated

+	 */

+	public static final int EXML_ELEMENT_REFS = 19;

+

+	/**

+	 * The feature id for the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REFS__JAVA_ATTRIBUTE = EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REFS__XML_ACCESSOR_TYPE = EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REFS__XML_ACCESS_METHODS = EJAVA_ATTRIBUTE_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REFS__XML_JAVA_TYPE_ADAPTER = EJAVA_ATTRIBUTE_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REFS__READ_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REFS__WRITE_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 3;

+

+	/**

+	 * The feature id for the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REFS__XML_PROPERTIES = EJAVA_ATTRIBUTE_FEATURE_COUNT + 4;

+

+	/**

+	 * The feature id for the '<em><b>Xml Mixed</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REFS__XML_MIXED = EJAVA_ATTRIBUTE_FEATURE_COUNT + 5;

+

+	/**

+	 * The feature id for the '<em><b>Xml Element Refs</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REFS__XML_ELEMENT_REFS = EJAVA_ATTRIBUTE_FEATURE_COUNT + 6;

+

+	/**

+	 * The feature id for the '<em><b>Xml Element Wrapper</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REFS__XML_ELEMENT_WRAPPER = EJAVA_ATTRIBUTE_FEATURE_COUNT + 7;

+

+	/**

+	 * The number of structural features of the '<em>EXml Element Refs</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_REFS_FEATURE_COUNT = EJAVA_ATTRIBUTE_FEATURE_COUNT + 8;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements <em>EXml Elements</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElements()

+	 * @generated

+	 */

+	public static final int EXML_ELEMENTS = 20;

+

+	/**

+	 * The feature id for the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENTS__JAVA_ATTRIBUTE = EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENTS__XML_ACCESSOR_TYPE = EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENTS__XML_ACCESS_METHODS = EJAVA_ATTRIBUTE_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENTS__CONTAINER_TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENTS__READ_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENTS__WRITE_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 3;

+

+	/**

+	 * The feature id for the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENTS__XML_PROPERTIES = EJAVA_ATTRIBUTE_FEATURE_COUNT + 4;

+

+	/**

+	 * The feature id for the '<em><b>Xml Id Ref</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENTS__XML_ID_REF = EJAVA_ATTRIBUTE_FEATURE_COUNT + 5;

+

+	/**

+	 * The feature id for the '<em><b>Xml List</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENTS__XML_LIST = EJAVA_ATTRIBUTE_FEATURE_COUNT + 6;

+

+	/**

+	 * The feature id for the '<em><b>Xml Elements</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENTS__XML_ELEMENTS = EJAVA_ATTRIBUTE_FEATURE_COUNT + 7;

+

+	/**

+	 * The feature id for the '<em><b>Xml Element Wrapper</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENTS__XML_ELEMENT_WRAPPER = EJAVA_ATTRIBUTE_FEATURE_COUNT + 8;

+

+	/**

+	 * The feature id for the '<em><b>Xml Join Nodes</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENTS__XML_JOIN_NODES = EJAVA_ATTRIBUTE_FEATURE_COUNT + 9;

+

+	/**

+	 * The number of structural features of the '<em>EXml Elements</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENTS_FEATURE_COUNT = EJAVA_ATTRIBUTE_FEATURE_COUNT + 10;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper <em>EXml Element Wrapper</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementWrapper()

+	 * @generated

+	 */

+	public static final int EXML_ELEMENT_WRAPPER = 21;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_WRAPPER__NAME = 0;

+

+	/**

+	 * The feature id for the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_WRAPPER__NAMESPACE = 1;

+

+	/**

+	 * The feature id for the '<em><b>Nillable</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_WRAPPER__NILLABLE = 2;

+

+	/**

+	 * The feature id for the '<em><b>Required</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_WRAPPER__REQUIRED = 3;

+

+	/**

+	 * The number of structural features of the '<em>EXml Element Wrapper</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ELEMENT_WRAPPER_FEATURE_COUNT = 4;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum <em>EXml Enum</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlEnum()

+	 * @generated

+	 */

+	public static final int EXML_ENUM = 22;

+

+	/**

+	 * The feature id for the '<em><b>Java Enum</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ENUM__JAVA_ENUM = 0;

+

+	/**

+	 * The feature id for the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ENUM__VALUE = 1;

+

+	/**

+	 * The feature id for the '<em><b>Xml Enum Values</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ENUM__XML_ENUM_VALUES = 2;

+

+	/**

+	 * The number of structural features of the '<em>EXml Enum</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ENUM_FEATURE_COUNT = 3;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnumValue <em>EXml Enum Value</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnumValue

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlEnumValue()

+	 * @generated

+	 */

+	public static final int EXML_ENUM_VALUE = 23;

+

+	/**

+	 * The feature id for the '<em><b>Java Enum Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ENUM_VALUE__JAVA_ENUM_VALUE = 0;

+

+	/**

+	 * The number of structural features of the '<em>EXml Enum Value</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ENUM_VALUE_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference <em>EXml Inverse Reference</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlInverseReference()

+	 * @generated

+	 */

+	public static final int EXML_INVERSE_REFERENCE = 24;

+

+	/**

+	 * The feature id for the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_INVERSE_REFERENCE__JAVA_ATTRIBUTE = EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_INVERSE_REFERENCE__XML_ACCESSOR_TYPE = EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_INVERSE_REFERENCE__XML_ACCESS_METHODS = EJAVA_ATTRIBUTE_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_INVERSE_REFERENCE__CONTAINER_TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_INVERSE_REFERENCE__TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_INVERSE_REFERENCE__XML_PROPERTIES = EJAVA_ATTRIBUTE_FEATURE_COUNT + 3;

+

+	/**

+	 * The feature id for the '<em><b>Mapped By</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_INVERSE_REFERENCE__MAPPED_BY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 4;

+

+	/**

+	 * The number of structural features of the '<em>EXml Inverse Reference</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_INVERSE_REFERENCE_FEATURE_COUNT = EJAVA_ATTRIBUTE_FEATURE_COUNT + 5;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetNullPolicy <em>EXml Is Set Null Policy</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetNullPolicy

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlIsSetNullPolicy()

+	 * @generated

+	 */

+	public static final int EXML_IS_SET_NULL_POLICY = 25;

+

+	/**

+	 * The feature id for the '<em><b>Xsi Nil Represents Null</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_IS_SET_NULL_POLICY__XSI_NIL_REPRESENTS_NULL = EABSTRACT_XML_NULL_POLICY__XSI_NIL_REPRESENTS_NULL;

+

+	/**

+	 * The feature id for the '<em><b>Empty Node Represents Null</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_IS_SET_NULL_POLICY__EMPTY_NODE_REPRESENTS_NULL = EABSTRACT_XML_NULL_POLICY__EMPTY_NODE_REPRESENTS_NULL;

+

+	/**

+	 * The feature id for the '<em><b>Null Representation For Xml</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_IS_SET_NULL_POLICY__NULL_REPRESENTATION_FOR_XML = EABSTRACT_XML_NULL_POLICY__NULL_REPRESENTATION_FOR_XML;

+

+	/**

+	 * The feature id for the '<em><b>Is Set Method Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_IS_SET_NULL_POLICY__IS_SET_METHOD_NAME = EABSTRACT_XML_NULL_POLICY_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Xml Is Set Parameters</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_IS_SET_NULL_POLICY__XML_IS_SET_PARAMETERS = EABSTRACT_XML_NULL_POLICY_FEATURE_COUNT + 1;

+

+	/**

+	 * The number of structural features of the '<em>EXml Is Set Null Policy</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_IS_SET_NULL_POLICY_FEATURE_COUNT = EABSTRACT_XML_NULL_POLICY_FEATURE_COUNT + 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter <em>EXml Is Set Parameter</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlIsSetParameter()

+	 * @generated

+	 */

+	public static final int EXML_IS_SET_PARAMETER = 26;

+

+	/**

+	 * The feature id for the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_IS_SET_PARAMETER__VALUE = 0;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_IS_SET_PARAMETER__TYPE = 1;

+

+	/**

+	 * The number of structural features of the '<em>EXml Is Set Parameter</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_IS_SET_PARAMETER_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter <em>EXml Java Type Adapter</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJavaTypeAdapter()

+	 * @generated

+	 */

+	public static final int EXML_JAVA_TYPE_ADAPTER = 27;

+

+	/**

+	 * The feature id for the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JAVA_TYPE_ADAPTER__JAVA_ATTRIBUTE = EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JAVA_TYPE_ADAPTER__XML_ACCESSOR_TYPE = EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JAVA_TYPE_ADAPTER__VALUE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JAVA_TYPE_ADAPTER__TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Value Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JAVA_TYPE_ADAPTER__VALUE_TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 2;

+

+	/**

+	 * The number of structural features of the '<em>EXml Java Type Adapter</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JAVA_TYPE_ADAPTER_FEATURE_COUNT = EJAVA_ATTRIBUTE_FEATURE_COUNT + 3;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode <em>EXml Join Node</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJoinNode()

+	 * @generated

+	 */

+	public static final int EXML_JOIN_NODE = 28;

+

+	/**

+	 * The feature id for the '<em><b>Xml Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JOIN_NODE__XML_PATH = 0;

+

+	/**

+	 * The feature id for the '<em><b>Referenced Xml Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JOIN_NODE__REFERENCED_XML_PATH = 1;

+

+	/**

+	 * The number of structural features of the '<em>EXml Join Node</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JOIN_NODE_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes <em>EXml Join Nodes</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJoinNodes()

+	 * @generated

+	 */

+	public static final int EXML_JOIN_NODES = 29;

+

+	/**

+	 * The feature id for the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JOIN_NODES__JAVA_ATTRIBUTE = EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JOIN_NODES__XML_ACCESSOR_TYPE = EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JOIN_NODES__CONTAINER_TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JOIN_NODES__TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Xml Join Nodes</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JOIN_NODES__XML_JOIN_NODES = EJAVA_ATTRIBUTE_FEATURE_COUNT + 2;

+

+	/**

+	 * The number of structural features of the '<em>EXml Join Nodes</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_JOIN_NODES_FEATURE_COUNT = EJAVA_ATTRIBUTE_FEATURE_COUNT + 3;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMap <em>EXml Map</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMap

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlMap()

+	 * @generated

+	 */

+	public static final int EXML_MAP = 30;

+

+	/**

+	 * The feature id for the '<em><b>Key</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_MAP__KEY = 0;

+

+	/**

+	 * The feature id for the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_MAP__VALUE = 1;

+

+	/**

+	 * The number of structural features of the '<em>EXml Map</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_MAP_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNullPolicy <em>EXml Null Policy</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNullPolicy

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlNullPolicy()

+	 * @generated

+	 */

+	public static final int EXML_NULL_POLICY = 31;

+

+	/**

+	 * The feature id for the '<em><b>Xsi Nil Represents Null</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_NULL_POLICY__XSI_NIL_REPRESENTS_NULL = EABSTRACT_XML_NULL_POLICY__XSI_NIL_REPRESENTS_NULL;

+

+	/**

+	 * The feature id for the '<em><b>Empty Node Represents Null</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_NULL_POLICY__EMPTY_NODE_REPRESENTS_NULL = EABSTRACT_XML_NULL_POLICY__EMPTY_NODE_REPRESENTS_NULL;

+

+	/**

+	 * The feature id for the '<em><b>Null Representation For Xml</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_NULL_POLICY__NULL_REPRESENTATION_FOR_XML = EABSTRACT_XML_NULL_POLICY__NULL_REPRESENTATION_FOR_XML;

+

+	/**

+	 * The feature id for the '<em><b>Is Set Performed For Absent Node</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_NULL_POLICY__IS_SET_PERFORMED_FOR_ABSENT_NODE = EABSTRACT_XML_NULL_POLICY_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>EXml Null Policy</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_NULL_POLICY_FEATURE_COUNT = EABSTRACT_XML_NULL_POLICY_FEATURE_COUNT + 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs <em>EXml Ns</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlNs()

+	 * @generated

+	 */

+	public static final int EXML_NS = 32;

+

+	/**

+	 * The feature id for the '<em><b>Namespace Uri</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_NS__NAMESPACE_URI = 0;

+

+	/**

+	 * The feature id for the '<em><b>Prefix</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_NS__PREFIX = 1;

+

+	/**

+	 * The number of structural features of the '<em>EXml Ns</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_NS_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty <em>EXml Property</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlProperty()

+	 * @generated

+	 */

+	public static final int EXML_PROPERTY = 33;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_PROPERTY__NAME = 0;

+

+	/**

+	 * The feature id for the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_PROPERTY__VALUE = 1;

+

+	/**

+	 * The feature id for the '<em><b>Value Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_PROPERTY__VALUE_TYPE = 2;

+

+	/**

+	 * The number of structural features of the '<em>EXml Property</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_PROPERTY_FEATURE_COUNT = 3;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlReadTransformer <em>EXml Read Transformer</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlReadTransformer

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlReadTransformer()

+	 * @generated

+	 */

+	public static final int EXML_READ_TRANSFORMER = 34;

+

+	/**

+	 * The feature id for the '<em><b>Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_READ_TRANSFORMER__METHOD = EABSTRACT_XML_TRANSFORMER__METHOD;

+

+	/**

+	 * The feature id for the '<em><b>Transformer Class</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_READ_TRANSFORMER__TRANSFORMER_CLASS = EABSTRACT_XML_TRANSFORMER__TRANSFORMER_CLASS;

+

+	/**

+	 * The number of structural features of the '<em>EXml Read Transformer</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_READ_TRANSFORMER_FEATURE_COUNT = EABSTRACT_XML_TRANSFORMER_FEATURE_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRegistry <em>EXml Registry</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRegistry

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlRegistry()

+	 * @generated

+	 */

+	public static final int EXML_REGISTRY = 35;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_REGISTRY__NAME = 0;

+

+	/**

+	 * The feature id for the '<em><b>Xml Element Decls</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_REGISTRY__XML_ELEMENT_DECLS = 1;

+

+	/**

+	 * The number of structural features of the '<em>EXml Registry</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_REGISTRY_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRootElement <em>EXml Root Element</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRootElement

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlRootElement()

+	 * @generated

+	 */

+	public static final int EXML_ROOT_ELEMENT = 36;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ROOT_ELEMENT__NAME = 0;

+

+	/**

+	 * The feature id for the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ROOT_ELEMENT__NAMESPACE = 1;

+

+	/**

+	 * The number of structural features of the '<em>EXml Root Element</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_ROOT_ELEMENT_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema <em>EXml Schema</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSchema()

+	 * @generated

+	 */

+	public static final int EXML_SCHEMA = 37;

+

+	/**

+	 * The feature id for the '<em><b>Attribute Form Default</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_SCHEMA__ATTRIBUTE_FORM_DEFAULT = 0;

+

+	/**

+	 * The feature id for the '<em><b>Element Form Default</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_SCHEMA__ELEMENT_FORM_DEFAULT = 1;

+

+	/**

+	 * The feature id for the '<em><b>Location</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_SCHEMA__LOCATION = 2;

+

+	/**

+	 * The feature id for the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_SCHEMA__NAMESPACE = 3;

+

+	/**

+	 * The feature id for the '<em><b>Xmlns</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_SCHEMA__XMLNS = 4;

+

+	/**

+	 * The number of structural features of the '<em>EXml Schema</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_SCHEMA_FEATURE_COUNT = 5;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType <em>EXml Schema Type</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSchemaType()

+	 * @generated

+	 */

+	public static final int EXML_SCHEMA_TYPE = 38;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_SCHEMA_TYPE__NAME = 0;

+

+	/**

+	 * The feature id for the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_SCHEMA_TYPE__NAMESPACE = 1;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_SCHEMA_TYPE__TYPE = 2;

+

+	/**

+	 * The number of structural features of the '<em>EXml Schema Type</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_SCHEMA_TYPE_FEATURE_COUNT = 3;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation <em>EXml Transformation</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlTransformation()

+	 * @generated

+	 */

+	public static final int EXML_TRANSFORMATION = 39;

+

+	/**

+	 * The feature id for the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TRANSFORMATION__JAVA_ATTRIBUTE = EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TRANSFORMATION__XML_ACCESSOR_TYPE = EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TRANSFORMATION__XML_ACCESS_METHODS = EJAVA_ATTRIBUTE_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TRANSFORMATION__XML_PROPERTIES = EJAVA_ATTRIBUTE_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Optional</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TRANSFORMATION__OPTIONAL = EJAVA_ATTRIBUTE_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Xml Read Transformer</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TRANSFORMATION__XML_READ_TRANSFORMER = EJAVA_ATTRIBUTE_FEATURE_COUNT + 3;

+

+	/**

+	 * The feature id for the '<em><b>Xml Write Transformers</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TRANSFORMATION__XML_WRITE_TRANSFORMERS = EJAVA_ATTRIBUTE_FEATURE_COUNT + 4;

+

+	/**

+	 * The number of structural features of the '<em>EXml Transformation</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TRANSFORMATION_FEATURE_COUNT = EJAVA_ATTRIBUTE_FEATURE_COUNT + 5;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransient <em>EXml Transient</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransient

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlTransient()

+	 * @generated

+	 */

+	public static final int EXML_TRANSIENT = 40;

+

+	/**

+	 * The feature id for the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TRANSIENT__JAVA_ATTRIBUTE = EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TRANSIENT__XML_ACCESSOR_TYPE = EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Location</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TRANSIENT__XML_LOCATION = EJAVA_ATTRIBUTE_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>EXml Transient</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TRANSIENT_FEATURE_COUNT = EJAVA_ATTRIBUTE_FEATURE_COUNT + 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType <em>EXml Type</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlType()

+	 * @generated

+	 */

+	public static final int EXML_TYPE = 41;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TYPE__NAME = 0;

+

+	/**

+	 * The feature id for the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TYPE__NAMESPACE = 1;

+

+	/**

+	 * The feature id for the '<em><b>Factory Class</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TYPE__FACTORY_CLASS = 2;

+

+	/**

+	 * The feature id for the '<em><b>Factory Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TYPE__FACTORY_METHOD = 3;

+

+	/**

+	 * The feature id for the '<em><b>Prop Order</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TYPE__PROP_ORDER = 4;

+

+	/**

+	 * The number of structural features of the '<em>EXml Type</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_TYPE_FEATURE_COUNT = 5;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue <em>EXml Value</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlValue()

+	 * @generated

+	 */

+	public static final int EXML_VALUE = 42;

+

+	/**

+	 * The feature id for the '<em><b>Java Attribute</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VALUE__JAVA_ATTRIBUTE = EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Accessor Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VALUE__XML_ACCESSOR_TYPE = EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Xml Access Methods</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VALUE__XML_ACCESS_METHODS = EJAVA_ATTRIBUTE_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Xml Java Type Adapter</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VALUE__XML_JAVA_TYPE_ADAPTER = EJAVA_ATTRIBUTE_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Container Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VALUE__CONTAINER_TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Read Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VALUE__READ_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 3;

+

+	/**

+	 * The feature id for the '<em><b>Write Only</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VALUE__WRITE_ONLY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 4;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VALUE__TYPE = EJAVA_ATTRIBUTE_FEATURE_COUNT + 5;

+

+	/**

+	 * The feature id for the '<em><b>Xml Properties</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VALUE__XML_PROPERTIES = EJAVA_ATTRIBUTE_FEATURE_COUNT + 6;

+

+	/**

+	 * The feature id for the '<em><b>Cdata</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VALUE__CDATA = EJAVA_ATTRIBUTE_FEATURE_COUNT + 7;

+

+	/**

+	 * The feature id for the '<em><b>Xml Abstract Null Policy</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VALUE__XML_ABSTRACT_NULL_POLICY = EJAVA_ATTRIBUTE_FEATURE_COUNT + 8;

+

+	/**

+	 * The number of structural features of the '<em>EXml Value</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VALUE_FEATURE_COUNT = EJAVA_ATTRIBUTE_FEATURE_COUNT + 9;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods <em>EXml Virtual Access Methods</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlVirtualAccessMethods()

+	 * @generated

+	 */

+	public static final int EXML_VIRTUAL_ACCESS_METHODS = 43;

+

+	/**

+	 * The feature id for the '<em><b>Get Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VIRTUAL_ACCESS_METHODS__GET_METHOD = 0;

+

+	/**

+	 * The feature id for the '<em><b>Set Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VIRTUAL_ACCESS_METHODS__SET_METHOD = 1;

+

+	/**

+	 * The feature id for the '<em><b>Schema</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VIRTUAL_ACCESS_METHODS__SCHEMA = 2;

+

+	/**

+	 * The number of structural features of the '<em>EXml Virtual Access Methods</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_VIRTUAL_ACCESS_METHODS_FEATURE_COUNT = 3;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlWriteTransformer <em>EXml Write Transformer</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlWriteTransformer

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlWriteTransformer()

+	 * @generated

+	 */

+	public static final int EXML_WRITE_TRANSFORMER = 44;

+

+	/**

+	 * The feature id for the '<em><b>Method</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_WRITE_TRANSFORMER__METHOD = EABSTRACT_XML_TRANSFORMER__METHOD;

+

+	/**

+	 * The feature id for the '<em><b>Transformer Class</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_WRITE_TRANSFORMER__TRANSFORMER_CLASS = EABSTRACT_XML_TRANSFORMER__TRANSFORMER_CLASS;

+

+	/**

+	 * The feature id for the '<em><b>Xml Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_WRITE_TRANSFORMER__XML_PATH = EABSTRACT_XML_TRANSFORMER_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>EXml Write Transformer</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	public static final int EXML_WRITE_TRANSFORMER_FEATURE_COUNT = EABSTRACT_XML_TRANSFORMER_FEATURE_COUNT + 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder <em>EXml Access Order</em>}' enum.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAccessOrder()

+	 * @generated

+	 */

+	public static final int EXML_ACCESS_ORDER = 45;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType <em>EXml Access Type</em>}' enum.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAccessType()

+	 * @generated

+	 */

+	public static final int EXML_ACCESS_TYPE = 46;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMarshalNullRepresentation <em>EXml Marshal Null Representation</em>}' enum.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMarshalNullRepresentation

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlMarshalNullRepresentation()

+	 * @generated

+	 */

+	public static final int EXML_MARSHAL_NULL_REPRESENTATION = 47;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNsForm <em>EXml Ns Form</em>}' enum.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNsForm

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlNsForm()

+	 * @generated

+	 */

+	public static final int EXML_NS_FORM = 48;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethodsSchema <em>EXml Virtual Access Methods Schema</em>}' enum.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethodsSchema

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlVirtualAccessMethodsSchema()

+	 * @generated

+	 */

+	public static final int EXML_VIRTUAL_ACCESS_METHODS_SCHEMA = 49;

+

+	/**

+	 * The meta object id for the '<em>EProp Order</em>' data type.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see java.util.List

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropOrder()

+	 * @generated

+	 */

+	public static final int EPROP_ORDER = 50;

+

+	/**

+	 * The meta object id for the '<em>EXml See Also</em>' data type.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see java.util.List

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSeeAlso()

+	 * @generated

+	 */

+	public static final int EXML_SEE_ALSO = 51;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eAbstractXmlNullPolicyEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eAbstractXmlTransformerEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eAccessibleJavaAttributeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eAdaptableJavaAttributeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eContainerJavaAttributeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eJavaAttributeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eJavaTypeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass ePropertyHolderEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eReadWriteJavaAttributeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eTypedJavaAttributeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlAccessMethodsEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlAnyAttributeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlAnyElementEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlAttributeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlBindingsEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlClassExtractorEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlElementEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlElementDeclEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlElementRefEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlElementRefsEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlElementsEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlElementWrapperEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlEnumEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlEnumValueEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlInverseReferenceEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlIsSetNullPolicyEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlIsSetParameterEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlJavaTypeAdapterEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlJoinNodeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlJoinNodesEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlMapEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlNullPolicyEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlNsEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlPropertyEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlReadTransformerEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlRegistryEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlRootElementEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlSchemaEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlSchemaTypeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlTransformationEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlTransientEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlTypeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlValueEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlVirtualAccessMethodsEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass eXmlWriteTransformerEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EEnum eXmlAccessOrderEEnum = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EEnum eXmlAccessTypeEEnum = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EEnum eXmlMarshalNullRepresentationEEnum = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EEnum eXmlNsFormEEnum = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EEnum eXmlVirtualAccessMethodsSchemaEEnum = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EDataType ePropOrderEDataType = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EDataType eXmlSeeAlsoEDataType = null;

+

+	/**

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * package URI value.

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.emf.ecore.EPackage.Registry

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#eNS_URI

+	 * @see #init()

+	 * @generated

+	 */

+	private OxmPackage()

+	{

+		super(eNS_URI, OxmFactory.eINSTANCE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static boolean isInited = false;

+

+	/**

+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+	 * 

+	 * <p>This method is used to initialize {@link OxmPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #eNS_URI

+	 * @see #createPackageContents()

+	 * @see #initializePackageContents()

+	 * @generated

+	 */

+	public static OxmPackage init()

+	{

+		if (isInited) return (OxmPackage)EPackage.Registry.INSTANCE.getEPackage(OxmPackage.eNS_URI);

+

+		// Obtain or create and register package

+		OxmPackage theOxmPackage = (OxmPackage)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof OxmPackage ? EPackage.Registry.INSTANCE.get(eNS_URI) : new OxmPackage());

+

+		isInited = true;

+

+		// Initialize simple dependencies

+		CommonPackage.eINSTANCE.eClass();

+

+		// Create package meta-data objects

+		theOxmPackage.createPackageContents();

+

+		// Initialize created meta-data

+		theOxmPackage.initializePackageContents();

+

+		// Register package validator

+		EValidator.Registry.INSTANCE.put

+			(theOxmPackage, 

+			 new EValidator.Descriptor()

+			 {

+				 public EValidator getEValidator()

+				 {

+					 return OxmValidator.INSTANCE;

+				 }

+			 });

+

+		// Mark meta-data to indicate it can't be changed

+		theOxmPackage.freeze();

+

+  

+		// Update the registry and return the package

+		EPackage.Registry.INSTANCE.put(OxmPackage.eNS_URI, theOxmPackage);

+		return theOxmPackage;

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy <em>EAbstract Xml Null Policy</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EAbstract Xml Null Policy</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy

+	 * @generated

+	 */

+	public EClass getEAbstractXmlNullPolicy()

+	{

+		return eAbstractXmlNullPolicyEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy#isXsiNilRepresentsNull <em>Xsi Nil Represents Null</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xsi Nil Represents Null</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy#isXsiNilRepresentsNull()

+	 * @see #getEAbstractXmlNullPolicy()

+	 * @generated

+	 */

+	public EAttribute getEAbstractXmlNullPolicy_XsiNilRepresentsNull()

+	{

+		return (EAttribute)eAbstractXmlNullPolicyEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy#isEmptyNodeRepresentsNull <em>Empty Node Represents Null</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Empty Node Represents Null</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy#isEmptyNodeRepresentsNull()

+	 * @see #getEAbstractXmlNullPolicy()

+	 * @generated

+	 */

+	public EAttribute getEAbstractXmlNullPolicy_EmptyNodeRepresentsNull()

+	{

+		return (EAttribute)eAbstractXmlNullPolicyEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy#getNullRepresentationForXml <em>Null Representation For Xml</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Null Representation For Xml</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy#getNullRepresentationForXml()

+	 * @see #getEAbstractXmlNullPolicy()

+	 * @generated

+	 */

+	public EAttribute getEAbstractXmlNullPolicy_NullRepresentationForXml()

+	{

+		return (EAttribute)eAbstractXmlNullPolicyEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlTransformer <em>EAbstract Xml Transformer</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EAbstract Xml Transformer</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlTransformer

+	 * @generated

+	 */

+	public EClass getEAbstractXmlTransformer()

+	{

+		return eAbstractXmlTransformerEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlTransformer#getMethod <em>Method</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Method</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlTransformer#getMethod()

+	 * @see #getEAbstractXmlTransformer()

+	 * @generated

+	 */

+	public EAttribute getEAbstractXmlTransformer_Method()

+	{

+		return (EAttribute)eAbstractXmlTransformerEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlTransformer#getTransformerClass <em>Transformer Class</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Transformer Class</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlTransformer#getTransformerClass()

+	 * @see #getEAbstractXmlTransformer()

+	 * @generated

+	 */

+	public EAttribute getEAbstractXmlTransformer_TransformerClass()

+	{

+		return (EAttribute)eAbstractXmlTransformerEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAccessibleJavaAttribute <em>EAccessible Java Attribute</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EAccessible Java Attribute</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAccessibleJavaAttribute

+	 * @generated

+	 */

+	public EClass getEAccessibleJavaAttribute()

+	{

+		return eAccessibleJavaAttributeEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAccessibleJavaAttribute#getXmlAccessMethods <em>Xml Access Methods</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Access Methods</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAccessibleJavaAttribute#getXmlAccessMethods()

+	 * @see #getEAccessibleJavaAttribute()

+	 * @generated

+	 */

+	public EReference getEAccessibleJavaAttribute_XmlAccessMethods()

+	{

+		return (EReference)eAccessibleJavaAttributeEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAdaptableJavaAttribute <em>EAdaptable Java Attribute</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EAdaptable Java Attribute</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAdaptableJavaAttribute

+	 * @generated

+	 */

+	public EClass getEAdaptableJavaAttribute()

+	{

+		return eAdaptableJavaAttributeEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAdaptableJavaAttribute#getXmlJavaTypeAdapter <em>Xml Java Type Adapter</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Java Type Adapter</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAdaptableJavaAttribute#getXmlJavaTypeAdapter()

+	 * @see #getEAdaptableJavaAttribute()

+	 * @generated

+	 */

+	public EReference getEAdaptableJavaAttribute_XmlJavaTypeAdapter()

+	{

+		return (EReference)eAdaptableJavaAttributeEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EContainerJavaAttribute <em>EContainer Java Attribute</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EContainer Java Attribute</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EContainerJavaAttribute

+	 * @generated

+	 */

+	public EClass getEContainerJavaAttribute()

+	{

+		return eContainerJavaAttributeEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EContainerJavaAttribute#getContainerType <em>Container Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Container Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EContainerJavaAttribute#getContainerType()

+	 * @see #getEContainerJavaAttribute()

+	 * @generated

+	 */

+	public EAttribute getEContainerJavaAttribute_ContainerType()

+	{

+		return (EAttribute)eContainerJavaAttributeEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute <em>EJava Attribute</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EJava Attribute</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute

+	 * @generated

+	 */

+	public EClass getEJavaAttribute()

+	{

+		return eJavaAttributeEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute#getJavaAttribute <em>Java Attribute</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Java Attribute</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute#getJavaAttribute()

+	 * @see #getEJavaAttribute()

+	 * @generated

+	 */

+	public EAttribute getEJavaAttribute_JavaAttribute()

+	{

+		return (EAttribute)eJavaAttributeEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute#getXmlAccessorType <em>Xml Accessor Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Accessor Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute#getXmlAccessorType()

+	 * @see #getEJavaAttribute()

+	 * @generated

+	 */

+	public EAttribute getEJavaAttribute_XmlAccessorType()

+	{

+		return (EAttribute)eJavaAttributeEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType <em>EJava Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EJava Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType

+	 * @generated

+	 */

+	public EClass getEJavaType()

+	{

+		return eJavaTypeEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getName()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EAttribute getEJavaType_Name()

+	{

+		return (EAttribute)eJavaTypeEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getSuperType <em>Super Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Super Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getSuperType()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EAttribute getEJavaType_SuperType()

+	{

+		return (EAttribute)eJavaTypeEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlAccessorOrder <em>Xml Accessor Order</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Accessor Order</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlAccessorOrder()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EAttribute getEJavaType_XmlAccessorOrder()

+	{

+		return (EAttribute)eJavaTypeEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlAccessorType <em>Xml Accessor Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Accessor Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlAccessorType()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EAttribute getEJavaType_XmlAccessorType()

+	{

+		return (EAttribute)eJavaTypeEClass.getEStructuralFeatures().get(3);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlCustomizer <em>Xml Customizer</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Customizer</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlCustomizer()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EAttribute getEJavaType_XmlCustomizer()

+	{

+		return (EAttribute)eJavaTypeEClass.getEStructuralFeatures().get(4);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlDiscriminatorNode <em>Xml Discriminator Node</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Discriminator Node</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlDiscriminatorNode()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EAttribute getEJavaType_XmlDiscriminatorNode()

+	{

+		return (EAttribute)eJavaTypeEClass.getEStructuralFeatures().get(5);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlDiscriminatorValue <em>Xml Discriminator Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Discriminator Value</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlDiscriminatorValue()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EAttribute getEJavaType_XmlDiscriminatorValue()

+	{

+		return (EAttribute)eJavaTypeEClass.getEStructuralFeatures().get(6);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#isXmlInlineBinaryData <em>Xml Inline Binary Data</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Inline Binary Data</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#isXmlInlineBinaryData()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EAttribute getEJavaType_XmlInlineBinaryData()

+	{

+		return (EAttribute)eJavaTypeEClass.getEStructuralFeatures().get(7);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#isXmlTransient <em>Xml Transient</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Transient</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#isXmlTransient()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EAttribute getEJavaType_XmlTransient()

+	{

+		return (EAttribute)eJavaTypeEClass.getEStructuralFeatures().get(8);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlNameTransformer <em>Xml Name Transformer</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Name Transformer</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlNameTransformer()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EAttribute getEJavaType_XmlNameTransformer()

+	{

+		return (EAttribute)eJavaTypeEClass.getEStructuralFeatures().get(9);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlType <em>Xml Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlType()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EReference getEJavaType_XmlType()

+	{

+		return (EReference)eJavaTypeEClass.getEStructuralFeatures().get(10);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlRootElement <em>Xml Root Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Root Element</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlRootElement()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EReference getEJavaType_XmlRootElement()

+	{

+		return (EReference)eJavaTypeEClass.getEStructuralFeatures().get(11);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlVirtualAccessMethods <em>Xml Virtual Access Methods</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Virtual Access Methods</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlVirtualAccessMethods()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EReference getEJavaType_XmlVirtualAccessMethods()

+	{

+		return (EReference)eJavaTypeEClass.getEStructuralFeatures().get(12);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlSeeAlso <em>Xml See Also</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml See Also</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlSeeAlso()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EAttribute getEJavaType_XmlSeeAlso()

+	{

+		return (EAttribute)eJavaTypeEClass.getEStructuralFeatures().get(13);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlJavaTypeAdapter <em>Xml Java Type Adapter</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Java Type Adapter</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlJavaTypeAdapter()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EReference getEJavaType_XmlJavaTypeAdapter()

+	{

+		return (EReference)eJavaTypeEClass.getEStructuralFeatures().get(14);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlClassExtractor <em>Xml Class Extractor</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Class Extractor</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getXmlClassExtractor()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EReference getEJavaType_XmlClassExtractor()

+	{

+		return (EReference)eJavaTypeEClass.getEStructuralFeatures().get(15);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getJavaAttributes <em>Java Attributes</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Java Attributes</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType#getJavaAttributes()

+	 * @see #getEJavaType()

+	 * @generated

+	 */

+	public EReference getEJavaType_JavaAttributes()

+	{

+		return (EReference)eJavaTypeEClass.getEStructuralFeatures().get(16);

+	}

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EPropertyHolder <em>EProperty Holder</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EProperty Holder</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EPropertyHolder

+	 * @generated

+	 */

+	public EClass getEPropertyHolder()

+	{

+		return ePropertyHolderEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EPropertyHolder#getXmlProperties <em>Xml Properties</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Xml Properties</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EPropertyHolder#getXmlProperties()

+	 * @see #getEPropertyHolder()

+	 * @generated

+	 */

+	public EReference getEPropertyHolder_XmlProperties()

+	{

+		return (EReference)ePropertyHolderEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EReadWriteJavaAttribute <em>ERead Write Java Attribute</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>ERead Write Java Attribute</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EReadWriteJavaAttribute

+	 * @generated

+	 */

+	public EClass getEReadWriteJavaAttribute()

+	{

+		return eReadWriteJavaAttributeEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EReadWriteJavaAttribute#isReadOnly <em>Read Only</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Read Only</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EReadWriteJavaAttribute#isReadOnly()

+	 * @see #getEReadWriteJavaAttribute()

+	 * @generated

+	 */

+	public EAttribute getEReadWriteJavaAttribute_ReadOnly()

+	{

+		return (EAttribute)eReadWriteJavaAttributeEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EReadWriteJavaAttribute#isWriteOnly <em>Write Only</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Write Only</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EReadWriteJavaAttribute#isWriteOnly()

+	 * @see #getEReadWriteJavaAttribute()

+	 * @generated

+	 */

+	public EAttribute getEReadWriteJavaAttribute_WriteOnly()

+	{

+		return (EAttribute)eReadWriteJavaAttributeEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.ETypedJavaAttribute <em>ETyped Java Attribute</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>ETyped Java Attribute</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.ETypedJavaAttribute

+	 * @generated

+	 */

+	public EClass getETypedJavaAttribute()

+	{

+		return eTypedJavaAttributeEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.ETypedJavaAttribute#getType <em>Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.ETypedJavaAttribute#getType()

+	 * @see #getETypedJavaAttribute()

+	 * @generated

+	 */

+	public EAttribute getETypedJavaAttribute_Type()

+	{

+		return (EAttribute)eTypedJavaAttributeEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessMethods <em>EXml Access Methods</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Access Methods</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessMethods

+	 * @generated

+	 */

+	public EClass getEXmlAccessMethods()

+	{

+		return eXmlAccessMethodsEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessMethods#getGetMethod <em>Get Method</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Get Method</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessMethods#getGetMethod()

+	 * @see #getEXmlAccessMethods()

+	 * @generated

+	 */

+	public EAttribute getEXmlAccessMethods_GetMethod()

+	{

+		return (EAttribute)eXmlAccessMethodsEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessMethods#getSetMethod <em>Set Method</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Set Method</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessMethods#getSetMethod()

+	 * @see #getEXmlAccessMethods()

+	 * @generated

+	 */

+	public EAttribute getEXmlAccessMethods_SetMethod()

+	{

+		return (EAttribute)eXmlAccessMethodsEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute <em>EXml Any Attribute</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Any Attribute</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute

+	 * @generated

+	 */

+	public EClass getEXmlAnyAttribute()

+	{

+		return eXmlAnyAttributeEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute#getXmlPath <em>Xml Path</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Path</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute#getXmlPath()

+	 * @see #getEXmlAnyAttribute()

+	 * @generated

+	 */

+	public EAttribute getEXmlAnyAttribute_XmlPath()

+	{

+		return (EAttribute)eXmlAnyAttributeEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement <em>EXml Any Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Any Element</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement

+	 * @generated

+	 */

+	public EClass getEXmlAnyElement()

+	{

+		return eXmlAnyElementEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#isXmlMixed <em>Xml Mixed</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Mixed</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#isXmlMixed()

+	 * @see #getEXmlAnyElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlAnyElement_XmlMixed()

+	{

+		return (EAttribute)eXmlAnyElementEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#isLax <em>Lax</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Lax</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#isLax()

+	 * @see #getEXmlAnyElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlAnyElement_Lax()

+	{

+		return (EAttribute)eXmlAnyElementEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getDomHandler <em>Dom Handler</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Dom Handler</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getDomHandler()

+	 * @see #getEXmlAnyElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlAnyElement_DomHandler()

+	{

+		return (EAttribute)eXmlAnyElementEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getXmlPath <em>Xml Path</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Path</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getXmlPath()

+	 * @see #getEXmlAnyElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlAnyElement_XmlPath()

+	{

+		return (EAttribute)eXmlAnyElementEClass.getEStructuralFeatures().get(3);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getXmlElementRefs <em>Xml Element Refs</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Element Refs</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement#getXmlElementRefs()

+	 * @see #getEXmlAnyElement()

+	 * @generated

+	 */

+	public EReference getEXmlAnyElement_XmlElementRefs()

+	{

+		return (EReference)eXmlAnyElementEClass.getEStructuralFeatures().get(4);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute <em>EXml Attribute</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Attribute</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute

+	 * @generated

+	 */

+	public EClass getEXmlAttribute()

+	{

+		return eXmlAttributeEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getName()

+	 * @see #getEXmlAttribute()

+	 * @generated

+	 */

+	public EAttribute getEXmlAttribute_Name()

+	{

+		return (EAttribute)eXmlAttributeEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getNamespace <em>Namespace</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Namespace</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getNamespace()

+	 * @see #getEXmlAttribute()

+	 * @generated

+	 */

+	public EAttribute getEXmlAttribute_Namespace()

+	{

+		return (EAttribute)eXmlAttributeEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isRequired <em>Required</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Required</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isRequired()

+	 * @see #getEXmlAttribute()

+	 * @generated

+	 */

+	public EAttribute getEXmlAttribute_Required()

+	{

+		return (EAttribute)eXmlAttributeEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlId <em>Xml Id</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Id</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlId()

+	 * @see #getEXmlAttribute()

+	 * @generated

+	 */

+	public EAttribute getEXmlAttribute_XmlId()

+	{

+		return (EAttribute)eXmlAttributeEClass.getEStructuralFeatures().get(3);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlIdRef <em>Xml Id Ref</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Id Ref</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlIdRef()

+	 * @see #getEXmlAttribute()

+	 * @generated

+	 */

+	public EAttribute getEXmlAttribute_XmlIdRef()

+	{

+		return (EAttribute)eXmlAttributeEClass.getEStructuralFeatures().get(4);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlKey <em>Xml Key</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Key</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlKey()

+	 * @see #getEXmlAttribute()

+	 * @generated

+	 */

+	public EAttribute getEXmlAttribute_XmlKey()

+	{

+		return (EAttribute)eXmlAttributeEClass.getEStructuralFeatures().get(5);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlList <em>Xml List</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml List</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlList()

+	 * @see #getEXmlAttribute()

+	 * @generated

+	 */

+	public EAttribute getEXmlAttribute_XmlList()

+	{

+		return (EAttribute)eXmlAttributeEClass.getEStructuralFeatures().get(6);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlInlineBinaryData <em>Xml Inline Binary Data</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Inline Binary Data</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlInlineBinaryData()

+	 * @see #getEXmlAttribute()

+	 * @generated

+	 */

+	public EAttribute getEXmlAttribute_XmlInlineBinaryData()

+	{

+		return (EAttribute)eXmlAttributeEClass.getEStructuralFeatures().get(7);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlAttachmentRef <em>Xml Attachment Ref</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Attachment Ref</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#isXmlAttachmentRef()

+	 * @see #getEXmlAttribute()

+	 * @generated

+	 */

+	public EAttribute getEXmlAttribute_XmlAttachmentRef()

+	{

+		return (EAttribute)eXmlAttributeEClass.getEStructuralFeatures().get(8);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlMimeType <em>Xml Mime Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Mime Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlMimeType()

+	 * @see #getEXmlAttribute()

+	 * @generated

+	 */

+	public EAttribute getEXmlAttribute_XmlMimeType()

+	{

+		return (EAttribute)eXmlAttributeEClass.getEStructuralFeatures().get(9);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlPath <em>Xml Path</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Path</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlPath()

+	 * @see #getEXmlAttribute()

+	 * @generated

+	 */

+	public EAttribute getEXmlAttribute_XmlPath()

+	{

+		return (EAttribute)eXmlAttributeEClass.getEStructuralFeatures().get(10);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlAbstractNullPolicy <em>Xml Abstract Null Policy</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Abstract Null Policy</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlAbstractNullPolicy()

+	 * @see #getEXmlAttribute()

+	 * @generated

+	 */

+	public EReference getEXmlAttribute_XmlAbstractNullPolicy()

+	{

+		return (EReference)eXmlAttributeEClass.getEStructuralFeatures().get(11);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlSchemaType <em>Xml Schema Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Schema Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute#getXmlSchemaType()

+	 * @see #getEXmlAttribute()

+	 * @generated

+	 */

+	public EReference getEXmlAttribute_XmlSchemaType()

+	{

+		return (EReference)eXmlAttributeEClass.getEStructuralFeatures().get(12);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings <em>EXml Bindings</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Bindings</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings

+	 * @generated

+	 */

+	public EClass getEXmlBindings()

+	{

+		return eXmlBindingsEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlAccessorType <em>Xml Accessor Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Accessor Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlAccessorType()

+	 * @see #getEXmlBindings()

+	 * @generated

+	 */

+	public EAttribute getEXmlBindings_XmlAccessorType()

+	{

+		return (EAttribute)eXmlBindingsEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlAccessorOrder <em>Xml Accessor Order</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Accessor Order</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlAccessorOrder()

+	 * @see #getEXmlBindings()

+	 * @generated

+	 */

+	public EAttribute getEXmlBindings_XmlAccessorOrder()

+	{

+		return (EAttribute)eXmlBindingsEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#isXmlMappingMetadataComplete <em>Xml Mapping Metadata Complete</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Mapping Metadata Complete</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#isXmlMappingMetadataComplete()

+	 * @see #getEXmlBindings()

+	 * @generated

+	 */

+	public EAttribute getEXmlBindings_XmlMappingMetadataComplete()

+	{

+		return (EAttribute)eXmlBindingsEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getPackageName <em>Package Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Package Name</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getPackageName()

+	 * @see #getEXmlBindings()

+	 * @generated

+	 */

+	public EAttribute getEXmlBindings_PackageName()

+	{

+		return (EAttribute)eXmlBindingsEClass.getEStructuralFeatures().get(3);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlNameTransformer <em>Xml Name Transformer</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Name Transformer</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlNameTransformer()

+	 * @see #getEXmlBindings()

+	 * @generated

+	 */

+	public EAttribute getEXmlBindings_XmlNameTransformer()

+	{

+		return (EAttribute)eXmlBindingsEClass.getEStructuralFeatures().get(4);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlSchema <em>Xml Schema</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Schema</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlSchema()

+	 * @see #getEXmlBindings()

+	 * @generated

+	 */

+	public EReference getEXmlBindings_XmlSchema()

+	{

+		return (EReference)eXmlBindingsEClass.getEStructuralFeatures().get(5);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlSchemaType <em>Xml Schema Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Schema Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlSchemaType()

+	 * @see #getEXmlBindings()

+	 * @generated

+	 */

+	public EReference getEXmlBindings_XmlSchemaType()

+	{

+		return (EReference)eXmlBindingsEClass.getEStructuralFeatures().get(6);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlSchemaTypes <em>Xml Schema Types</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Xml Schema Types</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlSchemaTypes()

+	 * @see #getEXmlBindings()

+	 * @generated

+	 */

+	public EReference getEXmlBindings_XmlSchemaTypes()

+	{

+		return (EReference)eXmlBindingsEClass.getEStructuralFeatures().get(7);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlJavaTypeAdapters <em>Xml Java Type Adapters</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Xml Java Type Adapters</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlJavaTypeAdapters()

+	 * @see #getEXmlBindings()

+	 * @generated

+	 */

+	public EReference getEXmlBindings_XmlJavaTypeAdapters()

+	{

+		return (EReference)eXmlBindingsEClass.getEStructuralFeatures().get(8);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlRegistries <em>Xml Registries</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Xml Registries</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlRegistries()

+	 * @see #getEXmlBindings()

+	 * @generated

+	 */

+	public EReference getEXmlBindings_XmlRegistries()

+	{

+		return (EReference)eXmlBindingsEClass.getEStructuralFeatures().get(9);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlEnums <em>Xml Enums</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Xml Enums</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getXmlEnums()

+	 * @see #getEXmlBindings()

+	 * @generated

+	 */

+	public EReference getEXmlBindings_XmlEnums()

+	{

+		return (EReference)eXmlBindingsEClass.getEStructuralFeatures().get(10);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getJavaTypes <em>Java Types</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Java Types</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings#getJavaTypes()

+	 * @see #getEXmlBindings()

+	 * @generated

+	 */

+	public EReference getEXmlBindings_JavaTypes()

+	{

+		return (EReference)eXmlBindingsEClass.getEStructuralFeatures().get(11);

+	}

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlClassExtractor <em>EXml Class Extractor</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Class Extractor</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlClassExtractor

+	 * @generated

+	 */

+	public EClass getEXmlClassExtractor()

+	{

+		return eXmlClassExtractorEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlClassExtractor#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.jaxb.eclipselink.core.resource.oxm.EXmlClassExtractor#getClassName()

+	 * @see #getEXmlClassExtractor()

+	 * @generated

+	 */

+	public EAttribute getEXmlClassExtractor_ClassName()

+	{

+		return (EAttribute)eXmlClassExtractorEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement <em>EXml Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Element</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement

+	 * @generated

+	 */

+	public EClass getEXmlElement()

+	{

+		return eXmlElementEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getName()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_Name()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getNamespace <em>Namespace</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Namespace</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getNamespace()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_Namespace()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getDefaultValue <em>Default Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Default Value</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getDefaultValue()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_DefaultValue()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isNillable <em>Nillable</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Nillable</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isNillable()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_Nillable()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(3);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isRequired <em>Required</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Required</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isRequired()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_Required()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(4);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlId <em>Xml Id</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Id</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlId()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_XmlId()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(5);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlIdRef <em>Xml Id Ref</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Id Ref</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlIdRef()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_XmlIdRef()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(6);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlKey <em>Xml Key</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Key</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlKey()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_XmlKey()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(7);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlList <em>Xml List</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml List</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlList()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_XmlList()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(8);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlInlineBinaryData <em>Xml Inline Binary Data</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Inline Binary Data</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlInlineBinaryData()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_XmlInlineBinaryData()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(9);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlAttachmentRef <em>Xml Attachment Ref</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Attachment Ref</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlAttachmentRef()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_XmlAttachmentRef()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(10);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlMimeType <em>Xml Mime Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Mime Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlMimeType()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_XmlMimeType()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(11);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isCdata <em>Cdata</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Cdata</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isCdata()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_Cdata()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(12);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlPath <em>Xml Path</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Path</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlPath()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_XmlPath()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(13);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlLocation <em>Xml Location</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Location</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#isXmlLocation()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlElement_XmlLocation()

+	{

+		return (EAttribute)eXmlElementEClass.getEStructuralFeatures().get(14);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlAbstractNullPolicy <em>Xml Abstract Null Policy</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Abstract Null Policy</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlAbstractNullPolicy()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EReference getEXmlElement_XmlAbstractNullPolicy()

+	{

+		return (EReference)eXmlElementEClass.getEStructuralFeatures().get(15);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlElementWrapper <em>Xml Element Wrapper</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Element Wrapper</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlElementWrapper()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EReference getEXmlElement_XmlElementWrapper()

+	{

+		return (EReference)eXmlElementEClass.getEStructuralFeatures().get(16);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlMap <em>Xml Map</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Map</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlMap()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EReference getEXmlElement_XmlMap()

+	{

+		return (EReference)eXmlElementEClass.getEStructuralFeatures().get(17);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlSchemaType <em>Xml Schema Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Schema Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement#getXmlSchemaType()

+	 * @see #getEXmlElement()

+	 * @generated

+	 */

+	public EReference getEXmlElement_XmlSchemaType()

+	{

+		return (EReference)eXmlElementEClass.getEStructuralFeatures().get(18);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl <em>EXml Element Decl</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Element Decl</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl

+	 * @generated

+	 */

+	public EClass getEXmlElementDecl()

+	{

+		return eXmlElementDeclEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getJavaMethod <em>Java Method</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Java Method</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getJavaMethod()

+	 * @see #getEXmlElementDecl()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementDecl_JavaMethod()

+	{

+		return (EAttribute)eXmlElementDeclEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getName()

+	 * @see #getEXmlElementDecl()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementDecl_Name()

+	{

+		return (EAttribute)eXmlElementDeclEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getNamespace <em>Namespace</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Namespace</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getNamespace()

+	 * @see #getEXmlElementDecl()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementDecl_Namespace()

+	{

+		return (EAttribute)eXmlElementDeclEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getDefaultValue <em>Default Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Default Value</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getDefaultValue()

+	 * @see #getEXmlElementDecl()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementDecl_DefaultValue()

+	{

+		return (EAttribute)eXmlElementDeclEClass.getEStructuralFeatures().get(3);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getScope <em>Scope</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Scope</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getScope()

+	 * @see #getEXmlElementDecl()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementDecl_Scope()

+	{

+		return (EAttribute)eXmlElementDeclEClass.getEStructuralFeatures().get(4);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getSubstitutionHeadName <em>Substitution Head Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Substitution Head Name</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getSubstitutionHeadName()

+	 * @see #getEXmlElementDecl()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementDecl_SubstitutionHeadName()

+	{

+		return (EAttribute)eXmlElementDeclEClass.getEStructuralFeatures().get(5);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getSubstitutionHeadNamespace <em>Substitution Head Namespace</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Substitution Head Namespace</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getSubstitutionHeadNamespace()

+	 * @see #getEXmlElementDecl()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementDecl_SubstitutionHeadNamespace()

+	{

+		return (EAttribute)eXmlElementDeclEClass.getEStructuralFeatures().get(6);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getType <em>Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl#getType()

+	 * @see #getEXmlElementDecl()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementDecl_Type()

+	{

+		return (EAttribute)eXmlElementDeclEClass.getEStructuralFeatures().get(7);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef <em>EXml Element Ref</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Element Ref</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef

+	 * @generated

+	 */

+	public EClass getEXmlElementRef()

+	{

+		return eXmlElementRefEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getName()

+	 * @see #getEXmlElementRef()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementRef_Name()

+	{

+		return (EAttribute)eXmlElementRefEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getNamespace <em>Namespace</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Namespace</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getNamespace()

+	 * @see #getEXmlElementRef()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementRef_Namespace()

+	{

+		return (EAttribute)eXmlElementRefEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#isXmlMixed <em>Xml Mixed</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Mixed</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#isXmlMixed()

+	 * @see #getEXmlElementRef()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementRef_XmlMixed()

+	{

+		return (EAttribute)eXmlElementRefEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getXmlElementWrapper <em>Xml Element Wrapper</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Element Wrapper</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef#getXmlElementWrapper()

+	 * @see #getEXmlElementRef()

+	 * @generated

+	 */

+	public EReference getEXmlElementRef_XmlElementWrapper()

+	{

+		return (EReference)eXmlElementRefEClass.getEStructuralFeatures().get(3);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs <em>EXml Element Refs</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Element Refs</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs

+	 * @generated

+	 */

+	public EClass getEXmlElementRefs()

+	{

+		return eXmlElementRefsEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#isXmlMixed <em>Xml Mixed</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Mixed</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#isXmlMixed()

+	 * @see #getEXmlElementRefs()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementRefs_XmlMixed()

+	{

+		return (EAttribute)eXmlElementRefsEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#getXmlElementRefs <em>Xml Element Refs</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Xml Element Refs</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#getXmlElementRefs()

+	 * @see #getEXmlElementRefs()

+	 * @generated

+	 */

+	public EReference getEXmlElementRefs_XmlElementRefs()

+	{

+		return (EReference)eXmlElementRefsEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#getXmlElementWrapper <em>Xml Element Wrapper</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Element Wrapper</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs#getXmlElementWrapper()

+	 * @see #getEXmlElementRefs()

+	 * @generated

+	 */

+	public EReference getEXmlElementRefs_XmlElementWrapper()

+	{

+		return (EReference)eXmlElementRefsEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements <em>EXml Elements</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Elements</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements

+	 * @generated

+	 */

+	public EClass getEXmlElements()

+	{

+		return eXmlElementsEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#isXmlIdRef <em>Xml Id Ref</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Id Ref</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#isXmlIdRef()

+	 * @see #getEXmlElements()

+	 * @generated

+	 */

+	public EAttribute getEXmlElements_XmlIdRef()

+	{

+		return (EAttribute)eXmlElementsEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#isXmlList <em>Xml List</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml List</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#isXmlList()

+	 * @see #getEXmlElements()

+	 * @generated

+	 */

+	public EAttribute getEXmlElements_XmlList()

+	{

+		return (EAttribute)eXmlElementsEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#getXmlElements <em>Xml Elements</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Xml Elements</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#getXmlElements()

+	 * @see #getEXmlElements()

+	 * @generated

+	 */

+	public EReference getEXmlElements_XmlElements()

+	{

+		return (EReference)eXmlElementsEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#getXmlElementWrapper <em>Xml Element Wrapper</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Element Wrapper</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#getXmlElementWrapper()

+	 * @see #getEXmlElements()

+	 * @generated

+	 */

+	public EReference getEXmlElements_XmlElementWrapper()

+	{

+		return (EReference)eXmlElementsEClass.getEStructuralFeatures().get(3);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#getXmlJoinNodes <em>Xml Join Nodes</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Xml Join Nodes</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements#getXmlJoinNodes()

+	 * @see #getEXmlElements()

+	 * @generated

+	 */

+	public EReference getEXmlElements_XmlJoinNodes()

+	{

+		return (EReference)eXmlElementsEClass.getEStructuralFeatures().get(4);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper <em>EXml Element Wrapper</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Element Wrapper</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper

+	 * @generated

+	 */

+	public EClass getEXmlElementWrapper()

+	{

+		return eXmlElementWrapperEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#getName()

+	 * @see #getEXmlElementWrapper()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementWrapper_Name()

+	{

+		return (EAttribute)eXmlElementWrapperEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#getNamespace <em>Namespace</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Namespace</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#getNamespace()

+	 * @see #getEXmlElementWrapper()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementWrapper_Namespace()

+	{

+		return (EAttribute)eXmlElementWrapperEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#isNillable <em>Nillable</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Nillable</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#isNillable()

+	 * @see #getEXmlElementWrapper()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementWrapper_Nillable()

+	{

+		return (EAttribute)eXmlElementWrapperEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#isRequired <em>Required</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Required</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper#isRequired()

+	 * @see #getEXmlElementWrapper()

+	 * @generated

+	 */

+	public EAttribute getEXmlElementWrapper_Required()

+	{

+		return (EAttribute)eXmlElementWrapperEClass.getEStructuralFeatures().get(3);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum <em>EXml Enum</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Enum</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum

+	 * @generated

+	 */

+	public EClass getEXmlEnum()

+	{

+		return eXmlEnumEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum#getJavaEnum <em>Java Enum</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Java Enum</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum#getJavaEnum()

+	 * @see #getEXmlEnum()

+	 * @generated

+	 */

+	public EAttribute getEXmlEnum_JavaEnum()

+	{

+		return (EAttribute)eXmlEnumEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum#getValue <em>Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Value</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum#getValue()

+	 * @see #getEXmlEnum()

+	 * @generated

+	 */

+	public EAttribute getEXmlEnum_Value()

+	{

+		return (EAttribute)eXmlEnumEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum#getXmlEnumValues <em>Xml Enum Values</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Xml Enum Values</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum#getXmlEnumValues()

+	 * @see #getEXmlEnum()

+	 * @generated

+	 */

+	public EReference getEXmlEnum_XmlEnumValues()

+	{

+		return (EReference)eXmlEnumEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnumValue <em>EXml Enum Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Enum Value</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnumValue

+	 * @generated

+	 */

+	public EClass getEXmlEnumValue()

+	{

+		return eXmlEnumValueEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnumValue#getJavaEnumValue <em>Java Enum Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Java Enum Value</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnumValue#getJavaEnumValue()

+	 * @see #getEXmlEnumValue()

+	 * @generated

+	 */

+	public EAttribute getEXmlEnumValue_JavaEnumValue()

+	{

+		return (EAttribute)eXmlEnumValueEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference <em>EXml Inverse Reference</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Inverse Reference</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference

+	 * @generated

+	 */

+	public EClass getEXmlInverseReference()

+	{

+		return eXmlInverseReferenceEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference#getMappedBy <em>Mapped By</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Mapped By</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference#getMappedBy()

+	 * @see #getEXmlInverseReference()

+	 * @generated

+	 */

+	public EAttribute getEXmlInverseReference_MappedBy()

+	{

+		return (EAttribute)eXmlInverseReferenceEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetNullPolicy <em>EXml Is Set Null Policy</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Is Set Null Policy</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetNullPolicy

+	 * @generated

+	 */

+	public EClass getEXmlIsSetNullPolicy()

+	{

+		return eXmlIsSetNullPolicyEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetNullPolicy#getIsSetMethodName <em>Is Set Method Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Is Set Method Name</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetNullPolicy#getIsSetMethodName()

+	 * @see #getEXmlIsSetNullPolicy()

+	 * @generated

+	 */

+	public EAttribute getEXmlIsSetNullPolicy_IsSetMethodName()

+	{

+		return (EAttribute)eXmlIsSetNullPolicyEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetNullPolicy#getXmlIsSetParameters <em>Xml Is Set Parameters</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Xml Is Set Parameters</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetNullPolicy#getXmlIsSetParameters()

+	 * @see #getEXmlIsSetNullPolicy()

+	 * @generated

+	 */

+	public EReference getEXmlIsSetNullPolicy_XmlIsSetParameters()

+	{

+		return (EReference)eXmlIsSetNullPolicyEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter <em>EXml Is Set Parameter</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Is Set Parameter</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter

+	 * @generated

+	 */

+	public EClass getEXmlIsSetParameter()

+	{

+		return eXmlIsSetParameterEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter#getValue <em>Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Value</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter#getValue()

+	 * @see #getEXmlIsSetParameter()

+	 * @generated

+	 */

+	public EAttribute getEXmlIsSetParameter_Value()

+	{

+		return (EAttribute)eXmlIsSetParameterEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter#getType <em>Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter#getType()

+	 * @see #getEXmlIsSetParameter()

+	 * @generated

+	 */

+	public EAttribute getEXmlIsSetParameter_Type()

+	{

+		return (EAttribute)eXmlIsSetParameterEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter <em>EXml Java Type Adapter</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Java Type Adapter</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter

+	 * @generated

+	 */

+	public EClass getEXmlJavaTypeAdapter()

+	{

+		return eXmlJavaTypeAdapterEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter#getValue <em>Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Value</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter#getValue()

+	 * @see #getEXmlJavaTypeAdapter()

+	 * @generated

+	 */

+	public EAttribute getEXmlJavaTypeAdapter_Value()

+	{

+		return (EAttribute)eXmlJavaTypeAdapterEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter#getType <em>Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter#getType()

+	 * @see #getEXmlJavaTypeAdapter()

+	 * @generated

+	 */

+	public EAttribute getEXmlJavaTypeAdapter_Type()

+	{

+		return (EAttribute)eXmlJavaTypeAdapterEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter#getValueType <em>Value Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Value Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter#getValueType()

+	 * @see #getEXmlJavaTypeAdapter()

+	 * @generated

+	 */

+	public EAttribute getEXmlJavaTypeAdapter_ValueType()

+	{

+		return (EAttribute)eXmlJavaTypeAdapterEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode <em>EXml Join Node</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Join Node</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode

+	 * @generated

+	 */

+	public EClass getEXmlJoinNode()

+	{

+		return eXmlJoinNodeEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode#getXmlPath <em>Xml Path</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Path</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode#getXmlPath()

+	 * @see #getEXmlJoinNode()

+	 * @generated

+	 */

+	public EAttribute getEXmlJoinNode_XmlPath()

+	{

+		return (EAttribute)eXmlJoinNodeEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode#getReferencedXmlPath <em>Referenced Xml Path</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Referenced Xml Path</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode#getReferencedXmlPath()

+	 * @see #getEXmlJoinNode()

+	 * @generated

+	 */

+	public EAttribute getEXmlJoinNode_ReferencedXmlPath()

+	{

+		return (EAttribute)eXmlJoinNodeEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes <em>EXml Join Nodes</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Join Nodes</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes

+	 * @generated

+	 */

+	public EClass getEXmlJoinNodes()

+	{

+		return eXmlJoinNodesEClass;

+	}

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes#getXmlJoinNodes <em>Xml Join Nodes</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Xml Join Nodes</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes#getXmlJoinNodes()

+	 * @see #getEXmlJoinNodes()

+	 * @generated

+	 */

+	public EReference getEXmlJoinNodes_XmlJoinNodes()

+	{

+		return (EReference)eXmlJoinNodesEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMap <em>EXml Map</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Map</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMap

+	 * @generated

+	 */

+	public EClass getEXmlMap()

+	{

+		return eXmlMapEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMap#getKey <em>Key</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Key</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMap#getKey()

+	 * @see #getEXmlMap()

+	 * @generated

+	 */

+	public EAttribute getEXmlMap_Key()

+	{

+		return (EAttribute)eXmlMapEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMap#getValue <em>Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Value</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMap#getValue()

+	 * @see #getEXmlMap()

+	 * @generated

+	 */

+	public EAttribute getEXmlMap_Value()

+	{

+		return (EAttribute)eXmlMapEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNullPolicy <em>EXml Null Policy</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Null Policy</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNullPolicy

+	 * @generated

+	 */

+	public EClass getEXmlNullPolicy()

+	{

+		return eXmlNullPolicyEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNullPolicy#isIsSetPerformedForAbsentNode <em>Is Set Performed For Absent Node</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Is Set Performed For Absent Node</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNullPolicy#isIsSetPerformedForAbsentNode()

+	 * @see #getEXmlNullPolicy()

+	 * @generated

+	 */

+	public EAttribute getEXmlNullPolicy_IsSetPerformedForAbsentNode()

+	{

+		return (EAttribute)eXmlNullPolicyEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs <em>EXml Ns</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Ns</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs

+	 * @generated

+	 */

+	public EClass getEXmlNs()

+	{

+		return eXmlNsEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs#getNamespaceUri <em>Namespace Uri</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Namespace Uri</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs#getNamespaceUri()

+	 * @see #getEXmlNs()

+	 * @generated

+	 */

+	public EAttribute getEXmlNs_NamespaceUri()

+	{

+		return (EAttribute)eXmlNsEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs#getPrefix <em>Prefix</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Prefix</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs#getPrefix()

+	 * @see #getEXmlNs()

+	 * @generated

+	 */

+	public EAttribute getEXmlNs_Prefix()

+	{

+		return (EAttribute)eXmlNsEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty <em>EXml Property</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Property</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty

+	 * @generated

+	 */

+	public EClass getEXmlProperty()

+	{

+		return eXmlPropertyEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty#getName()

+	 * @see #getEXmlProperty()

+	 * @generated

+	 */

+	public EAttribute getEXmlProperty_Name()

+	{

+		return (EAttribute)eXmlPropertyEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty#getValue <em>Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Value</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty#getValue()

+	 * @see #getEXmlProperty()

+	 * @generated

+	 */

+	public EAttribute getEXmlProperty_Value()

+	{

+		return (EAttribute)eXmlPropertyEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty#getValueType <em>Value Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Value Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty#getValueType()

+	 * @see #getEXmlProperty()

+	 * @generated

+	 */

+	public EAttribute getEXmlProperty_ValueType()

+	{

+		return (EAttribute)eXmlPropertyEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlReadTransformer <em>EXml Read Transformer</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Read Transformer</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlReadTransformer

+	 * @generated

+	 */

+	public EClass getEXmlReadTransformer()

+	{

+		return eXmlReadTransformerEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRegistry <em>EXml Registry</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Registry</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRegistry

+	 * @generated

+	 */

+	public EClass getEXmlRegistry()

+	{

+		return eXmlRegistryEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRegistry#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRegistry#getName()

+	 * @see #getEXmlRegistry()

+	 * @generated

+	 */

+	public EAttribute getEXmlRegistry_Name()

+	{

+		return (EAttribute)eXmlRegistryEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRegistry#getXmlElementDecls <em>Xml Element Decls</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Xml Element Decls</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRegistry#getXmlElementDecls()

+	 * @see #getEXmlRegistry()

+	 * @generated

+	 */

+	public EReference getEXmlRegistry_XmlElementDecls()

+	{

+		return (EReference)eXmlRegistryEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRootElement <em>EXml Root Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Root Element</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRootElement

+	 * @generated

+	 */

+	public EClass getEXmlRootElement()

+	{

+		return eXmlRootElementEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRootElement#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRootElement#getName()

+	 * @see #getEXmlRootElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlRootElement_Name()

+	{

+		return (EAttribute)eXmlRootElementEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRootElement#getNamespace <em>Namespace</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Namespace</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRootElement#getNamespace()

+	 * @see #getEXmlRootElement()

+	 * @generated

+	 */

+	public EAttribute getEXmlRootElement_Namespace()

+	{

+		return (EAttribute)eXmlRootElementEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema <em>EXml Schema</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Schema</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema

+	 * @generated

+	 */

+	public EClass getEXmlSchema()

+	{

+		return eXmlSchemaEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getAttributeFormDefault <em>Attribute Form Default</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Attribute Form Default</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getAttributeFormDefault()

+	 * @see #getEXmlSchema()

+	 * @generated

+	 */

+	public EAttribute getEXmlSchema_AttributeFormDefault()

+	{

+		return (EAttribute)eXmlSchemaEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getElementFormDefault <em>Element Form Default</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Element Form Default</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getElementFormDefault()

+	 * @see #getEXmlSchema()

+	 * @generated

+	 */

+	public EAttribute getEXmlSchema_ElementFormDefault()

+	{

+		return (EAttribute)eXmlSchemaEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getLocation <em>Location</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Location</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getLocation()

+	 * @see #getEXmlSchema()

+	 * @generated

+	 */

+	public EAttribute getEXmlSchema_Location()

+	{

+		return (EAttribute)eXmlSchemaEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getNamespace <em>Namespace</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Namespace</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getNamespace()

+	 * @see #getEXmlSchema()

+	 * @generated

+	 */

+	public EAttribute getEXmlSchema_Namespace()

+	{

+		return (EAttribute)eXmlSchemaEClass.getEStructuralFeatures().get(3);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getXmlns <em>Xmlns</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Xmlns</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema#getXmlns()

+	 * @see #getEXmlSchema()

+	 * @generated

+	 */

+	public EReference getEXmlSchema_Xmlns()

+	{

+		return (EReference)eXmlSchemaEClass.getEStructuralFeatures().get(4);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType <em>EXml Schema Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Schema Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType

+	 * @generated

+	 */

+	public EClass getEXmlSchemaType()

+	{

+		return eXmlSchemaTypeEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType#getName()

+	 * @see #getEXmlSchemaType()

+	 * @generated

+	 */

+	public EAttribute getEXmlSchemaType_Name()

+	{

+		return (EAttribute)eXmlSchemaTypeEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType#getNamespace <em>Namespace</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Namespace</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType#getNamespace()

+	 * @see #getEXmlSchemaType()

+	 * @generated

+	 */

+	public EAttribute getEXmlSchemaType_Namespace()

+	{

+		return (EAttribute)eXmlSchemaTypeEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType#getType <em>Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType#getType()

+	 * @see #getEXmlSchemaType()

+	 * @generated

+	 */

+	public EAttribute getEXmlSchemaType_Type()

+	{

+		return (EAttribute)eXmlSchemaTypeEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation <em>EXml Transformation</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Transformation</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation

+	 * @generated

+	 */

+	public EClass getEXmlTransformation()

+	{

+		return eXmlTransformationEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation#isOptional <em>Optional</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Optional</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation#isOptional()

+	 * @see #getEXmlTransformation()

+	 * @generated

+	 */

+	public EAttribute getEXmlTransformation_Optional()

+	{

+		return (EAttribute)eXmlTransformationEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation#getXmlReadTransformer <em>Xml Read Transformer</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Read Transformer</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation#getXmlReadTransformer()

+	 * @see #getEXmlTransformation()

+	 * @generated

+	 */

+	public EReference getEXmlTransformation_XmlReadTransformer()

+	{

+		return (EReference)eXmlTransformationEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation#getXmlWriteTransformers <em>Xml Write Transformers</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Xml Write Transformers</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation#getXmlWriteTransformers()

+	 * @see #getEXmlTransformation()

+	 * @generated

+	 */

+	public EReference getEXmlTransformation_XmlWriteTransformers()

+	{

+		return (EReference)eXmlTransformationEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransient <em>EXml Transient</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Transient</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransient

+	 * @generated

+	 */

+	public EClass getEXmlTransient()

+	{

+		return eXmlTransientEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransient#isXmlLocation <em>Xml Location</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Location</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransient#isXmlLocation()

+	 * @see #getEXmlTransient()

+	 * @generated

+	 */

+	public EAttribute getEXmlTransient_XmlLocation()

+	{

+		return (EAttribute)eXmlTransientEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType <em>EXml Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType

+	 * @generated

+	 */

+	public EClass getEXmlType()

+	{

+		return eXmlTypeEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getName()

+	 * @see #getEXmlType()

+	 * @generated

+	 */

+	public EAttribute getEXmlType_Name()

+	{

+		return (EAttribute)eXmlTypeEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getNamespace <em>Namespace</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Namespace</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getNamespace()

+	 * @see #getEXmlType()

+	 * @generated

+	 */

+	public EAttribute getEXmlType_Namespace()

+	{

+		return (EAttribute)eXmlTypeEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getFactoryClass <em>Factory Class</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Factory Class</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getFactoryClass()

+	 * @see #getEXmlType()

+	 * @generated

+	 */

+	public EAttribute getEXmlType_FactoryClass()

+	{

+		return (EAttribute)eXmlTypeEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getFactoryMethod <em>Factory Method</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Factory Method</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getFactoryMethod()

+	 * @see #getEXmlType()

+	 * @generated

+	 */

+	public EAttribute getEXmlType_FactoryMethod()

+	{

+		return (EAttribute)eXmlTypeEClass.getEStructuralFeatures().get(3);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getPropOrder <em>Prop Order</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Prop Order</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType#getPropOrder()

+	 * @see #getEXmlType()

+	 * @generated

+	 */

+	public EAttribute getEXmlType_PropOrder()

+	{

+		return (EAttribute)eXmlTypeEClass.getEStructuralFeatures().get(4);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue <em>EXml Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Value</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue

+	 * @generated

+	 */

+	public EClass getEXmlValue()

+	{

+		return eXmlValueEClass;

+	}

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue#isCdata <em>Cdata</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Cdata</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue#isCdata()

+	 * @see #getEXmlValue()

+	 * @generated

+	 */

+	public EAttribute getEXmlValue_Cdata()

+	{

+		return (EAttribute)eXmlValueEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue#getXmlAbstractNullPolicy <em>Xml Abstract Null Policy</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Xml Abstract Null Policy</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue#getXmlAbstractNullPolicy()

+	 * @see #getEXmlValue()

+	 * @generated

+	 */

+	public EReference getEXmlValue_XmlAbstractNullPolicy()

+	{

+		return (EReference)eXmlValueEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods <em>EXml Virtual Access Methods</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Virtual Access Methods</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods

+	 * @generated

+	 */

+	public EClass getEXmlVirtualAccessMethods()

+	{

+		return eXmlVirtualAccessMethodsEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods#getGetMethod <em>Get Method</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Get Method</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods#getGetMethod()

+	 * @see #getEXmlVirtualAccessMethods()

+	 * @generated

+	 */

+	public EAttribute getEXmlVirtualAccessMethods_GetMethod()

+	{

+		return (EAttribute)eXmlVirtualAccessMethodsEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods#getSetMethod <em>Set Method</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Set Method</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods#getSetMethod()

+	 * @see #getEXmlVirtualAccessMethods()

+	 * @generated

+	 */

+	public EAttribute getEXmlVirtualAccessMethods_SetMethod()

+	{

+		return (EAttribute)eXmlVirtualAccessMethodsEClass.getEStructuralFeatures().get(1);

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods#getSchema <em>Schema</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Schema</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods#getSchema()

+	 * @see #getEXmlVirtualAccessMethods()

+	 * @generated

+	 */

+	public EAttribute getEXmlVirtualAccessMethods_Schema()

+	{

+		return (EAttribute)eXmlVirtualAccessMethodsEClass.getEStructuralFeatures().get(2);

+	}

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlWriteTransformer <em>EXml Write Transformer</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EXml Write Transformer</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlWriteTransformer

+	 * @generated

+	 */

+	public EClass getEXmlWriteTransformer()

+	{

+		return eXmlWriteTransformerEClass;

+	}

+

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlWriteTransformer#getXmlPath <em>Xml Path</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Xml Path</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlWriteTransformer#getXmlPath()

+	 * @see #getEXmlWriteTransformer()

+	 * @generated

+	 */

+	public EAttribute getEXmlWriteTransformer_XmlPath()

+	{

+		return (EAttribute)eXmlWriteTransformerEClass.getEStructuralFeatures().get(0);

+	}

+

+

+	/**

+	 * Returns the meta object for enum '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder <em>EXml Access Order</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for enum '<em>EXml Access Order</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder

+	 * @generated

+	 */

+	public EEnum getEXmlAccessOrder()

+	{

+		return eXmlAccessOrderEEnum;

+	}

+

+

+	/**

+	 * Returns the meta object for enum '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType <em>EXml Access Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for enum '<em>EXml Access Type</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType

+	 * @generated

+	 */

+	public EEnum getEXmlAccessType()

+	{

+		return eXmlAccessTypeEEnum;

+	}

+

+

+	/**

+	 * Returns the meta object for enum '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMarshalNullRepresentation <em>EXml Marshal Null Representation</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for enum '<em>EXml Marshal Null Representation</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMarshalNullRepresentation

+	 * @generated

+	 */

+	public EEnum getEXmlMarshalNullRepresentation()

+	{

+		return eXmlMarshalNullRepresentationEEnum;

+	}

+

+

+	/**

+	 * Returns the meta object for enum '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNsForm <em>EXml Ns Form</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for enum '<em>EXml Ns Form</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNsForm

+	 * @generated

+	 */

+	public EEnum getEXmlNsForm()

+	{

+		return eXmlNsFormEEnum;

+	}

+

+

+	/**

+	 * Returns the meta object for enum '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethodsSchema <em>EXml Virtual Access Methods Schema</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for enum '<em>EXml Virtual Access Methods Schema</em>'.

+	 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethodsSchema

+	 * @generated

+	 */

+	public EEnum getEXmlVirtualAccessMethodsSchema()

+	{

+		return eXmlVirtualAccessMethodsSchemaEEnum;

+	}

+

+

+	/**

+	 * Returns the meta object for data type '{@link java.util.List <em>EProp Order</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for data type '<em>EProp Order</em>'.

+	 * @see java.util.List

+	 * @model instanceClass="java.util.List"

+	 *        extendedMetaData="itemType='http://www.eclipse.org/emf/2003/XMLType#string'"

+	 * @generated

+	 */

+	public EDataType getEPropOrder()

+	{

+		return ePropOrderEDataType;

+	}

+

+

+	/**

+	 * Returns the meta object for data type '{@link java.util.List <em>EXml See Also</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for data type '<em>EXml See Also</em>'.

+	 * @see java.util.List

+	 * @model instanceClass="java.util.List"

+	 *        extendedMetaData="itemType='http://www.eclipse.org/emf/2003/XMLType#string'"

+	 * @generated

+	 */

+	public EDataType getEXmlSeeAlso()

+	{

+		return eXmlSeeAlsoEDataType;

+	}

+

+

+	/**

+	 * Returns the factory that creates the instances of the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the factory that creates the instances of the model.

+	 * @generated

+	 */

+	public OxmFactory getOxmFactory()

+	{

+		return (OxmFactory)getEFactoryInstance();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private boolean isCreated = false;

+

+	/**

+	 * Creates the meta-model objects for the package.  This method is

+	 * guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void createPackageContents()

+	{

+		if (isCreated) return;

+		isCreated = true;

+

+		// Create classes and their features

+		eAbstractXmlNullPolicyEClass = createEClass(EABSTRACT_XML_NULL_POLICY);

+		createEAttribute(eAbstractXmlNullPolicyEClass, EABSTRACT_XML_NULL_POLICY__XSI_NIL_REPRESENTS_NULL);

+		createEAttribute(eAbstractXmlNullPolicyEClass, EABSTRACT_XML_NULL_POLICY__EMPTY_NODE_REPRESENTS_NULL);

+		createEAttribute(eAbstractXmlNullPolicyEClass, EABSTRACT_XML_NULL_POLICY__NULL_REPRESENTATION_FOR_XML);

+

+		eAbstractXmlTransformerEClass = createEClass(EABSTRACT_XML_TRANSFORMER);

+		createEAttribute(eAbstractXmlTransformerEClass, EABSTRACT_XML_TRANSFORMER__METHOD);

+		createEAttribute(eAbstractXmlTransformerEClass, EABSTRACT_XML_TRANSFORMER__TRANSFORMER_CLASS);

+

+		eAccessibleJavaAttributeEClass = createEClass(EACCESSIBLE_JAVA_ATTRIBUTE);

+		createEReference(eAccessibleJavaAttributeEClass, EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS);

+

+		eAdaptableJavaAttributeEClass = createEClass(EADAPTABLE_JAVA_ATTRIBUTE);

+		createEReference(eAdaptableJavaAttributeEClass, EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER);

+

+		eContainerJavaAttributeEClass = createEClass(ECONTAINER_JAVA_ATTRIBUTE);

+		createEAttribute(eContainerJavaAttributeEClass, ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE);

+

+		eJavaAttributeEClass = createEClass(EJAVA_ATTRIBUTE);

+		createEAttribute(eJavaAttributeEClass, EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE);

+		createEAttribute(eJavaAttributeEClass, EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE);

+

+		eJavaTypeEClass = createEClass(EJAVA_TYPE);

+		createEAttribute(eJavaTypeEClass, EJAVA_TYPE__NAME);

+		createEAttribute(eJavaTypeEClass, EJAVA_TYPE__SUPER_TYPE);

+		createEAttribute(eJavaTypeEClass, EJAVA_TYPE__XML_ACCESSOR_ORDER);

+		createEAttribute(eJavaTypeEClass, EJAVA_TYPE__XML_ACCESSOR_TYPE);

+		createEAttribute(eJavaTypeEClass, EJAVA_TYPE__XML_CUSTOMIZER);

+		createEAttribute(eJavaTypeEClass, EJAVA_TYPE__XML_DISCRIMINATOR_NODE);

+		createEAttribute(eJavaTypeEClass, EJAVA_TYPE__XML_DISCRIMINATOR_VALUE);

+		createEAttribute(eJavaTypeEClass, EJAVA_TYPE__XML_INLINE_BINARY_DATA);

+		createEAttribute(eJavaTypeEClass, EJAVA_TYPE__XML_TRANSIENT);

+		createEAttribute(eJavaTypeEClass, EJAVA_TYPE__XML_NAME_TRANSFORMER);

+		createEReference(eJavaTypeEClass, EJAVA_TYPE__XML_TYPE);

+		createEReference(eJavaTypeEClass, EJAVA_TYPE__XML_ROOT_ELEMENT);

+		createEReference(eJavaTypeEClass, EJAVA_TYPE__XML_VIRTUAL_ACCESS_METHODS);

+		createEAttribute(eJavaTypeEClass, EJAVA_TYPE__XML_SEE_ALSO);

+		createEReference(eJavaTypeEClass, EJAVA_TYPE__XML_JAVA_TYPE_ADAPTER);

+		createEReference(eJavaTypeEClass, EJAVA_TYPE__XML_CLASS_EXTRACTOR);

+		createEReference(eJavaTypeEClass, EJAVA_TYPE__JAVA_ATTRIBUTES);

+

+		ePropertyHolderEClass = createEClass(EPROPERTY_HOLDER);

+		createEReference(ePropertyHolderEClass, EPROPERTY_HOLDER__XML_PROPERTIES);

+

+		eReadWriteJavaAttributeEClass = createEClass(EREAD_WRITE_JAVA_ATTRIBUTE);

+		createEAttribute(eReadWriteJavaAttributeEClass, EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY);

+		createEAttribute(eReadWriteJavaAttributeEClass, EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY);

+

+		eTypedJavaAttributeEClass = createEClass(ETYPED_JAVA_ATTRIBUTE);

+		createEAttribute(eTypedJavaAttributeEClass, ETYPED_JAVA_ATTRIBUTE__TYPE);

+

+		eXmlAccessMethodsEClass = createEClass(EXML_ACCESS_METHODS);

+		createEAttribute(eXmlAccessMethodsEClass, EXML_ACCESS_METHODS__GET_METHOD);

+		createEAttribute(eXmlAccessMethodsEClass, EXML_ACCESS_METHODS__SET_METHOD);

+

+		eXmlAnyAttributeEClass = createEClass(EXML_ANY_ATTRIBUTE);

+		createEAttribute(eXmlAnyAttributeEClass, EXML_ANY_ATTRIBUTE__XML_PATH);

+

+		eXmlAnyElementEClass = createEClass(EXML_ANY_ELEMENT);

+		createEAttribute(eXmlAnyElementEClass, EXML_ANY_ELEMENT__XML_MIXED);

+		createEAttribute(eXmlAnyElementEClass, EXML_ANY_ELEMENT__LAX);

+		createEAttribute(eXmlAnyElementEClass, EXML_ANY_ELEMENT__DOM_HANDLER);

+		createEAttribute(eXmlAnyElementEClass, EXML_ANY_ELEMENT__XML_PATH);

+		createEReference(eXmlAnyElementEClass, EXML_ANY_ELEMENT__XML_ELEMENT_REFS);

+

+		eXmlAttributeEClass = createEClass(EXML_ATTRIBUTE);

+		createEAttribute(eXmlAttributeEClass, EXML_ATTRIBUTE__NAME);

+		createEAttribute(eXmlAttributeEClass, EXML_ATTRIBUTE__NAMESPACE);

+		createEAttribute(eXmlAttributeEClass, EXML_ATTRIBUTE__REQUIRED);

+		createEAttribute(eXmlAttributeEClass, EXML_ATTRIBUTE__XML_ID);

+		createEAttribute(eXmlAttributeEClass, EXML_ATTRIBUTE__XML_ID_REF);

+		createEAttribute(eXmlAttributeEClass, EXML_ATTRIBUTE__XML_KEY);

+		createEAttribute(eXmlAttributeEClass, EXML_ATTRIBUTE__XML_LIST);

+		createEAttribute(eXmlAttributeEClass, EXML_ATTRIBUTE__XML_INLINE_BINARY_DATA);

+		createEAttribute(eXmlAttributeEClass, EXML_ATTRIBUTE__XML_ATTACHMENT_REF);

+		createEAttribute(eXmlAttributeEClass, EXML_ATTRIBUTE__XML_MIME_TYPE);

+		createEAttribute(eXmlAttributeEClass, EXML_ATTRIBUTE__XML_PATH);

+		createEReference(eXmlAttributeEClass, EXML_ATTRIBUTE__XML_ABSTRACT_NULL_POLICY);

+		createEReference(eXmlAttributeEClass, EXML_ATTRIBUTE__XML_SCHEMA_TYPE);

+

+		eXmlBindingsEClass = createEClass(EXML_BINDINGS);

+		createEAttribute(eXmlBindingsEClass, EXML_BINDINGS__XML_ACCESSOR_TYPE);

+		createEAttribute(eXmlBindingsEClass, EXML_BINDINGS__XML_ACCESSOR_ORDER);

+		createEAttribute(eXmlBindingsEClass, EXML_BINDINGS__XML_MAPPING_METADATA_COMPLETE);

+		createEAttribute(eXmlBindingsEClass, EXML_BINDINGS__PACKAGE_NAME);

+		createEAttribute(eXmlBindingsEClass, EXML_BINDINGS__XML_NAME_TRANSFORMER);

+		createEReference(eXmlBindingsEClass, EXML_BINDINGS__XML_SCHEMA);

+		createEReference(eXmlBindingsEClass, EXML_BINDINGS__XML_SCHEMA_TYPE);

+		createEReference(eXmlBindingsEClass, EXML_BINDINGS__XML_SCHEMA_TYPES);

+		createEReference(eXmlBindingsEClass, EXML_BINDINGS__XML_JAVA_TYPE_ADAPTERS);

+		createEReference(eXmlBindingsEClass, EXML_BINDINGS__XML_REGISTRIES);

+		createEReference(eXmlBindingsEClass, EXML_BINDINGS__XML_ENUMS);

+		createEReference(eXmlBindingsEClass, EXML_BINDINGS__JAVA_TYPES);

+

+		eXmlClassExtractorEClass = createEClass(EXML_CLASS_EXTRACTOR);

+		createEAttribute(eXmlClassExtractorEClass, EXML_CLASS_EXTRACTOR__CLASS_NAME);

+

+		eXmlElementEClass = createEClass(EXML_ELEMENT);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__NAME);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__NAMESPACE);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__DEFAULT_VALUE);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__NILLABLE);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__REQUIRED);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__XML_ID);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__XML_ID_REF);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__XML_KEY);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__XML_LIST);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__XML_INLINE_BINARY_DATA);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__XML_ATTACHMENT_REF);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__XML_MIME_TYPE);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__CDATA);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__XML_PATH);

+		createEAttribute(eXmlElementEClass, EXML_ELEMENT__XML_LOCATION);

+		createEReference(eXmlElementEClass, EXML_ELEMENT__XML_ABSTRACT_NULL_POLICY);

+		createEReference(eXmlElementEClass, EXML_ELEMENT__XML_ELEMENT_WRAPPER);

+		createEReference(eXmlElementEClass, EXML_ELEMENT__XML_MAP);

+		createEReference(eXmlElementEClass, EXML_ELEMENT__XML_SCHEMA_TYPE);

+

+		eXmlElementDeclEClass = createEClass(EXML_ELEMENT_DECL);

+		createEAttribute(eXmlElementDeclEClass, EXML_ELEMENT_DECL__JAVA_METHOD);

+		createEAttribute(eXmlElementDeclEClass, EXML_ELEMENT_DECL__NAME);

+		createEAttribute(eXmlElementDeclEClass, EXML_ELEMENT_DECL__NAMESPACE);

+		createEAttribute(eXmlElementDeclEClass, EXML_ELEMENT_DECL__DEFAULT_VALUE);

+		createEAttribute(eXmlElementDeclEClass, EXML_ELEMENT_DECL__SCOPE);

+		createEAttribute(eXmlElementDeclEClass, EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAME);

+		createEAttribute(eXmlElementDeclEClass, EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAMESPACE);

+		createEAttribute(eXmlElementDeclEClass, EXML_ELEMENT_DECL__TYPE);

+

+		eXmlElementRefEClass = createEClass(EXML_ELEMENT_REF);

+		createEAttribute(eXmlElementRefEClass, EXML_ELEMENT_REF__NAME);

+		createEAttribute(eXmlElementRefEClass, EXML_ELEMENT_REF__NAMESPACE);

+		createEAttribute(eXmlElementRefEClass, EXML_ELEMENT_REF__XML_MIXED);

+		createEReference(eXmlElementRefEClass, EXML_ELEMENT_REF__XML_ELEMENT_WRAPPER);

+

+		eXmlElementRefsEClass = createEClass(EXML_ELEMENT_REFS);

+		createEAttribute(eXmlElementRefsEClass, EXML_ELEMENT_REFS__XML_MIXED);

+		createEReference(eXmlElementRefsEClass, EXML_ELEMENT_REFS__XML_ELEMENT_REFS);

+		createEReference(eXmlElementRefsEClass, EXML_ELEMENT_REFS__XML_ELEMENT_WRAPPER);

+

+		eXmlElementsEClass = createEClass(EXML_ELEMENTS);

+		createEAttribute(eXmlElementsEClass, EXML_ELEMENTS__XML_ID_REF);

+		createEAttribute(eXmlElementsEClass, EXML_ELEMENTS__XML_LIST);

+		createEReference(eXmlElementsEClass, EXML_ELEMENTS__XML_ELEMENTS);

+		createEReference(eXmlElementsEClass, EXML_ELEMENTS__XML_ELEMENT_WRAPPER);

+		createEReference(eXmlElementsEClass, EXML_ELEMENTS__XML_JOIN_NODES);

+

+		eXmlElementWrapperEClass = createEClass(EXML_ELEMENT_WRAPPER);

+		createEAttribute(eXmlElementWrapperEClass, EXML_ELEMENT_WRAPPER__NAME);

+		createEAttribute(eXmlElementWrapperEClass, EXML_ELEMENT_WRAPPER__NAMESPACE);

+		createEAttribute(eXmlElementWrapperEClass, EXML_ELEMENT_WRAPPER__NILLABLE);

+		createEAttribute(eXmlElementWrapperEClass, EXML_ELEMENT_WRAPPER__REQUIRED);

+

+		eXmlEnumEClass = createEClass(EXML_ENUM);

+		createEAttribute(eXmlEnumEClass, EXML_ENUM__JAVA_ENUM);

+		createEAttribute(eXmlEnumEClass, EXML_ENUM__VALUE);

+		createEReference(eXmlEnumEClass, EXML_ENUM__XML_ENUM_VALUES);

+

+		eXmlEnumValueEClass = createEClass(EXML_ENUM_VALUE);

+		createEAttribute(eXmlEnumValueEClass, EXML_ENUM_VALUE__JAVA_ENUM_VALUE);

+

+		eXmlInverseReferenceEClass = createEClass(EXML_INVERSE_REFERENCE);

+		createEAttribute(eXmlInverseReferenceEClass, EXML_INVERSE_REFERENCE__MAPPED_BY);

+

+		eXmlIsSetNullPolicyEClass = createEClass(EXML_IS_SET_NULL_POLICY);

+		createEAttribute(eXmlIsSetNullPolicyEClass, EXML_IS_SET_NULL_POLICY__IS_SET_METHOD_NAME);

+		createEReference(eXmlIsSetNullPolicyEClass, EXML_IS_SET_NULL_POLICY__XML_IS_SET_PARAMETERS);

+

+		eXmlIsSetParameterEClass = createEClass(EXML_IS_SET_PARAMETER);

+		createEAttribute(eXmlIsSetParameterEClass, EXML_IS_SET_PARAMETER__VALUE);

+		createEAttribute(eXmlIsSetParameterEClass, EXML_IS_SET_PARAMETER__TYPE);

+

+		eXmlJavaTypeAdapterEClass = createEClass(EXML_JAVA_TYPE_ADAPTER);

+		createEAttribute(eXmlJavaTypeAdapterEClass, EXML_JAVA_TYPE_ADAPTER__VALUE);

+		createEAttribute(eXmlJavaTypeAdapterEClass, EXML_JAVA_TYPE_ADAPTER__TYPE);

+		createEAttribute(eXmlJavaTypeAdapterEClass, EXML_JAVA_TYPE_ADAPTER__VALUE_TYPE);

+

+		eXmlJoinNodeEClass = createEClass(EXML_JOIN_NODE);

+		createEAttribute(eXmlJoinNodeEClass, EXML_JOIN_NODE__XML_PATH);

+		createEAttribute(eXmlJoinNodeEClass, EXML_JOIN_NODE__REFERENCED_XML_PATH);

+

+		eXmlJoinNodesEClass = createEClass(EXML_JOIN_NODES);

+		createEReference(eXmlJoinNodesEClass, EXML_JOIN_NODES__XML_JOIN_NODES);

+

+		eXmlMapEClass = createEClass(EXML_MAP);

+		createEAttribute(eXmlMapEClass, EXML_MAP__KEY);

+		createEAttribute(eXmlMapEClass, EXML_MAP__VALUE);

+

+		eXmlNullPolicyEClass = createEClass(EXML_NULL_POLICY);

+		createEAttribute(eXmlNullPolicyEClass, EXML_NULL_POLICY__IS_SET_PERFORMED_FOR_ABSENT_NODE);

+

+		eXmlNsEClass = createEClass(EXML_NS);

+		createEAttribute(eXmlNsEClass, EXML_NS__NAMESPACE_URI);

+		createEAttribute(eXmlNsEClass, EXML_NS__PREFIX);

+

+		eXmlPropertyEClass = createEClass(EXML_PROPERTY);

+		createEAttribute(eXmlPropertyEClass, EXML_PROPERTY__NAME);

+		createEAttribute(eXmlPropertyEClass, EXML_PROPERTY__VALUE);

+		createEAttribute(eXmlPropertyEClass, EXML_PROPERTY__VALUE_TYPE);

+

+		eXmlReadTransformerEClass = createEClass(EXML_READ_TRANSFORMER);

+

+		eXmlRegistryEClass = createEClass(EXML_REGISTRY);

+		createEAttribute(eXmlRegistryEClass, EXML_REGISTRY__NAME);

+		createEReference(eXmlRegistryEClass, EXML_REGISTRY__XML_ELEMENT_DECLS);

+

+		eXmlRootElementEClass = createEClass(EXML_ROOT_ELEMENT);

+		createEAttribute(eXmlRootElementEClass, EXML_ROOT_ELEMENT__NAME);

+		createEAttribute(eXmlRootElementEClass, EXML_ROOT_ELEMENT__NAMESPACE);

+

+		eXmlSchemaEClass = createEClass(EXML_SCHEMA);

+		createEAttribute(eXmlSchemaEClass, EXML_SCHEMA__ATTRIBUTE_FORM_DEFAULT);

+		createEAttribute(eXmlSchemaEClass, EXML_SCHEMA__ELEMENT_FORM_DEFAULT);

+		createEAttribute(eXmlSchemaEClass, EXML_SCHEMA__LOCATION);

+		createEAttribute(eXmlSchemaEClass, EXML_SCHEMA__NAMESPACE);

+		createEReference(eXmlSchemaEClass, EXML_SCHEMA__XMLNS);

+

+		eXmlSchemaTypeEClass = createEClass(EXML_SCHEMA_TYPE);

+		createEAttribute(eXmlSchemaTypeEClass, EXML_SCHEMA_TYPE__NAME);

+		createEAttribute(eXmlSchemaTypeEClass, EXML_SCHEMA_TYPE__NAMESPACE);

+		createEAttribute(eXmlSchemaTypeEClass, EXML_SCHEMA_TYPE__TYPE);

+

+		eXmlTransformationEClass = createEClass(EXML_TRANSFORMATION);

+		createEAttribute(eXmlTransformationEClass, EXML_TRANSFORMATION__OPTIONAL);

+		createEReference(eXmlTransformationEClass, EXML_TRANSFORMATION__XML_READ_TRANSFORMER);

+		createEReference(eXmlTransformationEClass, EXML_TRANSFORMATION__XML_WRITE_TRANSFORMERS);

+

+		eXmlTransientEClass = createEClass(EXML_TRANSIENT);

+		createEAttribute(eXmlTransientEClass, EXML_TRANSIENT__XML_LOCATION);

+

+		eXmlTypeEClass = createEClass(EXML_TYPE);

+		createEAttribute(eXmlTypeEClass, EXML_TYPE__NAME);

+		createEAttribute(eXmlTypeEClass, EXML_TYPE__NAMESPACE);

+		createEAttribute(eXmlTypeEClass, EXML_TYPE__FACTORY_CLASS);

+		createEAttribute(eXmlTypeEClass, EXML_TYPE__FACTORY_METHOD);

+		createEAttribute(eXmlTypeEClass, EXML_TYPE__PROP_ORDER);

+

+		eXmlValueEClass = createEClass(EXML_VALUE);

+		createEAttribute(eXmlValueEClass, EXML_VALUE__CDATA);

+		createEReference(eXmlValueEClass, EXML_VALUE__XML_ABSTRACT_NULL_POLICY);

+

+		eXmlVirtualAccessMethodsEClass = createEClass(EXML_VIRTUAL_ACCESS_METHODS);

+		createEAttribute(eXmlVirtualAccessMethodsEClass, EXML_VIRTUAL_ACCESS_METHODS__GET_METHOD);

+		createEAttribute(eXmlVirtualAccessMethodsEClass, EXML_VIRTUAL_ACCESS_METHODS__SET_METHOD);

+		createEAttribute(eXmlVirtualAccessMethodsEClass, EXML_VIRTUAL_ACCESS_METHODS__SCHEMA);

+

+		eXmlWriteTransformerEClass = createEClass(EXML_WRITE_TRANSFORMER);

+		createEAttribute(eXmlWriteTransformerEClass, EXML_WRITE_TRANSFORMER__XML_PATH);

+

+		// Create enums

+		eXmlAccessOrderEEnum = createEEnum(EXML_ACCESS_ORDER);

+		eXmlAccessTypeEEnum = createEEnum(EXML_ACCESS_TYPE);

+		eXmlMarshalNullRepresentationEEnum = createEEnum(EXML_MARSHAL_NULL_REPRESENTATION);

+		eXmlNsFormEEnum = createEEnum(EXML_NS_FORM);

+		eXmlVirtualAccessMethodsSchemaEEnum = createEEnum(EXML_VIRTUAL_ACCESS_METHODS_SCHEMA);

+

+		// Create data types

+		ePropOrderEDataType = createEDataType(EPROP_ORDER);

+		eXmlSeeAlsoEDataType = createEDataType(EXML_SEE_ALSO);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private boolean isInitialized = false;

+

+	/**

+	 * Complete the initialization of the package and its meta-model.  This

+	 * method is guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void initializePackageContents()

+	{

+		if (isInitialized) return;

+		isInitialized = true;

+

+		// Initialize package

+		setName(eNAME);

+		setNsPrefix(eNS_PREFIX);

+		setNsURI(eNS_URI);

+

+		// Obtain other dependent packages

+		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);

+

+		// Create type parameters

+

+		// Set bounds for type parameters

+

+		// Add supertypes to classes

+		eJavaTypeEClass.getESuperTypes().add(this.getEPropertyHolder());

+		eXmlAnyAttributeEClass.getESuperTypes().add(this.getEJavaAttribute());

+		eXmlAnyAttributeEClass.getESuperTypes().add(this.getEAccessibleJavaAttribute());

+		eXmlAnyAttributeEClass.getESuperTypes().add(this.getEContainerJavaAttribute());

+		eXmlAnyAttributeEClass.getESuperTypes().add(this.getEReadWriteJavaAttribute());

+		eXmlAnyAttributeEClass.getESuperTypes().add(this.getEPropertyHolder());

+		eXmlAnyElementEClass.getESuperTypes().add(this.getEJavaAttribute());

+		eXmlAnyElementEClass.getESuperTypes().add(this.getEAccessibleJavaAttribute());

+		eXmlAnyElementEClass.getESuperTypes().add(this.getEAdaptableJavaAttribute());

+		eXmlAnyElementEClass.getESuperTypes().add(this.getEContainerJavaAttribute());

+		eXmlAnyElementEClass.getESuperTypes().add(this.getEReadWriteJavaAttribute());

+		eXmlAnyElementEClass.getESuperTypes().add(this.getEPropertyHolder());

+		eXmlAttributeEClass.getESuperTypes().add(this.getEJavaAttribute());

+		eXmlAttributeEClass.getESuperTypes().add(this.getEAccessibleJavaAttribute());

+		eXmlAttributeEClass.getESuperTypes().add(this.getEAdaptableJavaAttribute());

+		eXmlAttributeEClass.getESuperTypes().add(this.getEContainerJavaAttribute());

+		eXmlAttributeEClass.getESuperTypes().add(this.getEReadWriteJavaAttribute());

+		eXmlAttributeEClass.getESuperTypes().add(this.getETypedJavaAttribute());

+		eXmlAttributeEClass.getESuperTypes().add(this.getEPropertyHolder());

+		eXmlBindingsEClass.getESuperTypes().add(theCommonPackage.getERootObjectImpl());

+		eXmlElementEClass.getESuperTypes().add(this.getEJavaAttribute());

+		eXmlElementEClass.getESuperTypes().add(this.getEAccessibleJavaAttribute());

+		eXmlElementEClass.getESuperTypes().add(this.getEAdaptableJavaAttribute());

+		eXmlElementEClass.getESuperTypes().add(this.getEContainerJavaAttribute());

+		eXmlElementEClass.getESuperTypes().add(this.getEPropertyHolder());

+		eXmlElementEClass.getESuperTypes().add(this.getEReadWriteJavaAttribute());

+		eXmlElementRefEClass.getESuperTypes().add(this.getEJavaAttribute());

+		eXmlElementRefEClass.getESuperTypes().add(this.getEAccessibleJavaAttribute());

+		eXmlElementRefEClass.getESuperTypes().add(this.getEAdaptableJavaAttribute());

+		eXmlElementRefEClass.getESuperTypes().add(this.getEContainerJavaAttribute());

+		eXmlElementRefEClass.getESuperTypes().add(this.getEReadWriteJavaAttribute());

+		eXmlElementRefEClass.getESuperTypes().add(this.getETypedJavaAttribute());

+		eXmlElementRefEClass.getESuperTypes().add(this.getEPropertyHolder());

+		eXmlElementRefsEClass.getESuperTypes().add(this.getEJavaAttribute());

+		eXmlElementRefsEClass.getESuperTypes().add(this.getEAccessibleJavaAttribute());

+		eXmlElementRefsEClass.getESuperTypes().add(this.getEAdaptableJavaAttribute());

+		eXmlElementRefsEClass.getESuperTypes().add(this.getEReadWriteJavaAttribute());

+		eXmlElementRefsEClass.getESuperTypes().add(this.getEPropertyHolder());

+		eXmlElementsEClass.getESuperTypes().add(this.getEJavaAttribute());

+		eXmlElementsEClass.getESuperTypes().add(this.getEAccessibleJavaAttribute());

+		eXmlElementsEClass.getESuperTypes().add(this.getEContainerJavaAttribute());

+		eXmlElementsEClass.getESuperTypes().add(this.getEReadWriteJavaAttribute());

+		eXmlElementsEClass.getESuperTypes().add(this.getEPropertyHolder());

+		eXmlInverseReferenceEClass.getESuperTypes().add(this.getEJavaAttribute());

+		eXmlInverseReferenceEClass.getESuperTypes().add(this.getEAccessibleJavaAttribute());

+		eXmlInverseReferenceEClass.getESuperTypes().add(this.getEContainerJavaAttribute());

+		eXmlInverseReferenceEClass.getESuperTypes().add(this.getETypedJavaAttribute());

+		eXmlInverseReferenceEClass.getESuperTypes().add(this.getEPropertyHolder());

+		eXmlIsSetNullPolicyEClass.getESuperTypes().add(this.getEAbstractXmlNullPolicy());

+		eXmlJavaTypeAdapterEClass.getESuperTypes().add(this.getEJavaAttribute());

+		eXmlJoinNodesEClass.getESuperTypes().add(this.getEJavaAttribute());

+		eXmlJoinNodesEClass.getESuperTypes().add(this.getEContainerJavaAttribute());

+		eXmlJoinNodesEClass.getESuperTypes().add(this.getETypedJavaAttribute());

+		eXmlNullPolicyEClass.getESuperTypes().add(this.getEAbstractXmlNullPolicy());

+		eXmlReadTransformerEClass.getESuperTypes().add(this.getEAbstractXmlTransformer());

+		eXmlTransformationEClass.getESuperTypes().add(this.getEJavaAttribute());

+		eXmlTransformationEClass.getESuperTypes().add(this.getEAccessibleJavaAttribute());

+		eXmlTransformationEClass.getESuperTypes().add(this.getEPropertyHolder());

+		eXmlTransientEClass.getESuperTypes().add(this.getEJavaAttribute());

+		eXmlValueEClass.getESuperTypes().add(this.getEJavaAttribute());

+		eXmlValueEClass.getESuperTypes().add(this.getEAccessibleJavaAttribute());

+		eXmlValueEClass.getESuperTypes().add(this.getEAdaptableJavaAttribute());

+		eXmlValueEClass.getESuperTypes().add(this.getEContainerJavaAttribute());

+		eXmlValueEClass.getESuperTypes().add(this.getEReadWriteJavaAttribute());

+		eXmlValueEClass.getESuperTypes().add(this.getETypedJavaAttribute());

+		eXmlValueEClass.getESuperTypes().add(this.getEPropertyHolder());

+		eXmlWriteTransformerEClass.getESuperTypes().add(this.getEAbstractXmlTransformer());

+

+		// Initialize classes and features; add operations and parameters

+		initEClass(eAbstractXmlNullPolicyEClass, EAbstractXmlNullPolicy.class, "EAbstractXmlNullPolicy", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEAbstractXmlNullPolicy_XsiNilRepresentsNull(), ecorePackage.getEBoolean(), "xsiNilRepresentsNull", null, 0, 1, EAbstractXmlNullPolicy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEAbstractXmlNullPolicy_EmptyNodeRepresentsNull(), ecorePackage.getEBoolean(), "emptyNodeRepresentsNull", null, 0, 1, EAbstractXmlNullPolicy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEAbstractXmlNullPolicy_NullRepresentationForXml(), this.getEXmlMarshalNullRepresentation(), "nullRepresentationForXml", null, 0, 1, EAbstractXmlNullPolicy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eAbstractXmlTransformerEClass, EAbstractXmlTransformer.class, "EAbstractXmlTransformer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEAbstractXmlTransformer_Method(), ecorePackage.getEString(), "method", null, 0, 1, EAbstractXmlTransformer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEAbstractXmlTransformer_TransformerClass(), ecorePackage.getEString(), "transformerClass", null, 0, 1, EAbstractXmlTransformer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eAccessibleJavaAttributeEClass, EAccessibleJavaAttribute.class, "EAccessibleJavaAttribute", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getEAccessibleJavaAttribute_XmlAccessMethods(), this.getEXmlAccessMethods(), null, "xmlAccessMethods", null, 0, 1, EAccessibleJavaAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eAdaptableJavaAttributeEClass, EAdaptableJavaAttribute.class, "EAdaptableJavaAttribute", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getEAdaptableJavaAttribute_XmlJavaTypeAdapter(), this.getEXmlJavaTypeAdapter(), null, "xmlJavaTypeAdapter", null, 0, 1, EAdaptableJavaAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eContainerJavaAttributeEClass, EContainerJavaAttribute.class, "EContainerJavaAttribute", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEContainerJavaAttribute_ContainerType(), ecorePackage.getEString(), "containerType", null, 0, 1, EContainerJavaAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eJavaAttributeEClass, EJavaAttribute.class, "EJavaAttribute", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEJavaAttribute_JavaAttribute(), ecorePackage.getEString(), "javaAttribute", null, 0, 1, EJavaAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEJavaAttribute_XmlAccessorType(), this.getEXmlAccessType(), "xmlAccessorType", null, 0, 1, EJavaAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eJavaTypeEClass, EJavaType.class, "EJavaType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEJavaType_Name(), ecorePackage.getEString(), "name", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEJavaType_SuperType(), ecorePackage.getEString(), "superType", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEJavaType_XmlAccessorOrder(), this.getEXmlAccessOrder(), "xmlAccessorOrder", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEJavaType_XmlAccessorType(), this.getEXmlAccessType(), "xmlAccessorType", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEJavaType_XmlCustomizer(), ecorePackage.getEString(), "xmlCustomizer", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEJavaType_XmlDiscriminatorNode(), ecorePackage.getEString(), "xmlDiscriminatorNode", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEJavaType_XmlDiscriminatorValue(), ecorePackage.getEString(), "xmlDiscriminatorValue", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEJavaType_XmlInlineBinaryData(), ecorePackage.getEBoolean(), "xmlInlineBinaryData", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEJavaType_XmlTransient(), ecorePackage.getEBoolean(), "xmlTransient", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEJavaType_XmlNameTransformer(), ecorePackage.getEString(), "xmlNameTransformer", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEJavaType_XmlType(), this.getEXmlType(), null, "xmlType", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEJavaType_XmlRootElement(), this.getEXmlRootElement(), null, "xmlRootElement", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEJavaType_XmlVirtualAccessMethods(), this.getEXmlVirtualAccessMethods(), null, "xmlVirtualAccessMethods", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEJavaType_XmlSeeAlso(), this.getEXmlSeeAlso(), "xmlSeeAlso", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEJavaType_XmlJavaTypeAdapter(), this.getEXmlJavaTypeAdapter(), null, "xmlJavaTypeAdapter", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEJavaType_XmlClassExtractor(), this.getEXmlClassExtractor(), null, "xmlClassExtractor", null, 0, 1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEJavaType_JavaAttributes(), this.getEJavaAttribute(), null, "javaAttributes", null, 0, -1, EJavaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(ePropertyHolderEClass, EPropertyHolder.class, "EPropertyHolder", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getEPropertyHolder_XmlProperties(), this.getEXmlProperty(), null, "xmlProperties", null, 0, -1, EPropertyHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eReadWriteJavaAttributeEClass, EReadWriteJavaAttribute.class, "EReadWriteJavaAttribute", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEReadWriteJavaAttribute_ReadOnly(), ecorePackage.getEBoolean(), "readOnly", null, 0, 1, EReadWriteJavaAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEReadWriteJavaAttribute_WriteOnly(), ecorePackage.getEBoolean(), "writeOnly", null, 0, 1, EReadWriteJavaAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eTypedJavaAttributeEClass, ETypedJavaAttribute.class, "ETypedJavaAttribute", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getETypedJavaAttribute_Type(), ecorePackage.getEString(), "type", null, 0, 1, ETypedJavaAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlAccessMethodsEClass, EXmlAccessMethods.class, "EXmlAccessMethods", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlAccessMethods_GetMethod(), ecorePackage.getEString(), "getMethod", null, 0, 1, EXmlAccessMethods.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlAccessMethods_SetMethod(), ecorePackage.getEString(), "setMethod", null, 0, 1, EXmlAccessMethods.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlAnyAttributeEClass, EXmlAnyAttribute.class, "EXmlAnyAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlAnyAttribute_XmlPath(), ecorePackage.getEString(), "xmlPath", null, 0, 1, EXmlAnyAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlAnyElementEClass, EXmlAnyElement.class, "EXmlAnyElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlAnyElement_XmlMixed(), ecorePackage.getEBoolean(), "xmlMixed", null, 0, 1, EXmlAnyElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlAnyElement_Lax(), ecorePackage.getEBoolean(), "lax", null, 0, 1, EXmlAnyElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlAnyElement_DomHandler(), ecorePackage.getEString(), "domHandler", null, 0, 1, EXmlAnyElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlAnyElement_XmlPath(), ecorePackage.getEString(), "xmlPath", null, 0, 1, EXmlAnyElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlAnyElement_XmlElementRefs(), this.getEXmlElementRefs(), null, "xmlElementRefs", null, 0, 1, EXmlAnyElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlAttributeEClass, EXmlAttribute.class, "EXmlAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlAttribute_Name(), ecorePackage.getEString(), "name", null, 0, 1, EXmlAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlAttribute_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, EXmlAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlAttribute_Required(), ecorePackage.getEBoolean(), "required", null, 0, 1, EXmlAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlAttribute_XmlId(), ecorePackage.getEBoolean(), "xmlId", null, 0, 1, EXmlAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlAttribute_XmlIdRef(), ecorePackage.getEBoolean(), "xmlIdRef", null, 0, 1, EXmlAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlAttribute_XmlKey(), ecorePackage.getEBoolean(), "xmlKey", null, 0, 1, EXmlAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlAttribute_XmlList(), ecorePackage.getEBoolean(), "xmlList", null, 0, 1, EXmlAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlAttribute_XmlInlineBinaryData(), ecorePackage.getEBoolean(), "xmlInlineBinaryData", null, 0, 1, EXmlAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlAttribute_XmlAttachmentRef(), ecorePackage.getEBoolean(), "xmlAttachmentRef", null, 0, 1, EXmlAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlAttribute_XmlMimeType(), ecorePackage.getEString(), "xmlMimeType", null, 0, 1, EXmlAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlAttribute_XmlPath(), ecorePackage.getEString(), "xmlPath", null, 0, 1, EXmlAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlAttribute_XmlAbstractNullPolicy(), this.getEAbstractXmlNullPolicy(), null, "xmlAbstractNullPolicy", null, 0, 1, EXmlAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlAttribute_XmlSchemaType(), this.getEXmlSchemaType(), null, "xmlSchemaType", null, 0, 1, EXmlAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlBindingsEClass, EXmlBindings.class, "EXmlBindings", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlBindings_XmlAccessorType(), this.getEXmlAccessType(), "xmlAccessorType", null, 0, 1, EXmlBindings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlBindings_XmlAccessorOrder(), this.getEXmlAccessOrder(), "xmlAccessorOrder", null, 0, 1, EXmlBindings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlBindings_XmlMappingMetadataComplete(), ecorePackage.getEBoolean(), "xmlMappingMetadataComplete", null, 0, 1, EXmlBindings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlBindings_PackageName(), ecorePackage.getEString(), "packageName", null, 0, 1, EXmlBindings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlBindings_XmlNameTransformer(), ecorePackage.getEString(), "xmlNameTransformer", null, 0, 1, EXmlBindings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlBindings_XmlSchema(), this.getEXmlSchema(), null, "xmlSchema", null, 0, 1, EXmlBindings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlBindings_XmlSchemaType(), this.getEXmlSchemaType(), null, "xmlSchemaType", null, 0, 1, EXmlBindings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlBindings_XmlSchemaTypes(), this.getEXmlSchemaType(), null, "xmlSchemaTypes", null, 0, -1, EXmlBindings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlBindings_XmlJavaTypeAdapters(), this.getEXmlJavaTypeAdapter(), null, "xmlJavaTypeAdapters", null, 0, -1, EXmlBindings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlBindings_XmlRegistries(), this.getEXmlRegistry(), null, "xmlRegistries", null, 0, -1, EXmlBindings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlBindings_XmlEnums(), this.getEXmlEnum(), null, "xmlEnums", null, 0, -1, EXmlBindings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlBindings_JavaTypes(), this.getEJavaType(), null, "javaTypes", null, 0, -1, EXmlBindings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlClassExtractorEClass, EXmlClassExtractor.class, "EXmlClassExtractor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlClassExtractor_ClassName(), ecorePackage.getEString(), "className", null, 0, 1, EXmlClassExtractor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlElementEClass, EXmlElement.class, "EXmlElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElement_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElement_DefaultValue(), ecorePackage.getEString(), "defaultValue", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElement_Nillable(), ecorePackage.getEBoolean(), "nillable", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElement_Required(), ecorePackage.getEBoolean(), "required", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElement_XmlId(), ecorePackage.getEBoolean(), "xmlId", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElement_XmlIdRef(), ecorePackage.getEBoolean(), "xmlIdRef", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElement_XmlKey(), ecorePackage.getEBoolean(), "xmlKey", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElement_XmlList(), ecorePackage.getEBoolean(), "xmlList", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElement_XmlInlineBinaryData(), ecorePackage.getEBoolean(), "xmlInlineBinaryData", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElement_XmlAttachmentRef(), ecorePackage.getEBoolean(), "xmlAttachmentRef", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElement_XmlMimeType(), ecorePackage.getEString(), "xmlMimeType", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElement_Cdata(), ecorePackage.getEBoolean(), "cdata", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElement_XmlPath(), ecorePackage.getEString(), "xmlPath", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElement_XmlLocation(), ecorePackage.getEBoolean(), "xmlLocation", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlElement_XmlAbstractNullPolicy(), this.getEAbstractXmlNullPolicy(), null, "xmlAbstractNullPolicy", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlElement_XmlElementWrapper(), this.getEXmlElementWrapper(), null, "xmlElementWrapper", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlElement_XmlMap(), this.getEXmlElementWrapper(), null, "xmlMap", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlElement_XmlSchemaType(), this.getEXmlSchemaType(), null, "xmlSchemaType", null, 0, 1, EXmlElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlElementDeclEClass, EXmlElementDecl.class, "EXmlElementDecl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlElementDecl_JavaMethod(), ecorePackage.getEString(), "javaMethod", null, 0, 1, EXmlElementDecl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElementDecl_Name(), ecorePackage.getEString(), "name", null, 0, 1, EXmlElementDecl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElementDecl_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, EXmlElementDecl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElementDecl_DefaultValue(), ecorePackage.getEString(), "defaultValue", null, 0, 1, EXmlElementDecl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElementDecl_Scope(), ecorePackage.getEString(), "scope", null, 0, 1, EXmlElementDecl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElementDecl_SubstitutionHeadName(), ecorePackage.getEString(), "substitutionHeadName", null, 0, 1, EXmlElementDecl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElementDecl_SubstitutionHeadNamespace(), ecorePackage.getEString(), "substitutionHeadNamespace", null, 0, 1, EXmlElementDecl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElementDecl_Type(), ecorePackage.getEString(), "type", null, 0, 1, EXmlElementDecl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlElementRefEClass, EXmlElementRef.class, "EXmlElementRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlElementRef_Name(), ecorePackage.getEString(), "name", null, 0, 1, EXmlElementRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElementRef_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, EXmlElementRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElementRef_XmlMixed(), ecorePackage.getEBoolean(), "xmlMixed", null, 0, 1, EXmlElementRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlElementRef_XmlElementWrapper(), this.getEXmlElementWrapper(), null, "xmlElementWrapper", null, 0, 1, EXmlElementRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlElementRefsEClass, EXmlElementRefs.class, "EXmlElementRefs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlElementRefs_XmlMixed(), ecorePackage.getEBoolean(), "xmlMixed", null, 0, 1, EXmlElementRefs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlElementRefs_XmlElementRefs(), this.getEXmlElementRef(), null, "xmlElementRefs", null, 0, -1, EXmlElementRefs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlElementRefs_XmlElementWrapper(), this.getEXmlElementWrapper(), null, "xmlElementWrapper", null, 0, 1, EXmlElementRefs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlElementsEClass, EXmlElements.class, "EXmlElements", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlElements_XmlIdRef(), ecorePackage.getEBoolean(), "xmlIdRef", null, 0, 1, EXmlElements.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElements_XmlList(), ecorePackage.getEBoolean(), "xmlList", null, 0, 1, EXmlElements.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlElements_XmlElements(), this.getEXmlElement(), null, "xmlElements", null, 0, -1, EXmlElements.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlElements_XmlElementWrapper(), this.getEXmlElementWrapper(), null, "xmlElementWrapper", null, 0, 1, EXmlElements.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlElements_XmlJoinNodes(), this.getEXmlJoinNodes(), null, "xmlJoinNodes", null, 0, -1, EXmlElements.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlElementWrapperEClass, EXmlElementWrapper.class, "EXmlElementWrapper", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlElementWrapper_Name(), ecorePackage.getEString(), "name", null, 0, 1, EXmlElementWrapper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElementWrapper_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, EXmlElementWrapper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElementWrapper_Nillable(), ecorePackage.getEBoolean(), "nillable", null, 0, 1, EXmlElementWrapper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlElementWrapper_Required(), ecorePackage.getEBoolean(), "required", null, 0, 1, EXmlElementWrapper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlEnumEClass, EXmlEnum.class, "EXmlEnum", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlEnum_JavaEnum(), ecorePackage.getEString(), "javaEnum", null, 0, 1, EXmlEnum.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlEnum_Value(), ecorePackage.getEString(), "value", null, 0, 1, EXmlEnum.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlEnum_XmlEnumValues(), this.getEXmlEnumValue(), null, "xmlEnumValues", null, 0, -1, EXmlEnum.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlEnumValueEClass, EXmlEnumValue.class, "EXmlEnumValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlEnumValue_JavaEnumValue(), ecorePackage.getEString(), "javaEnumValue", null, 0, 1, EXmlEnumValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlInverseReferenceEClass, EXmlInverseReference.class, "EXmlInverseReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlInverseReference_MappedBy(), ecorePackage.getEString(), "mappedBy", null, 0, 1, EXmlInverseReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlIsSetNullPolicyEClass, EXmlIsSetNullPolicy.class, "EXmlIsSetNullPolicy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlIsSetNullPolicy_IsSetMethodName(), ecorePackage.getEString(), "isSetMethodName", null, 0, 1, EXmlIsSetNullPolicy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlIsSetNullPolicy_XmlIsSetParameters(), this.getEXmlIsSetParameter(), null, "xmlIsSetParameters", null, 0, -1, EXmlIsSetNullPolicy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlIsSetParameterEClass, EXmlIsSetParameter.class, "EXmlIsSetParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlIsSetParameter_Value(), ecorePackage.getEString(), "value", null, 0, 1, EXmlIsSetParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlIsSetParameter_Type(), ecorePackage.getEString(), "type", null, 0, 1, EXmlIsSetParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlJavaTypeAdapterEClass, EXmlJavaTypeAdapter.class, "EXmlJavaTypeAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlJavaTypeAdapter_Value(), ecorePackage.getEString(), "value", null, 0, 1, EXmlJavaTypeAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlJavaTypeAdapter_Type(), ecorePackage.getEString(), "type", null, 0, 1, EXmlJavaTypeAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlJavaTypeAdapter_ValueType(), ecorePackage.getEString(), "valueType", null, 0, 1, EXmlJavaTypeAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlJoinNodeEClass, EXmlJoinNode.class, "EXmlJoinNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlJoinNode_XmlPath(), ecorePackage.getEString(), "xmlPath", null, 0, 1, EXmlJoinNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlJoinNode_ReferencedXmlPath(), ecorePackage.getEString(), "referencedXmlPath", null, 0, 1, EXmlJoinNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlJoinNodesEClass, EXmlJoinNodes.class, "EXmlJoinNodes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getEXmlJoinNodes_XmlJoinNodes(), this.getEXmlJoinNode(), null, "xmlJoinNodes", null, 0, -1, EXmlJoinNodes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlMapEClass, EXmlMap.class, "EXmlMap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlMap_Key(), ecorePackage.getEString(), "key", null, 0, 1, EXmlMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlMap_Value(), ecorePackage.getEString(), "value", null, 0, 1, EXmlMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlNullPolicyEClass, EXmlNullPolicy.class, "EXmlNullPolicy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlNullPolicy_IsSetPerformedForAbsentNode(), ecorePackage.getEBoolean(), "isSetPerformedForAbsentNode", null, 0, 1, EXmlNullPolicy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlNsEClass, EXmlNs.class, "EXmlNs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlNs_NamespaceUri(), ecorePackage.getEString(), "namespaceUri", null, 0, 1, EXmlNs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlNs_Prefix(), ecorePackage.getEString(), "prefix", null, 0, 1, EXmlNs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlPropertyEClass, EXmlProperty.class, "EXmlProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlProperty_Name(), ecorePackage.getEString(), "name", null, 0, 1, EXmlProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlProperty_Value(), ecorePackage.getEString(), "value", null, 0, 1, EXmlProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlProperty_ValueType(), ecorePackage.getEString(), "valueType", null, 0, 1, EXmlProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlReadTransformerEClass, EXmlReadTransformer.class, "EXmlReadTransformer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(eXmlRegistryEClass, EXmlRegistry.class, "EXmlRegistry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlRegistry_Name(), ecorePackage.getEString(), "name", null, 0, 1, EXmlRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlRegistry_XmlElementDecls(), this.getEXmlElementDecl(), null, "xmlElementDecls", null, 0, -1, EXmlRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlRootElementEClass, EXmlRootElement.class, "EXmlRootElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlRootElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, EXmlRootElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlRootElement_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, EXmlRootElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlSchemaEClass, EXmlSchema.class, "EXmlSchema", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlSchema_AttributeFormDefault(), this.getEXmlNsForm(), "attributeFormDefault", null, 0, 1, EXmlSchema.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlSchema_ElementFormDefault(), this.getEXmlNsForm(), "elementFormDefault", null, 0, 1, EXmlSchema.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlSchema_Location(), ecorePackage.getEString(), "location", null, 0, 1, EXmlSchema.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlSchema_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, EXmlSchema.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlSchema_Xmlns(), this.getEXmlNs(), null, "xmlns", null, 0, -1, EXmlSchema.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlSchemaTypeEClass, EXmlSchemaType.class, "EXmlSchemaType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlSchemaType_Name(), ecorePackage.getEString(), "name", null, 0, 1, EXmlSchemaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlSchemaType_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, EXmlSchemaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlSchemaType_Type(), ecorePackage.getEString(), "type", null, 0, 1, EXmlSchemaType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlTransformationEClass, EXmlTransformation.class, "EXmlTransformation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlTransformation_Optional(), ecorePackage.getEBoolean(), "optional", null, 0, 1, EXmlTransformation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlTransformation_XmlReadTransformer(), this.getEXmlReadTransformer(), null, "xmlReadTransformer", null, 0, 1, EXmlTransformation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlTransformation_XmlWriteTransformers(), this.getEXmlWriteTransformer(), null, "xmlWriteTransformers", null, 0, -1, EXmlTransformation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlTransientEClass, EXmlTransient.class, "EXmlTransient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlTransient_XmlLocation(), ecorePackage.getEBoolean(), "xmlLocation", null, 0, 1, EXmlTransient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlTypeEClass, EXmlType.class, "EXmlType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlType_Name(), ecorePackage.getEString(), "name", null, 0, 1, EXmlType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlType_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, EXmlType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlType_FactoryClass(), ecorePackage.getEString(), "factoryClass", null, 0, 1, EXmlType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlType_FactoryMethod(), ecorePackage.getEString(), "factoryMethod", null, 0, 1, EXmlType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlType_PropOrder(), this.getEPropOrder(), "propOrder", null, 0, 1, EXmlType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlValueEClass, EXmlValue.class, "EXmlValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlValue_Cdata(), ecorePackage.getEBoolean(), "cdata", null, 0, 1, EXmlValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getEXmlValue_XmlAbstractNullPolicy(), this.getEAbstractXmlNullPolicy(), null, "xmlAbstractNullPolicy", null, 0, 1, EXmlValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlVirtualAccessMethodsEClass, EXmlVirtualAccessMethods.class, "EXmlVirtualAccessMethods", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlVirtualAccessMethods_GetMethod(), ecorePackage.getEString(), "getMethod", null, 0, 1, EXmlVirtualAccessMethods.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlVirtualAccessMethods_SetMethod(), ecorePackage.getEString(), "setMethod", null, 0, 1, EXmlVirtualAccessMethods.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getEXmlVirtualAccessMethods_Schema(), this.getEXmlVirtualAccessMethodsSchema(), "schema", null, 0, 1, EXmlVirtualAccessMethods.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(eXmlWriteTransformerEClass, EXmlWriteTransformer.class, "EXmlWriteTransformer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getEXmlWriteTransformer_XmlPath(), ecorePackage.getEString(), "xmlPath", null, 0, 1, EXmlWriteTransformer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		// Initialize enums and add enum literals

+		initEEnum(eXmlAccessOrderEEnum, EXmlAccessOrder.class, "EXmlAccessOrder");

+		addEEnumLiteral(eXmlAccessOrderEEnum, EXmlAccessOrder.ALPHABETICAL);

+		addEEnumLiteral(eXmlAccessOrderEEnum, EXmlAccessOrder.UNDEFINED);

+

+		initEEnum(eXmlAccessTypeEEnum, EXmlAccessType.class, "EXmlAccessType");

+		addEEnumLiteral(eXmlAccessTypeEEnum, EXmlAccessType.FIELD);

+		addEEnumLiteral(eXmlAccessTypeEEnum, EXmlAccessType.NONE);

+		addEEnumLiteral(eXmlAccessTypeEEnum, EXmlAccessType.PROPERTY);

+		addEEnumLiteral(eXmlAccessTypeEEnum, EXmlAccessType.PUBLIC_MEMBER);

+

+		initEEnum(eXmlMarshalNullRepresentationEEnum, EXmlMarshalNullRepresentation.class, "EXmlMarshalNullRepresentation");

+		addEEnumLiteral(eXmlMarshalNullRepresentationEEnum, EXmlMarshalNullRepresentation.XSI_NIL);

+		addEEnumLiteral(eXmlMarshalNullRepresentationEEnum, EXmlMarshalNullRepresentation.ABSENT_NODE);

+		addEEnumLiteral(eXmlMarshalNullRepresentationEEnum, EXmlMarshalNullRepresentation.EMPTY_NODE);

+

+		initEEnum(eXmlNsFormEEnum, EXmlNsForm.class, "EXmlNsForm");

+		addEEnumLiteral(eXmlNsFormEEnum, EXmlNsForm.UNQUALIFIED);

+		addEEnumLiteral(eXmlNsFormEEnum, EXmlNsForm.QUALIFIED);

+		addEEnumLiteral(eXmlNsFormEEnum, EXmlNsForm.UNSET);

+

+		initEEnum(eXmlVirtualAccessMethodsSchemaEEnum, EXmlVirtualAccessMethodsSchema.class, "EXmlVirtualAccessMethodsSchema");

+		addEEnumLiteral(eXmlVirtualAccessMethodsSchemaEEnum, EXmlVirtualAccessMethodsSchema.NODES);

+		addEEnumLiteral(eXmlVirtualAccessMethodsSchemaEEnum, EXmlVirtualAccessMethodsSchema.ANY);

+

+		// Initialize data types

+		initEDataType(ePropOrderEDataType, List.class, "EPropOrder", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);

+		initEDataType(eXmlSeeAlsoEDataType, List.class, "EXmlSeeAlso", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);

+

+		// Create resource

+		createResource(eNS_URI);

+

+		// Create annotations

+		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData

+		createExtendedMetaDataAnnotations();

+	}

+

+	/**

+	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void createExtendedMetaDataAnnotations()

+	{

+		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";		

+		addAnnotation

+		  (ePropOrderEDataType, 

+		   source, 

+		   new String[] 

+		   {

+			 "itemType", "http://www.eclipse.org/emf/2003/XMLType#string"

+		   });		

+		addAnnotation

+		  (eXmlSeeAlsoEDataType, 

+		   source, 

+		   new String[] 

+		   {

+			 "itemType", "http://www.eclipse.org/emf/2003/XMLType#string"

+		   });

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * Defines literals for the meta objects that represent

+	 * <ul>

+	 *   <li>each class,</li>

+	 *   <li>each feature of each class,</li>

+	 *   <li>each enum,</li>

+	 *   <li>and each data type</li>

+	 * </ul>

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public interface Literals

+	{

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy <em>EAbstract Xml Null Policy</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlNullPolicy

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAbstractXmlNullPolicy()

+		 * @generated

+		 */

+		public static final EClass EABSTRACT_XML_NULL_POLICY = eINSTANCE.getEAbstractXmlNullPolicy();

+

+		/**

+		 * The meta object literal for the '<em><b>Xsi Nil Represents Null</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EABSTRACT_XML_NULL_POLICY__XSI_NIL_REPRESENTS_NULL = eINSTANCE.getEAbstractXmlNullPolicy_XsiNilRepresentsNull();

+

+		/**

+		 * The meta object literal for the '<em><b>Empty Node Represents Null</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EABSTRACT_XML_NULL_POLICY__EMPTY_NODE_REPRESENTS_NULL = eINSTANCE.getEAbstractXmlNullPolicy_EmptyNodeRepresentsNull();

+

+		/**

+		 * The meta object literal for the '<em><b>Null Representation For Xml</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EABSTRACT_XML_NULL_POLICY__NULL_REPRESENTATION_FOR_XML = eINSTANCE.getEAbstractXmlNullPolicy_NullRepresentationForXml();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlTransformer <em>EAbstract Xml Transformer</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAbstractXmlTransformer

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAbstractXmlTransformer()

+		 * @generated

+		 */

+		public static final EClass EABSTRACT_XML_TRANSFORMER = eINSTANCE.getEAbstractXmlTransformer();

+

+		/**

+		 * The meta object literal for the '<em><b>Method</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EABSTRACT_XML_TRANSFORMER__METHOD = eINSTANCE.getEAbstractXmlTransformer_Method();

+

+		/**

+		 * The meta object literal for the '<em><b>Transformer Class</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EABSTRACT_XML_TRANSFORMER__TRANSFORMER_CLASS = eINSTANCE.getEAbstractXmlTransformer_TransformerClass();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAccessibleJavaAttribute <em>EAccessible Java Attribute</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAccessibleJavaAttribute

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAccessibleJavaAttribute()

+		 * @generated

+		 */

+		public static final EClass EACCESSIBLE_JAVA_ATTRIBUTE = eINSTANCE.getEAccessibleJavaAttribute();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Access Methods</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EACCESSIBLE_JAVA_ATTRIBUTE__XML_ACCESS_METHODS = eINSTANCE.getEAccessibleJavaAttribute_XmlAccessMethods();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAdaptableJavaAttribute <em>EAdaptable Java Attribute</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EAdaptableJavaAttribute

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEAdaptableJavaAttribute()

+		 * @generated

+		 */

+		public static final EClass EADAPTABLE_JAVA_ATTRIBUTE = eINSTANCE.getEAdaptableJavaAttribute();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Java Type Adapter</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EADAPTABLE_JAVA_ATTRIBUTE__XML_JAVA_TYPE_ADAPTER = eINSTANCE.getEAdaptableJavaAttribute_XmlJavaTypeAdapter();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EContainerJavaAttribute <em>EContainer Java Attribute</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EContainerJavaAttribute

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEContainerJavaAttribute()

+		 * @generated

+		 */

+		public static final EClass ECONTAINER_JAVA_ATTRIBUTE = eINSTANCE.getEContainerJavaAttribute();

+

+		/**

+		 * The meta object literal for the '<em><b>Container Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute ECONTAINER_JAVA_ATTRIBUTE__CONTAINER_TYPE = eINSTANCE.getEContainerJavaAttribute_ContainerType();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute <em>EJava Attribute</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaAttribute

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaAttribute()

+		 * @generated

+		 */

+		public static final EClass EJAVA_ATTRIBUTE = eINSTANCE.getEJavaAttribute();

+

+		/**

+		 * The meta object literal for the '<em><b>Java Attribute</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EJAVA_ATTRIBUTE__JAVA_ATTRIBUTE = eINSTANCE.getEJavaAttribute_JavaAttribute();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Accessor Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EJAVA_ATTRIBUTE__XML_ACCESSOR_TYPE = eINSTANCE.getEJavaAttribute_XmlAccessorType();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType <em>EJava Type</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEJavaType()

+		 * @generated

+		 */

+		public static final EClass EJAVA_TYPE = eINSTANCE.getEJavaType();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EJAVA_TYPE__NAME = eINSTANCE.getEJavaType_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Super Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EJAVA_TYPE__SUPER_TYPE = eINSTANCE.getEJavaType_SuperType();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Accessor Order</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EJAVA_TYPE__XML_ACCESSOR_ORDER = eINSTANCE.getEJavaType_XmlAccessorOrder();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Accessor Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EJAVA_TYPE__XML_ACCESSOR_TYPE = eINSTANCE.getEJavaType_XmlAccessorType();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Customizer</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EJAVA_TYPE__XML_CUSTOMIZER = eINSTANCE.getEJavaType_XmlCustomizer();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Discriminator Node</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EJAVA_TYPE__XML_DISCRIMINATOR_NODE = eINSTANCE.getEJavaType_XmlDiscriminatorNode();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Discriminator Value</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EJAVA_TYPE__XML_DISCRIMINATOR_VALUE = eINSTANCE.getEJavaType_XmlDiscriminatorValue();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Inline Binary Data</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EJAVA_TYPE__XML_INLINE_BINARY_DATA = eINSTANCE.getEJavaType_XmlInlineBinaryData();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Transient</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EJAVA_TYPE__XML_TRANSIENT = eINSTANCE.getEJavaType_XmlTransient();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Name Transformer</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EJAVA_TYPE__XML_NAME_TRANSFORMER = eINSTANCE.getEJavaType_XmlNameTransformer();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Type</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EJAVA_TYPE__XML_TYPE = eINSTANCE.getEJavaType_XmlType();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Root Element</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EJAVA_TYPE__XML_ROOT_ELEMENT = eINSTANCE.getEJavaType_XmlRootElement();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Virtual Access Methods</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EJAVA_TYPE__XML_VIRTUAL_ACCESS_METHODS = eINSTANCE.getEJavaType_XmlVirtualAccessMethods();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml See Also</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EJAVA_TYPE__XML_SEE_ALSO = eINSTANCE.getEJavaType_XmlSeeAlso();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Java Type Adapter</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EJAVA_TYPE__XML_JAVA_TYPE_ADAPTER = eINSTANCE.getEJavaType_XmlJavaTypeAdapter();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Class Extractor</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EJAVA_TYPE__XML_CLASS_EXTRACTOR = eINSTANCE.getEJavaType_XmlClassExtractor();

+

+		/**

+		 * The meta object literal for the '<em><b>Java Attributes</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EJAVA_TYPE__JAVA_ATTRIBUTES = eINSTANCE.getEJavaType_JavaAttributes();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EPropertyHolder <em>EProperty Holder</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EPropertyHolder

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropertyHolder()

+		 * @generated

+		 */

+		public static final EClass EPROPERTY_HOLDER = eINSTANCE.getEPropertyHolder();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Properties</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EPROPERTY_HOLDER__XML_PROPERTIES = eINSTANCE.getEPropertyHolder_XmlProperties();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EReadWriteJavaAttribute <em>ERead Write Java Attribute</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EReadWriteJavaAttribute

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEReadWriteJavaAttribute()

+		 * @generated

+		 */

+		public static final EClass EREAD_WRITE_JAVA_ATTRIBUTE = eINSTANCE.getEReadWriteJavaAttribute();

+

+		/**

+		 * The meta object literal for the '<em><b>Read Only</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EREAD_WRITE_JAVA_ATTRIBUTE__READ_ONLY = eINSTANCE.getEReadWriteJavaAttribute_ReadOnly();

+

+		/**

+		 * The meta object literal for the '<em><b>Write Only</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EREAD_WRITE_JAVA_ATTRIBUTE__WRITE_ONLY = eINSTANCE.getEReadWriteJavaAttribute_WriteOnly();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.ETypedJavaAttribute <em>ETyped Java Attribute</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.ETypedJavaAttribute

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getETypedJavaAttribute()

+		 * @generated

+		 */

+		public static final EClass ETYPED_JAVA_ATTRIBUTE = eINSTANCE.getETypedJavaAttribute();

+

+		/**

+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute ETYPED_JAVA_ATTRIBUTE__TYPE = eINSTANCE.getETypedJavaAttribute_Type();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessMethods <em>EXml Access Methods</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessMethods

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAccessMethods()

+		 * @generated

+		 */

+		public static final EClass EXML_ACCESS_METHODS = eINSTANCE.getEXmlAccessMethods();

+

+		/**

+		 * The meta object literal for the '<em><b>Get Method</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ACCESS_METHODS__GET_METHOD = eINSTANCE.getEXmlAccessMethods_GetMethod();

+

+		/**

+		 * The meta object literal for the '<em><b>Set Method</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ACCESS_METHODS__SET_METHOD = eINSTANCE.getEXmlAccessMethods_SetMethod();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute <em>EXml Any Attribute</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyAttribute

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAnyAttribute()

+		 * @generated

+		 */

+		public static final EClass EXML_ANY_ATTRIBUTE = eINSTANCE.getEXmlAnyAttribute();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Path</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ANY_ATTRIBUTE__XML_PATH = eINSTANCE.getEXmlAnyAttribute_XmlPath();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement <em>EXml Any Element</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAnyElement

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAnyElement()

+		 * @generated

+		 */

+		public static final EClass EXML_ANY_ELEMENT = eINSTANCE.getEXmlAnyElement();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Mixed</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ANY_ELEMENT__XML_MIXED = eINSTANCE.getEXmlAnyElement_XmlMixed();

+

+		/**

+		 * The meta object literal for the '<em><b>Lax</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ANY_ELEMENT__LAX = eINSTANCE.getEXmlAnyElement_Lax();

+

+		/**

+		 * The meta object literal for the '<em><b>Dom Handler</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ANY_ELEMENT__DOM_HANDLER = eINSTANCE.getEXmlAnyElement_DomHandler();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Path</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ANY_ELEMENT__XML_PATH = eINSTANCE.getEXmlAnyElement_XmlPath();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Element Refs</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_ANY_ELEMENT__XML_ELEMENT_REFS = eINSTANCE.getEXmlAnyElement_XmlElementRefs();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute <em>EXml Attribute</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAttribute()

+		 * @generated

+		 */

+		public static final EClass EXML_ATTRIBUTE = eINSTANCE.getEXmlAttribute();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ATTRIBUTE__NAME = eINSTANCE.getEXmlAttribute_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ATTRIBUTE__NAMESPACE = eINSTANCE.getEXmlAttribute_Namespace();

+

+		/**

+		 * The meta object literal for the '<em><b>Required</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ATTRIBUTE__REQUIRED = eINSTANCE.getEXmlAttribute_Required();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Id</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ATTRIBUTE__XML_ID = eINSTANCE.getEXmlAttribute_XmlId();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Id Ref</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ATTRIBUTE__XML_ID_REF = eINSTANCE.getEXmlAttribute_XmlIdRef();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Key</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ATTRIBUTE__XML_KEY = eINSTANCE.getEXmlAttribute_XmlKey();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml List</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ATTRIBUTE__XML_LIST = eINSTANCE.getEXmlAttribute_XmlList();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Inline Binary Data</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ATTRIBUTE__XML_INLINE_BINARY_DATA = eINSTANCE.getEXmlAttribute_XmlInlineBinaryData();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Attachment Ref</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ATTRIBUTE__XML_ATTACHMENT_REF = eINSTANCE.getEXmlAttribute_XmlAttachmentRef();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Mime Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ATTRIBUTE__XML_MIME_TYPE = eINSTANCE.getEXmlAttribute_XmlMimeType();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Path</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ATTRIBUTE__XML_PATH = eINSTANCE.getEXmlAttribute_XmlPath();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Abstract Null Policy</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_ATTRIBUTE__XML_ABSTRACT_NULL_POLICY = eINSTANCE.getEXmlAttribute_XmlAbstractNullPolicy();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Schema Type</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_ATTRIBUTE__XML_SCHEMA_TYPE = eINSTANCE.getEXmlAttribute_XmlSchemaType();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings <em>EXml Bindings</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlBindings()

+		 * @generated

+		 */

+		public static final EClass EXML_BINDINGS = eINSTANCE.getEXmlBindings();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Accessor Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_BINDINGS__XML_ACCESSOR_TYPE = eINSTANCE.getEXmlBindings_XmlAccessorType();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Accessor Order</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_BINDINGS__XML_ACCESSOR_ORDER = eINSTANCE.getEXmlBindings_XmlAccessorOrder();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Mapping Metadata Complete</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_BINDINGS__XML_MAPPING_METADATA_COMPLETE = eINSTANCE.getEXmlBindings_XmlMappingMetadataComplete();

+

+		/**

+		 * The meta object literal for the '<em><b>Package Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_BINDINGS__PACKAGE_NAME = eINSTANCE.getEXmlBindings_PackageName();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Name Transformer</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_BINDINGS__XML_NAME_TRANSFORMER = eINSTANCE.getEXmlBindings_XmlNameTransformer();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Schema</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_BINDINGS__XML_SCHEMA = eINSTANCE.getEXmlBindings_XmlSchema();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Schema Type</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_BINDINGS__XML_SCHEMA_TYPE = eINSTANCE.getEXmlBindings_XmlSchemaType();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Schema Types</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_BINDINGS__XML_SCHEMA_TYPES = eINSTANCE.getEXmlBindings_XmlSchemaTypes();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Java Type Adapters</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_BINDINGS__XML_JAVA_TYPE_ADAPTERS = eINSTANCE.getEXmlBindings_XmlJavaTypeAdapters();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Registries</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_BINDINGS__XML_REGISTRIES = eINSTANCE.getEXmlBindings_XmlRegistries();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Enums</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_BINDINGS__XML_ENUMS = eINSTANCE.getEXmlBindings_XmlEnums();

+

+		/**

+		 * The meta object literal for the '<em><b>Java Types</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_BINDINGS__JAVA_TYPES = eINSTANCE.getEXmlBindings_JavaTypes();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlClassExtractor <em>EXml Class Extractor</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlClassExtractor

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlClassExtractor()

+		 * @generated

+		 */

+		public static final EClass EXML_CLASS_EXTRACTOR = eINSTANCE.getEXmlClassExtractor();

+

+		/**

+		 * 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 EXML_CLASS_EXTRACTOR__CLASS_NAME = eINSTANCE.getEXmlClassExtractor_ClassName();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement <em>EXml Element</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElement

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElement()

+		 * @generated

+		 */

+		public static final EClass EXML_ELEMENT = eINSTANCE.getEXmlElement();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__NAME = eINSTANCE.getEXmlElement_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__NAMESPACE = eINSTANCE.getEXmlElement_Namespace();

+

+		/**

+		 * The meta object literal for the '<em><b>Default Value</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__DEFAULT_VALUE = eINSTANCE.getEXmlElement_DefaultValue();

+

+		/**

+		 * The meta object literal for the '<em><b>Nillable</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__NILLABLE = eINSTANCE.getEXmlElement_Nillable();

+

+		/**

+		 * The meta object literal for the '<em><b>Required</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__REQUIRED = eINSTANCE.getEXmlElement_Required();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Id</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__XML_ID = eINSTANCE.getEXmlElement_XmlId();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Id Ref</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__XML_ID_REF = eINSTANCE.getEXmlElement_XmlIdRef();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Key</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__XML_KEY = eINSTANCE.getEXmlElement_XmlKey();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml List</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__XML_LIST = eINSTANCE.getEXmlElement_XmlList();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Inline Binary Data</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__XML_INLINE_BINARY_DATA = eINSTANCE.getEXmlElement_XmlInlineBinaryData();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Attachment Ref</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__XML_ATTACHMENT_REF = eINSTANCE.getEXmlElement_XmlAttachmentRef();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Mime Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__XML_MIME_TYPE = eINSTANCE.getEXmlElement_XmlMimeType();

+

+		/**

+		 * The meta object literal for the '<em><b>Cdata</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__CDATA = eINSTANCE.getEXmlElement_Cdata();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Path</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__XML_PATH = eINSTANCE.getEXmlElement_XmlPath();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Location</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT__XML_LOCATION = eINSTANCE.getEXmlElement_XmlLocation();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Abstract Null Policy</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_ELEMENT__XML_ABSTRACT_NULL_POLICY = eINSTANCE.getEXmlElement_XmlAbstractNullPolicy();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Element Wrapper</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_ELEMENT__XML_ELEMENT_WRAPPER = eINSTANCE.getEXmlElement_XmlElementWrapper();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Map</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_ELEMENT__XML_MAP = eINSTANCE.getEXmlElement_XmlMap();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Schema Type</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_ELEMENT__XML_SCHEMA_TYPE = eINSTANCE.getEXmlElement_XmlSchemaType();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl <em>EXml Element Decl</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementDecl

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementDecl()

+		 * @generated

+		 */

+		public static final EClass EXML_ELEMENT_DECL = eINSTANCE.getEXmlElementDecl();

+

+		/**

+		 * The meta object literal for the '<em><b>Java Method</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_DECL__JAVA_METHOD = eINSTANCE.getEXmlElementDecl_JavaMethod();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_DECL__NAME = eINSTANCE.getEXmlElementDecl_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_DECL__NAMESPACE = eINSTANCE.getEXmlElementDecl_Namespace();

+

+		/**

+		 * The meta object literal for the '<em><b>Default Value</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_DECL__DEFAULT_VALUE = eINSTANCE.getEXmlElementDecl_DefaultValue();

+

+		/**

+		 * The meta object literal for the '<em><b>Scope</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_DECL__SCOPE = eINSTANCE.getEXmlElementDecl_Scope();

+

+		/**

+		 * The meta object literal for the '<em><b>Substitution Head Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAME = eINSTANCE.getEXmlElementDecl_SubstitutionHeadName();

+

+		/**

+		 * The meta object literal for the '<em><b>Substitution Head Namespace</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAMESPACE = eINSTANCE.getEXmlElementDecl_SubstitutionHeadNamespace();

+

+		/**

+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_DECL__TYPE = eINSTANCE.getEXmlElementDecl_Type();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef <em>EXml Element Ref</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRef

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementRef()

+		 * @generated

+		 */

+		public static final EClass EXML_ELEMENT_REF = eINSTANCE.getEXmlElementRef();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_REF__NAME = eINSTANCE.getEXmlElementRef_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_REF__NAMESPACE = eINSTANCE.getEXmlElementRef_Namespace();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Mixed</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_REF__XML_MIXED = eINSTANCE.getEXmlElementRef_XmlMixed();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Element Wrapper</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_ELEMENT_REF__XML_ELEMENT_WRAPPER = eINSTANCE.getEXmlElementRef_XmlElementWrapper();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs <em>EXml Element Refs</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementRefs

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementRefs()

+		 * @generated

+		 */

+		public static final EClass EXML_ELEMENT_REFS = eINSTANCE.getEXmlElementRefs();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Mixed</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_REFS__XML_MIXED = eINSTANCE.getEXmlElementRefs_XmlMixed();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Element Refs</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_ELEMENT_REFS__XML_ELEMENT_REFS = eINSTANCE.getEXmlElementRefs_XmlElementRefs();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Element Wrapper</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_ELEMENT_REFS__XML_ELEMENT_WRAPPER = eINSTANCE.getEXmlElementRefs_XmlElementWrapper();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements <em>EXml Elements</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElements

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElements()

+		 * @generated

+		 */

+		public static final EClass EXML_ELEMENTS = eINSTANCE.getEXmlElements();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Id Ref</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENTS__XML_ID_REF = eINSTANCE.getEXmlElements_XmlIdRef();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml List</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENTS__XML_LIST = eINSTANCE.getEXmlElements_XmlList();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Elements</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_ELEMENTS__XML_ELEMENTS = eINSTANCE.getEXmlElements_XmlElements();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Element Wrapper</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_ELEMENTS__XML_ELEMENT_WRAPPER = eINSTANCE.getEXmlElements_XmlElementWrapper();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Join Nodes</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_ELEMENTS__XML_JOIN_NODES = eINSTANCE.getEXmlElements_XmlJoinNodes();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper <em>EXml Element Wrapper</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlElementWrapper

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlElementWrapper()

+		 * @generated

+		 */

+		public static final EClass EXML_ELEMENT_WRAPPER = eINSTANCE.getEXmlElementWrapper();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_WRAPPER__NAME = eINSTANCE.getEXmlElementWrapper_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_WRAPPER__NAMESPACE = eINSTANCE.getEXmlElementWrapper_Namespace();

+

+		/**

+		 * The meta object literal for the '<em><b>Nillable</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_WRAPPER__NILLABLE = eINSTANCE.getEXmlElementWrapper_Nillable();

+

+		/**

+		 * The meta object literal for the '<em><b>Required</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ELEMENT_WRAPPER__REQUIRED = eINSTANCE.getEXmlElementWrapper_Required();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum <em>EXml Enum</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnum

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlEnum()

+		 * @generated

+		 */

+		public static final EClass EXML_ENUM = eINSTANCE.getEXmlEnum();

+

+		/**

+		 * The meta object literal for the '<em><b>Java Enum</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ENUM__JAVA_ENUM = eINSTANCE.getEXmlEnum_JavaEnum();

+

+		/**

+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ENUM__VALUE = eINSTANCE.getEXmlEnum_Value();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Enum Values</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_ENUM__XML_ENUM_VALUES = eINSTANCE.getEXmlEnum_XmlEnumValues();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnumValue <em>EXml Enum Value</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlEnumValue

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlEnumValue()

+		 * @generated

+		 */

+		public static final EClass EXML_ENUM_VALUE = eINSTANCE.getEXmlEnumValue();

+

+		/**

+		 * The meta object literal for the '<em><b>Java Enum Value</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ENUM_VALUE__JAVA_ENUM_VALUE = eINSTANCE.getEXmlEnumValue_JavaEnumValue();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference <em>EXml Inverse Reference</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlInverseReference

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlInverseReference()

+		 * @generated

+		 */

+		public static final EClass EXML_INVERSE_REFERENCE = eINSTANCE.getEXmlInverseReference();

+

+		/**

+		 * The meta object literal for the '<em><b>Mapped By</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_INVERSE_REFERENCE__MAPPED_BY = eINSTANCE.getEXmlInverseReference_MappedBy();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetNullPolicy <em>EXml Is Set Null Policy</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetNullPolicy

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlIsSetNullPolicy()

+		 * @generated

+		 */

+		public static final EClass EXML_IS_SET_NULL_POLICY = eINSTANCE.getEXmlIsSetNullPolicy();

+

+		/**

+		 * The meta object literal for the '<em><b>Is Set Method Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_IS_SET_NULL_POLICY__IS_SET_METHOD_NAME = eINSTANCE.getEXmlIsSetNullPolicy_IsSetMethodName();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Is Set Parameters</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_IS_SET_NULL_POLICY__XML_IS_SET_PARAMETERS = eINSTANCE.getEXmlIsSetNullPolicy_XmlIsSetParameters();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter <em>EXml Is Set Parameter</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlIsSetParameter

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlIsSetParameter()

+		 * @generated

+		 */

+		public static final EClass EXML_IS_SET_PARAMETER = eINSTANCE.getEXmlIsSetParameter();

+

+		/**

+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_IS_SET_PARAMETER__VALUE = eINSTANCE.getEXmlIsSetParameter_Value();

+

+		/**

+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_IS_SET_PARAMETER__TYPE = eINSTANCE.getEXmlIsSetParameter_Type();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter <em>EXml Java Type Adapter</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJavaTypeAdapter

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJavaTypeAdapter()

+		 * @generated

+		 */

+		public static final EClass EXML_JAVA_TYPE_ADAPTER = eINSTANCE.getEXmlJavaTypeAdapter();

+

+		/**

+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_JAVA_TYPE_ADAPTER__VALUE = eINSTANCE.getEXmlJavaTypeAdapter_Value();

+

+		/**

+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_JAVA_TYPE_ADAPTER__TYPE = eINSTANCE.getEXmlJavaTypeAdapter_Type();

+

+		/**

+		 * The meta object literal for the '<em><b>Value Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_JAVA_TYPE_ADAPTER__VALUE_TYPE = eINSTANCE.getEXmlJavaTypeAdapter_ValueType();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode <em>EXml Join Node</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNode

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJoinNode()

+		 * @generated

+		 */

+		public static final EClass EXML_JOIN_NODE = eINSTANCE.getEXmlJoinNode();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Path</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_JOIN_NODE__XML_PATH = eINSTANCE.getEXmlJoinNode_XmlPath();

+

+		/**

+		 * The meta object literal for the '<em><b>Referenced Xml Path</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_JOIN_NODE__REFERENCED_XML_PATH = eINSTANCE.getEXmlJoinNode_ReferencedXmlPath();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes <em>EXml Join Nodes</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlJoinNodes

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlJoinNodes()

+		 * @generated

+		 */

+		public static final EClass EXML_JOIN_NODES = eINSTANCE.getEXmlJoinNodes();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Join Nodes</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_JOIN_NODES__XML_JOIN_NODES = eINSTANCE.getEXmlJoinNodes_XmlJoinNodes();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMap <em>EXml Map</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMap

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlMap()

+		 * @generated

+		 */

+		public static final EClass EXML_MAP = eINSTANCE.getEXmlMap();

+

+		/**

+		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_MAP__KEY = eINSTANCE.getEXmlMap_Key();

+

+		/**

+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_MAP__VALUE = eINSTANCE.getEXmlMap_Value();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNullPolicy <em>EXml Null Policy</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNullPolicy

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlNullPolicy()

+		 * @generated

+		 */

+		public static final EClass EXML_NULL_POLICY = eINSTANCE.getEXmlNullPolicy();

+

+		/**

+		 * The meta object literal for the '<em><b>Is Set Performed For Absent Node</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_NULL_POLICY__IS_SET_PERFORMED_FOR_ABSENT_NODE = eINSTANCE.getEXmlNullPolicy_IsSetPerformedForAbsentNode();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs <em>EXml Ns</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNs

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlNs()

+		 * @generated

+		 */

+		public static final EClass EXML_NS = eINSTANCE.getEXmlNs();

+

+		/**

+		 * The meta object literal for the '<em><b>Namespace Uri</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_NS__NAMESPACE_URI = eINSTANCE.getEXmlNs_NamespaceUri();

+

+		/**

+		 * The meta object literal for the '<em><b>Prefix</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_NS__PREFIX = eINSTANCE.getEXmlNs_Prefix();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty <em>EXml Property</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlProperty

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlProperty()

+		 * @generated

+		 */

+		public static final EClass EXML_PROPERTY = eINSTANCE.getEXmlProperty();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_PROPERTY__NAME = eINSTANCE.getEXmlProperty_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_PROPERTY__VALUE = eINSTANCE.getEXmlProperty_Value();

+

+		/**

+		 * The meta object literal for the '<em><b>Value Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_PROPERTY__VALUE_TYPE = eINSTANCE.getEXmlProperty_ValueType();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlReadTransformer <em>EXml Read Transformer</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlReadTransformer

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlReadTransformer()

+		 * @generated

+		 */

+		public static final EClass EXML_READ_TRANSFORMER = eINSTANCE.getEXmlReadTransformer();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRegistry <em>EXml Registry</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRegistry

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlRegistry()

+		 * @generated

+		 */

+		public static final EClass EXML_REGISTRY = eINSTANCE.getEXmlRegistry();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_REGISTRY__NAME = eINSTANCE.getEXmlRegistry_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Element Decls</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_REGISTRY__XML_ELEMENT_DECLS = eINSTANCE.getEXmlRegistry_XmlElementDecls();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRootElement <em>EXml Root Element</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlRootElement

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlRootElement()

+		 * @generated

+		 */

+		public static final EClass EXML_ROOT_ELEMENT = eINSTANCE.getEXmlRootElement();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ROOT_ELEMENT__NAME = eINSTANCE.getEXmlRootElement_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_ROOT_ELEMENT__NAMESPACE = eINSTANCE.getEXmlRootElement_Namespace();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema <em>EXml Schema</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchema

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSchema()

+		 * @generated

+		 */

+		public static final EClass EXML_SCHEMA = eINSTANCE.getEXmlSchema();

+

+		/**

+		 * The meta object literal for the '<em><b>Attribute Form Default</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_SCHEMA__ATTRIBUTE_FORM_DEFAULT = eINSTANCE.getEXmlSchema_AttributeFormDefault();

+

+		/**

+		 * The meta object literal for the '<em><b>Element Form Default</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_SCHEMA__ELEMENT_FORM_DEFAULT = eINSTANCE.getEXmlSchema_ElementFormDefault();

+

+		/**

+		 * The meta object literal for the '<em><b>Location</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_SCHEMA__LOCATION = eINSTANCE.getEXmlSchema_Location();

+

+		/**

+		 * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_SCHEMA__NAMESPACE = eINSTANCE.getEXmlSchema_Namespace();

+

+		/**

+		 * The meta object literal for the '<em><b>Xmlns</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_SCHEMA__XMLNS = eINSTANCE.getEXmlSchema_Xmlns();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType <em>EXml Schema Type</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlSchemaType

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSchemaType()

+		 * @generated

+		 */

+		public static final EClass EXML_SCHEMA_TYPE = eINSTANCE.getEXmlSchemaType();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_SCHEMA_TYPE__NAME = eINSTANCE.getEXmlSchemaType_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_SCHEMA_TYPE__NAMESPACE = eINSTANCE.getEXmlSchemaType_Namespace();

+

+		/**

+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_SCHEMA_TYPE__TYPE = eINSTANCE.getEXmlSchemaType_Type();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation <em>EXml Transformation</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransformation

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlTransformation()

+		 * @generated

+		 */

+		public static final EClass EXML_TRANSFORMATION = eINSTANCE.getEXmlTransformation();

+

+		/**

+		 * The meta object literal for the '<em><b>Optional</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_TRANSFORMATION__OPTIONAL = eINSTANCE.getEXmlTransformation_Optional();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Read Transformer</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_TRANSFORMATION__XML_READ_TRANSFORMER = eINSTANCE.getEXmlTransformation_XmlReadTransformer();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Write Transformers</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_TRANSFORMATION__XML_WRITE_TRANSFORMERS = eINSTANCE.getEXmlTransformation_XmlWriteTransformers();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransient <em>EXml Transient</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlTransient

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlTransient()

+		 * @generated

+		 */

+		public static final EClass EXML_TRANSIENT = eINSTANCE.getEXmlTransient();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Location</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_TRANSIENT__XML_LOCATION = eINSTANCE.getEXmlTransient_XmlLocation();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType <em>EXml Type</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlType

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlType()

+		 * @generated

+		 */

+		public static final EClass EXML_TYPE = eINSTANCE.getEXmlType();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_TYPE__NAME = eINSTANCE.getEXmlType_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_TYPE__NAMESPACE = eINSTANCE.getEXmlType_Namespace();

+

+		/**

+		 * The meta object literal for the '<em><b>Factory Class</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_TYPE__FACTORY_CLASS = eINSTANCE.getEXmlType_FactoryClass();

+

+		/**

+		 * The meta object literal for the '<em><b>Factory Method</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_TYPE__FACTORY_METHOD = eINSTANCE.getEXmlType_FactoryMethod();

+

+		/**

+		 * The meta object literal for the '<em><b>Prop Order</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_TYPE__PROP_ORDER = eINSTANCE.getEXmlType_PropOrder();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue <em>EXml Value</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlValue

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlValue()

+		 * @generated

+		 */

+		public static final EClass EXML_VALUE = eINSTANCE.getEXmlValue();

+

+		/**

+		 * The meta object literal for the '<em><b>Cdata</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_VALUE__CDATA = eINSTANCE.getEXmlValue_Cdata();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Abstract Null Policy</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EReference EXML_VALUE__XML_ABSTRACT_NULL_POLICY = eINSTANCE.getEXmlValue_XmlAbstractNullPolicy();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods <em>EXml Virtual Access Methods</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethods

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlVirtualAccessMethods()

+		 * @generated

+		 */

+		public static final EClass EXML_VIRTUAL_ACCESS_METHODS = eINSTANCE.getEXmlVirtualAccessMethods();

+

+		/**

+		 * The meta object literal for the '<em><b>Get Method</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_VIRTUAL_ACCESS_METHODS__GET_METHOD = eINSTANCE.getEXmlVirtualAccessMethods_GetMethod();

+

+		/**

+		 * The meta object literal for the '<em><b>Set Method</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_VIRTUAL_ACCESS_METHODS__SET_METHOD = eINSTANCE.getEXmlVirtualAccessMethods_SetMethod();

+

+		/**

+		 * The meta object literal for the '<em><b>Schema</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_VIRTUAL_ACCESS_METHODS__SCHEMA = eINSTANCE.getEXmlVirtualAccessMethods_Schema();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlWriteTransformer <em>EXml Write Transformer</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlWriteTransformer

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlWriteTransformer()

+		 * @generated

+		 */

+		public static final EClass EXML_WRITE_TRANSFORMER = eINSTANCE.getEXmlWriteTransformer();

+

+		/**

+		 * The meta object literal for the '<em><b>Xml Path</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public static final EAttribute EXML_WRITE_TRANSFORMER__XML_PATH = eINSTANCE.getEXmlWriteTransformer_XmlPath();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder <em>EXml Access Order</em>}' enum.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessOrder

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAccessOrder()

+		 * @generated

+		 */

+		public static final EEnum EXML_ACCESS_ORDER = eINSTANCE.getEXmlAccessOrder();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType <em>EXml Access Type</em>}' enum.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAccessType

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlAccessType()

+		 * @generated

+		 */

+		public static final EEnum EXML_ACCESS_TYPE = eINSTANCE.getEXmlAccessType();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMarshalNullRepresentation <em>EXml Marshal Null Representation</em>}' enum.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlMarshalNullRepresentation

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlMarshalNullRepresentation()

+		 * @generated

+		 */

+		public static final EEnum EXML_MARSHAL_NULL_REPRESENTATION = eINSTANCE.getEXmlMarshalNullRepresentation();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNsForm <em>EXml Ns Form</em>}' enum.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNsForm

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlNsForm()

+		 * @generated

+		 */

+		public static final EEnum EXML_NS_FORM = eINSTANCE.getEXmlNsForm();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethodsSchema <em>EXml Virtual Access Methods Schema</em>}' enum.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlVirtualAccessMethodsSchema

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlVirtualAccessMethodsSchema()

+		 * @generated

+		 */

+		public static final EEnum EXML_VIRTUAL_ACCESS_METHODS_SCHEMA = eINSTANCE.getEXmlVirtualAccessMethodsSchema();

+

+		/**

+		 * The meta object literal for the '<em>EProp Order</em>' data type.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see java.util.List

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEPropOrder()

+		 * @generated

+		 */

+		public static final EDataType EPROP_ORDER = eINSTANCE.getEPropOrder();

+

+		/**

+		 * The meta object literal for the '<em>EXml See Also</em>' data type.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see java.util.List

+		 * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage#getEXmlSeeAlso()

+		 * @generated

+		 */

+		public static final EDataType EXML_SEE_ALSO = eINSTANCE.getEXmlSeeAlso();

+

+	}

+

+} //OxmPackage

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmXmlResourceFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmXmlResourceFactory.java
new file mode 100644
index 0000000000..690b8cc2be
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/OxmXmlResourceFactory.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2012 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.jaxb.eclipselink.core.resource.oxm;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
+import org.eclipse.wst.common.internal.emf.resource.Renderer;
+import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
+import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
+import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
+
+/**
+ * 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.
+ */
+public class OxmXmlResourceFactory
+		extends TranslatorResourceFactory {
+	
+	public OxmXmlResourceFactory() {
+		this(RendererFactory.getDefaultRendererFactory());
+	}
+	
+	public OxmXmlResourceFactory(RendererFactory aRendererFactory) {
+		super(aRendererFactory);
+	}
+	
+	public OxmXmlResourceFactory(RendererFactory aRendererFactory, boolean listeningForUpdates) {
+		super(aRendererFactory, listeningForUpdates);
+	}
+	
+	
+	@Override
+	protected TranslatorResource createResource(URI uri, Renderer renderer) {
+		return new JptXmlResource(uri, renderer, EXmlBindings.CONTENT_TYPE, EXmlBindings.getRootTranslator());
+	}
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/util/OxmValidator.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/util/OxmValidator.java
new file mode 100644
index 0000000000..c7ce432d68
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/resource/oxm/util/OxmValidator.java
@@ -0,0 +1,805 @@
+/**

+ */

+package org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.util;

+

+import java.util.Iterator;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.emf.common.util.DiagnosticChain;

+import org.eclipse.emf.common.util.ResourceLocator;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+

+import org.eclipse.emf.ecore.util.EObjectValidator;

+

+import org.eclipse.emf.ecore.xml.type.XMLTypePackage;

+

+import org.eclipse.emf.ecore.xml.type.util.XMLTypeValidator;

+

+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Validator</b> for the model.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.OxmPackage

+ * @generated

+ */

+public class OxmValidator extends EObjectValidator

+{

+	/**

+	 * The cached model package

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final OxmValidator INSTANCE = new OxmValidator();

+

+	/**

+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

+	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

+	 * @generated

+	 */

+	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm";

+

+	/**

+	 * A constant with a fixed name that can be used as the base value for additional hand written constants.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;

+

+	/**

+	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;

+

+	/**

+	 * The cached base package validator.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected XMLTypeValidator xmlTypeValidator;

+

+	/**

+	 * Creates an instance of the switch.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public OxmValidator()

+	{

+		super();

+		xmlTypeValidator = XMLTypeValidator.INSTANCE;

+	}

+

+	/**

+	 * Returns the package of this validator switch.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EPackage getEPackage()

+	{

+	  return OxmPackage.eINSTANCE;

+	}

+

+	/**

+	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		switch (classifierID)

+		{

+			case OxmPackage.EABSTRACT_XML_NULL_POLICY:

+				return validateEAbstractXmlNullPolicy((EAbstractXmlNullPolicy)value, diagnostics, context);

+			case OxmPackage.EABSTRACT_XML_TRANSFORMER:

+				return validateEAbstractXmlTransformer((EAbstractXmlTransformer)value, diagnostics, context);

+			case OxmPackage.EACCESSIBLE_JAVA_ATTRIBUTE:

+				return validateEAccessibleJavaAttribute((EAccessibleJavaAttribute)value, diagnostics, context);

+			case OxmPackage.EADAPTABLE_JAVA_ATTRIBUTE:

+				return validateEAdaptableJavaAttribute((EAdaptableJavaAttribute)value, diagnostics, context);

+			case OxmPackage.ECONTAINER_JAVA_ATTRIBUTE:

+				return validateEContainerJavaAttribute((EContainerJavaAttribute)value, diagnostics, context);

+			case OxmPackage.EJAVA_ATTRIBUTE:

+				return validateEJavaAttribute((EJavaAttribute)value, diagnostics, context);

+			case OxmPackage.EJAVA_TYPE:

+				return validateEJavaType((EJavaType)value, diagnostics, context);

+			case OxmPackage.EPROPERTY_HOLDER:

+				return validateEPropertyHolder((EPropertyHolder)value, diagnostics, context);

+			case OxmPackage.EREAD_WRITE_JAVA_ATTRIBUTE:

+				return validateEReadWriteJavaAttribute((EReadWriteJavaAttribute)value, diagnostics, context);

+			case OxmPackage.ETYPED_JAVA_ATTRIBUTE:

+				return validateETypedJavaAttribute((ETypedJavaAttribute)value, diagnostics, context);

+			case OxmPackage.EXML_ACCESS_METHODS:

+				return validateEXmlAccessMethods((EXmlAccessMethods)value, diagnostics, context);

+			case OxmPackage.EXML_ANY_ATTRIBUTE:

+				return validateEXmlAnyAttribute((EXmlAnyAttribute)value, diagnostics, context);

+			case OxmPackage.EXML_ANY_ELEMENT:

+				return validateEXmlAnyElement((EXmlAnyElement)value, diagnostics, context);

+			case OxmPackage.EXML_ATTRIBUTE:

+				return validateEXmlAttribute((EXmlAttribute)value, diagnostics, context);

+			case OxmPackage.EXML_BINDINGS:

+				return validateEXmlBindings((EXmlBindings)value, diagnostics, context);

+			case OxmPackage.EXML_CLASS_EXTRACTOR:

+				return validateEXmlClassExtractor((EXmlClassExtractor)value, diagnostics, context);

+			case OxmPackage.EXML_ELEMENT:

+				return validateEXmlElement((EXmlElement)value, diagnostics, context);

+			case OxmPackage.EXML_ELEMENT_DECL:

+				return validateEXmlElementDecl((EXmlElementDecl)value, diagnostics, context);

+			case OxmPackage.EXML_ELEMENT_REF:

+				return validateEXmlElementRef((EXmlElementRef)value, diagnostics, context);

+			case OxmPackage.EXML_ELEMENT_REFS:

+				return validateEXmlElementRefs((EXmlElementRefs)value, diagnostics, context);

+			case OxmPackage.EXML_ELEMENTS:

+				return validateEXmlElements((EXmlElements)value, diagnostics, context);

+			case OxmPackage.EXML_ELEMENT_WRAPPER:

+				return validateEXmlElementWrapper((EXmlElementWrapper)value, diagnostics, context);

+			case OxmPackage.EXML_ENUM:

+				return validateEXmlEnum((EXmlEnum)value, diagnostics, context);

+			case OxmPackage.EXML_ENUM_VALUE:

+				return validateEXmlEnumValue((EXmlEnumValue)value, diagnostics, context);

+			case OxmPackage.EXML_INVERSE_REFERENCE:

+				return validateEXmlInverseReference((EXmlInverseReference)value, diagnostics, context);

+			case OxmPackage.EXML_IS_SET_NULL_POLICY:

+				return validateEXmlIsSetNullPolicy((EXmlIsSetNullPolicy)value, diagnostics, context);

+			case OxmPackage.EXML_IS_SET_PARAMETER:

+				return validateEXmlIsSetParameter((EXmlIsSetParameter)value, diagnostics, context);

+			case OxmPackage.EXML_JAVA_TYPE_ADAPTER:

+				return validateEXmlJavaTypeAdapter((EXmlJavaTypeAdapter)value, diagnostics, context);

+			case OxmPackage.EXML_JOIN_NODE:

+				return validateEXmlJoinNode((EXmlJoinNode)value, diagnostics, context);

+			case OxmPackage.EXML_JOIN_NODES:

+				return validateEXmlJoinNodes((EXmlJoinNodes)value, diagnostics, context);

+			case OxmPackage.EXML_MAP:

+				return validateEXmlMap((EXmlMap)value, diagnostics, context);

+			case OxmPackage.EXML_NULL_POLICY:

+				return validateEXmlNullPolicy((EXmlNullPolicy)value, diagnostics, context);

+			case OxmPackage.EXML_NS:

+				return validateEXmlNs((EXmlNs)value, diagnostics, context);

+			case OxmPackage.EXML_PROPERTY:

+				return validateEXmlProperty((EXmlProperty)value, diagnostics, context);

+			case OxmPackage.EXML_READ_TRANSFORMER:

+				return validateEXmlReadTransformer((EXmlReadTransformer)value, diagnostics, context);

+			case OxmPackage.EXML_REGISTRY:

+				return validateEXmlRegistry((EXmlRegistry)value, diagnostics, context);

+			case OxmPackage.EXML_ROOT_ELEMENT:

+				return validateEXmlRootElement((EXmlRootElement)value, diagnostics, context);

+			case OxmPackage.EXML_SCHEMA:

+				return validateEXmlSchema((EXmlSchema)value, diagnostics, context);

+			case OxmPackage.EXML_SCHEMA_TYPE:

+				return validateEXmlSchemaType((EXmlSchemaType)value, diagnostics, context);

+			case OxmPackage.EXML_TRANSFORMATION:

+				return validateEXmlTransformation((EXmlTransformation)value, diagnostics, context);

+			case OxmPackage.EXML_TRANSIENT:

+				return validateEXmlTransient((EXmlTransient)value, diagnostics, context);

+			case OxmPackage.EXML_TYPE:

+				return validateEXmlType((EXmlType)value, diagnostics, context);

+			case OxmPackage.EXML_VALUE:

+				return validateEXmlValue((EXmlValue)value, diagnostics, context);

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS:

+				return validateEXmlVirtualAccessMethods((EXmlVirtualAccessMethods)value, diagnostics, context);

+			case OxmPackage.EXML_WRITE_TRANSFORMER:

+				return validateEXmlWriteTransformer((EXmlWriteTransformer)value, diagnostics, context);

+			case OxmPackage.EXML_ACCESS_ORDER:

+				return validateEXmlAccessOrder((EXmlAccessOrder)value, diagnostics, context);

+			case OxmPackage.EXML_ACCESS_TYPE:

+				return validateEXmlAccessType((EXmlAccessType)value, diagnostics, context);

+			case OxmPackage.EXML_MARSHAL_NULL_REPRESENTATION:

+				return validateEXmlMarshalNullRepresentation((EXmlMarshalNullRepresentation)value, diagnostics, context);

+			case OxmPackage.EXML_NS_FORM:

+				return validateEXmlNsForm((EXmlNsForm)value, diagnostics, context);

+			case OxmPackage.EXML_VIRTUAL_ACCESS_METHODS_SCHEMA:

+				return validateEXmlVirtualAccessMethodsSchema((EXmlVirtualAccessMethodsSchema)value, diagnostics, context);

+			case OxmPackage.EPROP_ORDER:

+				return validateEPropOrder((List<?>)value, diagnostics, context);

+			case OxmPackage.EXML_SEE_ALSO:

+				return validateEXmlSeeAlso((List<?>)value, diagnostics, context);

+			default:

+				return true;

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEAbstractXmlNullPolicy(EAbstractXmlNullPolicy eAbstractXmlNullPolicy, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eAbstractXmlNullPolicy, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEAbstractXmlTransformer(EAbstractXmlTransformer eAbstractXmlTransformer, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eAbstractXmlTransformer, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEAccessibleJavaAttribute(EAccessibleJavaAttribute eAccessibleJavaAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eAccessibleJavaAttribute, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEAdaptableJavaAttribute(EAdaptableJavaAttribute eAdaptableJavaAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eAdaptableJavaAttribute, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEContainerJavaAttribute(EContainerJavaAttribute eContainerJavaAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eContainerJavaAttribute, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEJavaAttribute(EJavaAttribute eJavaAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eJavaAttribute, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEJavaType(EJavaType eJavaType, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eJavaType, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEPropertyHolder(EPropertyHolder ePropertyHolder, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)ePropertyHolder, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEReadWriteJavaAttribute(EReadWriteJavaAttribute eReadWriteJavaAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eReadWriteJavaAttribute, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateETypedJavaAttribute(ETypedJavaAttribute eTypedJavaAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eTypedJavaAttribute, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlAccessMethods(EXmlAccessMethods eXmlAccessMethods, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlAccessMethods, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlAnyAttribute(EXmlAnyAttribute eXmlAnyAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlAnyAttribute, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlAnyElement(EXmlAnyElement eXmlAnyElement, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlAnyElement, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlAttribute(EXmlAttribute eXmlAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlAttribute, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlBindings(EXmlBindings eXmlBindings, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlBindings, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlClassExtractor(EXmlClassExtractor eXmlClassExtractor, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlClassExtractor, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlElement(EXmlElement eXmlElement, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlElement, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlElementDecl(EXmlElementDecl eXmlElementDecl, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlElementDecl, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlElementRef(EXmlElementRef eXmlElementRef, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlElementRef, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlElementRefs(EXmlElementRefs eXmlElementRefs, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlElementRefs, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlElements(EXmlElements eXmlElements, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlElements, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlElementWrapper(EXmlElementWrapper eXmlElementWrapper, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlElementWrapper, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlEnum(EXmlEnum eXmlEnum, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlEnum, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlEnumValue(EXmlEnumValue eXmlEnumValue, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlEnumValue, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlInverseReference(EXmlInverseReference eXmlInverseReference, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlInverseReference, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlIsSetNullPolicy(EXmlIsSetNullPolicy eXmlIsSetNullPolicy, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlIsSetNullPolicy, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlIsSetParameter(EXmlIsSetParameter eXmlIsSetParameter, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlIsSetParameter, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlJavaTypeAdapter(EXmlJavaTypeAdapter eXmlJavaTypeAdapter, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlJavaTypeAdapter, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlJoinNode(EXmlJoinNode eXmlJoinNode, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlJoinNode, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlJoinNodes(EXmlJoinNodes eXmlJoinNodes, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlJoinNodes, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlMap(EXmlMap eXmlMap, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlMap, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlNullPolicy(EXmlNullPolicy eXmlNullPolicy, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlNullPolicy, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlNs(EXmlNs eXmlNs, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlNs, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlProperty(EXmlProperty eXmlProperty, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlProperty, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlReadTransformer(EXmlReadTransformer eXmlReadTransformer, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlReadTransformer, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlRegistry(EXmlRegistry eXmlRegistry, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlRegistry, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlRootElement(EXmlRootElement eXmlRootElement, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlRootElement, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlSchema(EXmlSchema eXmlSchema, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlSchema, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlSchemaType(EXmlSchemaType eXmlSchemaType, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlSchemaType, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlTransformation(EXmlTransformation eXmlTransformation, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlTransformation, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlTransient(EXmlTransient eXmlTransient, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlTransient, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlType(EXmlType eXmlType, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlType, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlValue(EXmlValue eXmlValue, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlValue, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlVirtualAccessMethods(EXmlVirtualAccessMethods eXmlVirtualAccessMethods, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlVirtualAccessMethods, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlWriteTransformer(EXmlWriteTransformer eXmlWriteTransformer, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return validate_EveryDefaultConstraint((EObject)eXmlWriteTransformer, diagnostics, context);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlAccessOrder(EXmlAccessOrder eXmlAccessOrder, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return true;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlAccessType(EXmlAccessType eXmlAccessType, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return true;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlMarshalNullRepresentation(EXmlMarshalNullRepresentation eXmlMarshalNullRepresentation, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return true;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlNsForm(EXmlNsForm eXmlNsForm, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return true;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlVirtualAccessMethodsSchema(EXmlVirtualAccessMethodsSchema eXmlVirtualAccessMethodsSchema, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		return true;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEPropOrder(List<?> ePropOrder, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		boolean result = validateEPropOrder_ItemType(ePropOrder, diagnostics, context);

+		return result;

+	}

+

+	/**

+	 * Validates the ItemType constraint of '<em>EProp Order</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEPropOrder_ItemType(List<?> ePropOrder, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		boolean result = true;

+		for (Iterator<?> i = ePropOrder.iterator(); i.hasNext() && (result || diagnostics != null); )

+		{

+			Object item = i.next();

+			if (XMLTypePackage.Literals.STRING.isInstance(item))

+			{

+				result &= xmlTypeValidator.validateString((String)item, diagnostics, context);

+			}

+			else

+			{

+				result = false;

+				reportDataValueTypeViolation(XMLTypePackage.Literals.STRING, item, diagnostics, context);

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlSeeAlso(List<?> eXmlSeeAlso, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		boolean result = validateEXmlSeeAlso_ItemType(eXmlSeeAlso, diagnostics, context);

+		return result;

+	}

+

+	/**

+	 * Validates the ItemType constraint of '<em>EXml See Also</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean validateEXmlSeeAlso_ItemType(List<?> eXmlSeeAlso, DiagnosticChain diagnostics, Map<Object, Object> context)

+	{

+		boolean result = true;

+		for (Iterator<?> i = eXmlSeeAlso.iterator(); i.hasNext() && (result || diagnostics != null); )

+		{

+			Object item = i.next();

+			if (XMLTypePackage.Literals.STRING.isInstance(item))

+			{

+				result &= xmlTypeValidator.validateString((String)item, diagnostics, context);

+			}

+			else

+			{

+				result = false;

+				reportDataValueTypeViolation(XMLTypePackage.Literals.STRING, item, diagnostics, context);

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator()

+	{

+		// TODO

+		// Specialize this to return a resource locator for messages specific to this validator.

+		// Ensure that you remove @generated or mark it @generated NOT

+		return super.getResourceLocator();

+	}

+

+} //OxmValidator

diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/META-INF/MANIFEST.MF b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/META-INF/MANIFEST.MF
index 066e928ce0..fdca1503db 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/META-INF/MANIFEST.MF
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,9 @@ Bundle-ClassPath: .
 Bundle-Localization: plugin
 Dali-Comment: jdk 1.6 has the javax.xml.bind annotations
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.emf.common;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.jpt.common.core;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.jpt.common.core.tests;bundle-version="[1.0.0,2.0.0)",
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/ELJaxbCoreResourceModelTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/ELJaxbCoreResourceModelTests.java
index 58bd740164..b2cf65765c 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/ELJaxbCoreResourceModelTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/ELJaxbCoreResourceModelTests.java
@@ -13,6 +13,7 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.ELJaxbCoreTests;
 import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java.ELJaxbJavaResourceModelTests;
+import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.oxm.OxmResourceTests;
 
 public class ELJaxbCoreResourceModelTests {
 	
@@ -21,6 +22,7 @@ public class ELJaxbCoreResourceModelTests {
 
 		if (ELJaxbCoreTests.requiredJarsExists()) {
 			suite.addTest(ELJaxbJavaResourceModelTests.suite());
+			suite.addTestSuite(OxmResourceTests.class);
 		}
 		else {
 			suite.addTest(TestSuite.warning(ELJaxbCoreTests.buildMissingJarErrorMessage()));
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/oxm/OxmResourceTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/oxm/OxmResourceTests.java
new file mode 100644
index 0000000000..96e59237b2
--- /dev/null
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/oxm/OxmResourceTests.java
@@ -0,0 +1,70 @@
+package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.oxm;

+

+import java.io.ByteArrayInputStream;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;

+import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;

+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;

+import org.eclipse.jpt.common.core.tests.internal.resource.java.JavaResourceModelTestCase;

+import org.eclipse.jpt.jaxb.eclipselink.core.internal.resource.oxm.OxmXmlResourceProvider;

+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EJavaType;

+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlAttribute;

+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlBindings;

+import org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.EXmlNullPolicy;

+

+public class OxmResourceTests

+		extends JavaResourceModelTestCase {

+	

+	public OxmResourceTests(String name) {

+		super(name);

+	}

+	

+	

+	@Override

+	protected AnnotationDefinition[] annotationDefinitions() {

+		return new AnnotationDefinition[0];

+	}

+	

+	@Override

+	protected NestableAnnotationDefinition[] nestableAnnotationDefinitions() {

+		return new NestableAnnotationDefinition[0];

+	}

+	

+	public void testMultiObjectTranslators() throws Exception {

+		IFile oxmFile = getJavaProject().getProject().getFile("oxm.xml");

+		StringBuffer sb = new StringBuffer();

+		sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>").append(CR);

+		sb.append("<xml-bindings").append(CR);

+		sb.append("    xmlns=\"http://www.eclipse.org/eclipselink/xsds/persistence/oxm\"").append(CR);

+		sb.append("    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"").append(CR);

+		sb.append("    xsi:schemaLocation=\"http://www.eclipse.org/eclipselink/xsds/persistence/oxm http://www.eclipse.org/eclipselink/xsds/eclipselink_oxm_2_4.xsd\"").append(CR);

+		sb.append("    version=\"2.4\">").append(CR);

+		sb.append("    <java-types>").append(CR);

+		sb.append("        <java-type>").append(CR);

+		sb.append("            <java-attributes>").append(CR);

+		sb.append("                <xml-attribute>").append(CR);

+		sb.append("                    <xml-null-policy/>").append(CR);

+		sb.append("                </xml-attribute>").append(CR);

+		sb.append("            </java-attributes>").append(CR);

+		sb.append("        </java-type>").append(CR);

+		sb.append("    </java-types>").append(CR);

+		sb.append("</xml-bindings>").append(CR);

+		oxmFile.create(new ByteArrayInputStream(sb.toString().getBytes()), true, null);

+		JptXmlResource resource = OxmXmlResourceProvider.getXmlResourceProvider(oxmFile).getXmlResource();

+		EXmlBindings xmlBindings = (EXmlBindings) resource.getRootObject();

+		

+		assertNotNull(xmlBindings);

+		

+		EJavaType javaType = xmlBindings.getJavaTypes().get(0);

+		

+		assertNotNull(javaType);

+		

+		EXmlAttribute xmlAttribute = (EXmlAttribute) javaType.getJavaAttributes().get(0);

+		

+		assertNotNull(xmlAttribute);

+		

+		EXmlNullPolicy xmlNullPolicy = (EXmlNullPolicy) xmlAttribute.getXmlAbstractNullPolicy();

+		

+		assertNotNull(xmlNullPolicy);

+	}

+}

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.core/META-INF/MANIFEST.MF
index 272be62729..30e92cf63f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/META-INF/MANIFEST.MF
@@ -74,7 +74,6 @@ Export-Package: org.eclipse.jpt.jpa.core,
  org.eclipse.jpt.jpa.core.internal.resource.java.source;x-internal:=true,
  org.eclipse.jpt.jpa.core.internal.resource.orm;x-internal:=true,
  org.eclipse.jpt.jpa.core.internal.resource.persistence;x-internal:=true,
- org.eclipse.jpt.jpa.core.internal.resource.xml;x-internal:=true,
  org.eclipse.jpt.jpa.core.internal.validation;x-internal:=true,
  org.eclipse.jpt.jpa.core.jpa2,
  org.eclipse.jpt.jpa.core.jpa2.context,
@@ -93,5 +92,4 @@ Export-Package: org.eclipse.jpt.jpa.core,
  org.eclipse.jpt.jpa.core.resource.orm,
  org.eclipse.jpt.jpa.core.resource.orm.v2_0,
  org.eclipse.jpt.jpa.core.resource.persistence,
- org.eclipse.jpt.jpa.core.resource.persistence.v2_0,
- org.eclipse.jpt.jpa.core.resource.xml
+ org.eclipse.jpt.jpa.core.resource.persistence.v2_0
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 397e9a3c1e..601b7862e8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel
@@ -1,512 +1,501 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jpt.jpa.core/src"
-    creationCommands="false" creationIcons="false" editDirectory="" editorDirectory=""
-    modelPluginID="org.eclipse.jpt.jpa.core" modelName="Core" editPluginClass="" editorPluginClass=""
-    updateClasspath="false" rootExtendsInterface="org.eclipse.jpt.jpa.core.resource.xml.JpaEObject"
-    rootExtendsClass="org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject" suppressInterfaces="true"
-    testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
-  <foreignModel>common.ecore</foreignModel>
-  <foreignModel>orm.ecore</foreignModel>
-  <foreignModel>persistence.ecore</foreignModel>
-  <genPackages prefix="Common" basePackage="org.eclipse.jpt.jpa.core.resource" disposableProviderFactory="true"
-      adapterFactory="false" ecorePackage="common.ecore#/">
-    <genClasses image="false" ecoreClass="common.ecore#//AbstractJpaRootEObject"/>
-    <genClasses image="false" ecoreClass="common.ecore#//JpaRootEObject">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//JpaRootEObject/version"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//JpaRootEObject/schemaLocation"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="Orm" basePackage="org.eclipse.jpt.jpa.core.resource" disposableProviderFactory="true"
-      adapterFactory="false" ecorePackage="orm.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//DiscriminatorType">
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//DiscriminatorType/STRING"/>
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//DiscriminatorType/CHAR"/>
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//DiscriminatorType/INTEGER"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//EnumType">
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//EnumType/ORDINAL"/>
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//EnumType/STRING"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//FetchType">
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//FetchType/LAZY"/>
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//FetchType/EAGER"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//GenerationType">
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//GenerationType/TABLE"/>
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//GenerationType/SEQUENCE"/>
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//GenerationType/IDENTITY"/>
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//GenerationType/AUTO"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//InheritanceType">
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//InheritanceType/SINGLE_TABLE"/>
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//InheritanceType/JOINED"/>
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//InheritanceType/TABLE_PER_CLASS"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//TemporalType">
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//TemporalType/DATE"/>
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//TemporalType/TIME"/>
-      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//TemporalType/TIMESTAMP"/>
-    </genEnums>
-    <genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlAttributeMapping"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlBaseColumn">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlBaseColumn/insertable"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlBaseColumn/nullable"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlBaseColumn/table"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlBaseColumn/unique"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlBaseColumn/updatable"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlBaseColumn"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlBaseDiscriminatorColumn"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlEmbedded"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlMultiRelationshipMapping">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//AbstractXmlMultiRelationshipMapping/mapKey"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlNamedColumn">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlNamedColumn/columnDefinition"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlNamedColumn/name"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlBaseDiscriminatorColumn">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlBaseDiscriminatorColumn/discriminatorType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlBaseDiscriminatorColumn/length"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlBaseJoinColumn">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlBaseJoinColumn/referencedColumnName"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlNamedColumn"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlRelationshipMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//AbstractXmlRelationshipMapping/targetEntity"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//AbstractXmlRelationshipMapping/fetch"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//AbstractXmlRelationshipMapping/cascade"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlSingleRelationshipMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//AbstractXmlSingleRelationshipMapping/optional"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlReferenceTable"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlTable">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//AbstractXmlTable/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//AbstractXmlTable/catalog"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//AbstractXmlTable/schema"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//AbstractXmlTable/uniqueConstraints"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlTypeMapping"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlAccessHolder">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlAccessHolder/access"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlAttributeMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlAttributeMapping/name"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlAssociationOverride"/>
-    <genClasses ecoreClass="orm.ecore#//XmlAssociationOverrideContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlAssociationOverrideContainer/associationOverrides"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlAttributeOverride">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlAttributeOverride/column"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlAttributeOverrideContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlAttributeOverrideContainer/attributeOverrides"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//Attributes">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/ids"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/embeddedIds"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/basics"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/versions"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/manyToOnes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/oneToManys"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/oneToOnes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/manyToManys"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/embeddeds"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/transients"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlBasic">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlBasic/fetch"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlBasic/optional"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//CascadeType">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute orm.ecore#//CascadeType/cascadeAll"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute orm.ecore#//CascadeType/cascadePersist"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute orm.ecore#//CascadeType/cascadeMerge"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute orm.ecore#//CascadeType/cascadeRemove"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute orm.ecore#//CascadeType/cascadeRefresh"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlClassReference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlClassReference/className"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlCollectionTable"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlColumn">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlColumn/length"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlColumn/precision"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlColumn/scale"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//ColumnMapping">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//ColumnMapping/column"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//ColumnResult">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//ColumnResult/name"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlConvertibleMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlConvertibleMapping/lob"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlConvertibleMapping/temporal"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlConvertibleMapping/enumerated"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlDiscriminatorColumn"/>
-    <genClasses ecoreClass="orm.ecore#//XmlElementCollection"/>
-    <genClasses ecoreClass="orm.ecore#//XmlEmbeddable"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlEmbedded"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlEmbeddedId"/>
-    <genClasses ecoreClass="orm.ecore#//XmlEntity">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlEntity/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntity/table"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntity/secondaryTables"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntity/primaryKeyJoinColumns"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntity/inheritance"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlEntity/discriminatorValue"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntity/discriminatorColumn"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntity/sqlResultSetMappings"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlEntity/excludeDefaultListeners"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlEntity/excludeSuperclassListeners"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntity/entityListeners"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//EntityListener">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//EntityListener/className"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//EntityListeners">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//EntityListeners/entityListeners"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlEntityMappings">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlEntityMappings/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntityMappings/persistenceUnitMetadata"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlEntityMappings/package"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlEntityMappings/schema"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlEntityMappings/catalog"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntityMappings/sequenceGenerators"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntityMappings/tableGenerators"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntityMappings/sqlResultSetMappings"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntityMappings/mappedSuperclasses"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntityMappings/entities"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntityMappings/embeddables"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//EntityResult">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//EntityResult/discriminatorColumn"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//EntityResult/entityClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//EntityResult/fieldResults"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//EventMethod">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//EventMethod/methodName"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlEventMethodContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEventMethodContainer/prePersist"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEventMethodContainer/postPersist"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEventMethodContainer/preRemove"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEventMethodContainer/postRemove"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEventMethodContainer/preUpdate"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEventMethodContainer/postUpdate"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEventMethodContainer/postLoad"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//FieldResult">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//FieldResult/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//FieldResult/column"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlGeneratedValue">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlGeneratedValue/generator"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlGeneratedValue/strategy"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlGenerator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlGenerator/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlGenerator/initialValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlGenerator/allocationSize"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlGeneratorContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlGeneratorContainer/sequenceGenerator"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlGeneratorContainer/tableGenerator"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlId">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlId/generatedValue"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlIdClassContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlIdClassContainer/idClass"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//Inheritance">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//Inheritance/strategy"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlJoinColumn"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlJoinColumnContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlJoinColumnContainer/joinColumns"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlJoinTable">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlJoinTable/inverseJoinColumns"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlJoinTableContainer">
-      <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#//XmlManyToMany"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlManyToOne"/>
-    <genClasses ecoreClass="orm.ecore#//MapKey">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//MapKey/name"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlMappedByMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlMappedByMapping/mappedBy"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlMappedSuperclass">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlMappedSuperclass/excludeDefaultListeners"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlMappedSuperclass/excludeSuperclassListeners"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlMappedSuperclass/entityListeners"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlNamedNativeQuery">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlNamedNativeQuery/resultClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlNamedNativeQuery/resultSetMapping"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlNamedQuery"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlNullAttributeMapping"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlOneToMany"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlOneToOne"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlOrderable">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlOrderable/orderBy"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlOrderColumn"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlOverride">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlOverride/name"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlPersistenceUnitDefaults">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlPersistenceUnitDefaults/schema"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlPersistenceUnitDefaults/catalog"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlPersistenceUnitDefaults/cascadePersist"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlPersistenceUnitDefaults/entityListeners"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlPersistenceUnitMetadata">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlPersistenceUnitMetadata/xmlMappingMetadataComplete"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlPersistenceUnitMetadata/persistenceUnitDefaults"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlReferenceTable">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlReferenceTable/joinColumns"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//PostLoad"/>
-    <genClasses ecoreClass="orm.ecore#//PostPersist"/>
-    <genClasses ecoreClass="orm.ecore#//PostRemove"/>
-    <genClasses ecoreClass="orm.ecore#//PostUpdate"/>
-    <genClasses ecoreClass="orm.ecore#//PrePersist"/>
-    <genClasses ecoreClass="orm.ecore#//PreRemove"/>
-    <genClasses ecoreClass="orm.ecore#//PreUpdate"/>
-    <genClasses ecoreClass="orm.ecore#//XmlPrimaryKeyJoinColumn"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlPrimaryKeyJoinColumnContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlPrimaryKeyJoinColumnContainer/primaryKeyJoinColumns"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlQuery">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlQuery/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlQuery/query"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlQuery/hints"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlQueryContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlQueryContainer/namedQueries"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlQueryContainer/namedNativeQueries"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlQueryHint">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlQueryHint/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlQueryHint/value"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlSecondaryTable">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlSecondaryTable/primaryKeyJoinColumns"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlSequenceGenerator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlSequenceGenerator/sequenceName"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//SqlResultSetMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//SqlResultSetMapping/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//SqlResultSetMapping/entityResults"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//SqlResultSetMapping/columnResults"/>
-    </genClasses>
-    <genClasses ecoreClass="orm.ecore#//XmlTable"/>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlTableGenerator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlTableGenerator/table"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlTableGenerator/catalog"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlTableGenerator/schema"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlTableGenerator/pkColumnName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlTableGenerator/valueColumnName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlTableGenerator/pkColumnValue"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlTableGenerator/uniqueConstraints"/>
-    </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">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlUniqueConstraint/columnNames"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm.ecore#//XmlVersion"/>
-    <nestedGenPackages prefix="OrmV2_0" basePackage="org.eclipse.jpt.jpa.core.resource.orm"
-        disposableProviderFactory="true" adapterFactory="false" ecorePackage="orm.ecore#//v2_0">
-      <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//v2_0/LockModeType_2_0">
-        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/NONE"/>
-        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/READ"/>
-        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/WRITE"/>
-        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/OPTIMISTIC"/>
-        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/OPTIMISTIC_FORCE_INCREMENT"/>
-        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/PESSIMISTIC_READ"/>
-        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/PESSIMISTIC_WRITE"/>
-        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/PESSIMISTIC_FORCE_INCREMENT"/>
-      </genEnums>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlAssociationOverride_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlAssociationOverride_2_0/description"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlAttributeMapping_2_0"/>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlAttributeOverride_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlAttributeOverride_2_0/description"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlAttributes_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlAttributes_2_0/description"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlAttributes_2_0/elementCollections"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlCacheable_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlCacheable_2_0/cacheable"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlCascadeType_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlCascadeType_2_0/cascadeDetach"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlCollectionTable_2_0"/>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlDerivedId_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlDerivedId_2_0/id"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlElementCollection_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlElementCollection_2_0/targetClass"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlElementCollection_2_0/fetch"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/mapKey"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/mapKeyClass"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/mapKeyColumn"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/mapKeyJoinColumns"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/column"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/collectionTable"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlEmbedded_2_0"/>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlEntity_2_0"/>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlEntityListener_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlEntityListener_2_0/description"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlEventMethod_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlEventMethod_2_0/description"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlGenerator_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlGenerator_2_0/description"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlManyToMany_2_0"/>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlMapKeyAttributeOverrideContainer_2_0">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMapKeyAttributeOverrideContainer_2_0/mapKeyAttributeOverrides"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlMapKeyConvertibleMapping_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlMapKeyConvertibleMapping_2_0/mapKeyTemporal"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlMapKeyConvertibleMapping_2_0/mapKeyEnumerated"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlMapsId_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlMapsId_2_0/mapsId"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlMultiRelationshipMapping_2_0">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMultiRelationshipMapping_2_0/mapKeyClass"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMultiRelationshipMapping_2_0/mapKeyColumn"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMultiRelationshipMapping_2_0/mapKeyJoinColumns"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlNamedQuery_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlNamedQuery_2_0/lockMode"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlOneToMany_2_0"/>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlOneToOne_2_0"/>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlOrderable_2_0">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlOrderable_2_0/orderColumn"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlOrderColumn_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrderColumn_2_0/nullable"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrderColumn_2_0/insertable"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrderColumn_2_0/updatable"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlOrphanRemovable_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrphanRemovable_2_0/orphanRemoval"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlPersistenceUnitDefaults_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlPersistenceUnitDefaults_2_0/description"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlPersistenceUnitDefaults_2_0/delimitedIdentifiers"/>
-      </genClasses>
-      <genClasses ecoreClass="orm.ecore#//v2_0/XmlPersistenceUnitMetadata_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlPersistenceUnitMetadata_2_0/description"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlQuery_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlQuery_2_0/description"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlQueryHint_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlQueryHint_2_0/description"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlSequenceGenerator_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlSequenceGenerator_2_0/catalog"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlSequenceGenerator_2_0/schema"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlSingleRelationshipMapping_2_0"/>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlSqlResultSetMapping_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlSqlResultSetMapping_2_0/description"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlUniqueConstraint_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlUniqueConstraint_2_0/name"/>
-      </genClasses>
-    </nestedGenPackages>
-  </genPackages>
-  <genPackages prefix="Persistence" basePackage="org.eclipse.jpt.jpa.core.resource"
-      disposableProviderFactory="true" adapterFactory="false" ecorePackage="persistence.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="persistence.ecore#//XmlPersistenceUnitTransactionType">
-      <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//XmlPersistenceUnitTransactionType/JTA"/>
-      <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//XmlPersistenceUnitTransactionType/RESOURCE_LOCAL"/>
-    </genEnums>
-    <genClasses ecoreClass="persistence.ecore#//XmlJavaClassRef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlJavaClassRef/javaClass"/>
-    </genClasses>
-    <genClasses ecoreClass="persistence.ecore#//XmlJarFileRef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlJarFileRef/fileName"/>
-    </genClasses>
-    <genClasses ecoreClass="persistence.ecore#//XmlMappingFileRef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlMappingFileRef/fileName"/>
-    </genClasses>
-    <genClasses ecoreClass="persistence.ecore#//XmlPersistence">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//XmlPersistence/persistenceUnits"/>
-    </genClasses>
-    <genClasses ecoreClass="persistence.ecore#//XmlPersistenceUnit">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlPersistenceUnit/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlPersistenceUnit/provider"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlPersistenceUnit/jtaDataSource"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlPersistenceUnit/nonJtaDataSource"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//XmlPersistenceUnit/mappingFiles"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference persistence.ecore#//XmlPersistenceUnit/jarFiles"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//XmlPersistenceUnit/classes"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlPersistenceUnit/excludeUnlistedClasses"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//XmlPersistenceUnit/properties"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlPersistenceUnit/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlPersistenceUnit/transactionType"/>
-    </genClasses>
-    <genClasses ecoreClass="persistence.ecore#//XmlProperties">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//XmlProperties/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="persistence.ecore#//XmlProperty">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlProperty/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlProperty/value"/>
-    </genClasses>
-    <nestedGenPackages prefix="PersistenceV2_0" basePackage="org.eclipse.jpt.jpa.core.resource.persistence"
-        disposableProviderFactory="true" adapterFactory="false" ecorePackage="persistence.ecore#//v2_0">
-      <genEnums typeSafeEnumCompatible="false" ecoreEnum="persistence.ecore#//v2_0/XmlPersistenceUnitCachingType_2_0">
-        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitCachingType_2_0/ALL"/>
-        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitCachingType_2_0/NONE"/>
-        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitCachingType_2_0/ENABLE_SELECTIVE"/>
-        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitCachingType_2_0/DISABLE_SELECTIVE"/>
-        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitCachingType_2_0/UNSPECIFIED"/>
-      </genEnums>
-      <genEnums typeSafeEnumCompatible="false" ecoreEnum="persistence.ecore#//v2_0/XmlPersistenceUnitValidationModeType_2_0">
-        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitValidationModeType_2_0/AUTO"/>
-        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitValidationModeType_2_0/CALLBACK"/>
-        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitValidationModeType_2_0/NONE"/>
-      </genEnums>
-      <genClasses image="false" ecoreClass="persistence.ecore#//v2_0/XmlPersistenceUnit_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//v2_0/XmlPersistenceUnit_2_0/sharedCacheMode"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//v2_0/XmlPersistenceUnit_2_0/validationMode"/>
-      </genClasses>
-    </nestedGenPackages>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jpt.jpa.core/src" creationCommands="false"

+    creationIcons="false" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.jpt.jpa.core"

+    modelName="Core" editPluginClass="" editorPluginClass="" updateClasspath="false"

+    rootExtendsInterface="org.eclipse.jpt.common.core.resource.xml.EBaseObject" rootExtendsClass="org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl"

+    suppressInterfaces="true" testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"

+    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.jpt.common.core/model/commonResourceModels.genmodel#//xml platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">

+  <foreignModel>orm.ecore</foreignModel>

+  <foreignModel>persistence.ecore</foreignModel>

+  <genPackages prefix="Orm" basePackage="org.eclipse.jpt.jpa.core.resource" disposableProviderFactory="true"

+      adapterFactory="false" ecorePackage="orm.ecore#/">

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//DiscriminatorType">

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//DiscriminatorType/STRING"/>

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//DiscriminatorType/CHAR"/>

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//DiscriminatorType/INTEGER"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//EnumType">

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//EnumType/ORDINAL"/>

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//EnumType/STRING"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//FetchType">

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//FetchType/LAZY"/>

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//FetchType/EAGER"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//GenerationType">

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//GenerationType/TABLE"/>

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//GenerationType/SEQUENCE"/>

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//GenerationType/IDENTITY"/>

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//GenerationType/AUTO"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//InheritanceType">

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//InheritanceType/SINGLE_TABLE"/>

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//InheritanceType/JOINED"/>

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//InheritanceType/TABLE_PER_CLASS"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//TemporalType">

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//TemporalType/DATE"/>

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//TemporalType/TIME"/>

+      <genEnumLiterals ecoreEnumLiteral="orm.ecore#//TemporalType/TIMESTAMP"/>

+    </genEnums>

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

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

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

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

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

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

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

+    </genClasses>

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

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

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

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//AbstractXmlMultiRelationshipMapping/mapKey"/>

+    </genClasses>

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

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

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

+    </genClasses>

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

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

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

+    </genClasses>

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

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

+    </genClasses>

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

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

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

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//AbstractXmlRelationshipMapping/cascade"/>

+    </genClasses>

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

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

+    </genClasses>

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

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

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

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

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//AbstractXmlTable/uniqueConstraints"/>

+    </genClasses>

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

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

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

+    </genClasses>

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

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

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlAssociationOverride"/>

+    <genClasses ecoreClass="orm.ecore#//XmlAssociationOverrideContainer">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlAssociationOverrideContainer/associationOverrides"/>

+    </genClasses>

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlAttributeOverride/column"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlAttributeOverrideContainer">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlAttributeOverrideContainer/attributeOverrides"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//Attributes">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/ids"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/embeddedIds"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/basics"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/versions"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/manyToOnes"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/oneToManys"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/oneToOnes"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/manyToManys"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/embeddeds"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//Attributes/transients"/>

+    </genClasses>

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

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

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

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//CascadeType">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute orm.ecore#//CascadeType/cascadeAll"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute orm.ecore#//CascadeType/cascadePersist"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute orm.ecore#//CascadeType/cascadeMerge"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute orm.ecore#//CascadeType/cascadeRemove"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute orm.ecore#//CascadeType/cascadeRefresh"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlClassReference">

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

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlCollectionTable"/>

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

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

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

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

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//ColumnMapping">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//ColumnMapping/column"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//ColumnResult">

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

+    </genClasses>

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

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

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

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

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlDiscriminatorColumn"/>

+    <genClasses ecoreClass="orm.ecore#//XmlElementCollection"/>

+    <genClasses ecoreClass="orm.ecore#//XmlEmbeddable"/>

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

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

+    <genClasses ecoreClass="orm.ecore#//XmlEntity">

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntity/table"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntity/secondaryTables"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntity/primaryKeyJoinColumns"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntity/inheritance"/>

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntity/discriminatorColumn"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntity/sqlResultSetMappings"/>

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

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntity/entityListeners"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//EntityListener">

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

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//EntityListeners">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//EntityListeners/entityListeners"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlEntityMappings">

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntityMappings/persistenceUnitMetadata"/>

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

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

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntityMappings/sequenceGenerators"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntityMappings/tableGenerators"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntityMappings/sqlResultSetMappings"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntityMappings/mappedSuperclasses"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntityMappings/entities"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEntityMappings/embeddables"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//EntityResult">

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

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//EntityResult/fieldResults"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//EventMethod">

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

+    </genClasses>

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEventMethodContainer/prePersist"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEventMethodContainer/postPersist"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEventMethodContainer/preRemove"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEventMethodContainer/postRemove"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEventMethodContainer/preUpdate"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEventMethodContainer/postUpdate"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlEventMethodContainer/postLoad"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//FieldResult">

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

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

+    </genClasses>

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

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

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

+    </genClasses>

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

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

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

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

+    </genClasses>

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlGeneratorContainer/sequenceGenerator"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlGeneratorContainer/tableGenerator"/>

+    </genClasses>

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlId/generatedValue"/>

+    </genClasses>

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlIdClassContainer/idClass"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//Inheritance">

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

+    </genClasses>

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

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlJoinColumnContainer/joinColumns"/>

+    </genClasses>

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlJoinTable/inverseJoinColumns"/>

+    </genClasses>

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

+      <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#//XmlManyToMany"/>

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

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

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

+    </genClasses>

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

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

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlMappedSuperclass">

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

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlMappedSuperclass/entityListeners"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlNamedNativeQuery">

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

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

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlNamedQuery"/>

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

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

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

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

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

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlOrderColumn"/>

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

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

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlPersistenceUnitDefaults">

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

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

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlPersistenceUnitDefaults/entityListeners"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlPersistenceUnitMetadata">

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlPersistenceUnitMetadata/persistenceUnitDefaults"/>

+    </genClasses>

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlReferenceTable/joinColumns"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//PostLoad"/>

+    <genClasses ecoreClass="orm.ecore#//PostPersist"/>

+    <genClasses ecoreClass="orm.ecore#//PostRemove"/>

+    <genClasses ecoreClass="orm.ecore#//PostUpdate"/>

+    <genClasses ecoreClass="orm.ecore#//PrePersist"/>

+    <genClasses ecoreClass="orm.ecore#//PreRemove"/>

+    <genClasses ecoreClass="orm.ecore#//PreUpdate"/>

+    <genClasses ecoreClass="orm.ecore#//XmlPrimaryKeyJoinColumn"/>

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlPrimaryKeyJoinColumnContainer/primaryKeyJoinColumns"/>

+    </genClasses>

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

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

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlQuery/hints"/>

+    </genClasses>

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlQueryContainer/namedQueries"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlQueryContainer/namedNativeQueries"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlQueryHint">

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

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

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlSecondaryTable">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlSecondaryTable/primaryKeyJoinColumns"/>

+    </genClasses>

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

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

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//SqlResultSetMapping">

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//SqlResultSetMapping/entityResults"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//SqlResultSetMapping/columnResults"/>

+    </genClasses>

+    <genClasses ecoreClass="orm.ecore#//XmlTable"/>

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

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

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

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

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

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

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

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlTableGenerator/uniqueConstraints"/>

+    </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">

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

+    </genClasses>

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

+    <nestedGenPackages prefix="OrmV2_0" basePackage="org.eclipse.jpt.jpa.core.resource.orm"

+        disposableProviderFactory="true" adapterFactory="false" ecorePackage="orm.ecore#//v2_0">

+      <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//v2_0/LockModeType_2_0">

+        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/NONE"/>

+        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/READ"/>

+        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/WRITE"/>

+        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/OPTIMISTIC"/>

+        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/OPTIMISTIC_FORCE_INCREMENT"/>

+        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/PESSIMISTIC_READ"/>

+        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/PESSIMISTIC_WRITE"/>

+        <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/PESSIMISTIC_FORCE_INCREMENT"/>

+      </genEnums>

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

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

+      </genClasses>

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

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

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

+      </genClasses>

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

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

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlAttributes_2_0/elementCollections"/>

+      </genClasses>

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

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlCacheable_2_0/cacheable"/>

+      </genClasses>

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

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlCascadeType_2_0/cascadeDetach"/>

+      </genClasses>

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

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

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlDerivedId_2_0/id"/>

+      </genClasses>

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

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlElementCollection_2_0/targetClass"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlElementCollection_2_0/fetch"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/mapKey"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/mapKeyClass"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/mapKeyColumn"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/mapKeyJoinColumns"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/column"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/collectionTable"/>

+      </genClasses>

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

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

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

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

+      </genClasses>

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

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

+      </genClasses>

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

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

+      </genClasses>

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

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

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMapKeyAttributeOverrideContainer_2_0/mapKeyAttributeOverrides"/>

+      </genClasses>

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

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlMapKeyConvertibleMapping_2_0/mapKeyTemporal"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlMapKeyConvertibleMapping_2_0/mapKeyEnumerated"/>

+      </genClasses>

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

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlMapsId_2_0/mapsId"/>

+      </genClasses>

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

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMultiRelationshipMapping_2_0/mapKeyClass"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMultiRelationshipMapping_2_0/mapKeyColumn"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMultiRelationshipMapping_2_0/mapKeyJoinColumns"/>

+      </genClasses>

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

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlNamedQuery_2_0/lockMode"/>

+      </genClasses>

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

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

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

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlOrderable_2_0/orderColumn"/>

+      </genClasses>

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

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrderColumn_2_0/nullable"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrderColumn_2_0/insertable"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrderColumn_2_0/updatable"/>

+      </genClasses>

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

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrphanRemovable_2_0/orphanRemoval"/>

+      </genClasses>

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

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

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlPersistenceUnitDefaults_2_0/delimitedIdentifiers"/>

+      </genClasses>

+      <genClasses ecoreClass="orm.ecore#//v2_0/XmlPersistenceUnitMetadata_2_0">

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

+      </genClasses>

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

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

+      </genClasses>

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

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

+      </genClasses>

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

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlSequenceGenerator_2_0/catalog"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlSequenceGenerator_2_0/schema"/>

+      </genClasses>

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

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

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

+      </genClasses>

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

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlUniqueConstraint_2_0/name"/>

+      </genClasses>

+    </nestedGenPackages>

+  </genPackages>

+  <genPackages prefix="Persistence" basePackage="org.eclipse.jpt.jpa.core.resource"

+      disposableProviderFactory="true" adapterFactory="false" ecorePackage="persistence.ecore#/">

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="persistence.ecore#//XmlPersistenceUnitTransactionType">

+      <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//XmlPersistenceUnitTransactionType/JTA"/>

+      <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//XmlPersistenceUnitTransactionType/RESOURCE_LOCAL"/>

+    </genEnums>

+    <genClasses ecoreClass="persistence.ecore#//XmlJavaClassRef">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlJavaClassRef/javaClass"/>

+    </genClasses>

+    <genClasses ecoreClass="persistence.ecore#//XmlJarFileRef">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlJarFileRef/fileName"/>

+    </genClasses>

+    <genClasses ecoreClass="persistence.ecore#//XmlMappingFileRef">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlMappingFileRef/fileName"/>

+    </genClasses>

+    <genClasses ecoreClass="persistence.ecore#//XmlPersistence">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//XmlPersistence/persistenceUnits"/>

+    </genClasses>

+    <genClasses ecoreClass="persistence.ecore#//XmlPersistenceUnit">

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

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlPersistenceUnit/provider"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlPersistenceUnit/jtaDataSource"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlPersistenceUnit/nonJtaDataSource"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//XmlPersistenceUnit/mappingFiles"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EReference persistence.ecore#//XmlPersistenceUnit/jarFiles"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//XmlPersistenceUnit/classes"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlPersistenceUnit/excludeUnlistedClasses"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//XmlPersistenceUnit/properties"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlPersistenceUnit/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlPersistenceUnit/transactionType"/>

+    </genClasses>

+    <genClasses ecoreClass="persistence.ecore#//XmlProperties">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//XmlProperties/properties"/>

+    </genClasses>

+    <genClasses ecoreClass="persistence.ecore#//XmlProperty">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlProperty/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//XmlProperty/value"/>

+    </genClasses>

+    <nestedGenPackages prefix="PersistenceV2_0" basePackage="org.eclipse.jpt.jpa.core.resource.persistence"

+        disposableProviderFactory="true" adapterFactory="false" ecorePackage="persistence.ecore#//v2_0">

+      <genEnums typeSafeEnumCompatible="false" ecoreEnum="persistence.ecore#//v2_0/XmlPersistenceUnitCachingType_2_0">

+        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitCachingType_2_0/ALL"/>

+        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitCachingType_2_0/NONE"/>

+        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitCachingType_2_0/ENABLE_SELECTIVE"/>

+        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitCachingType_2_0/DISABLE_SELECTIVE"/>

+        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitCachingType_2_0/UNSPECIFIED"/>

+      </genEnums>

+      <genEnums typeSafeEnumCompatible="false" ecoreEnum="persistence.ecore#//v2_0/XmlPersistenceUnitValidationModeType_2_0">

+        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitValidationModeType_2_0/AUTO"/>

+        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitValidationModeType_2_0/CALLBACK"/>

+        <genEnumLiterals ecoreEnumLiteral="persistence.ecore#//v2_0/XmlPersistenceUnitValidationModeType_2_0/NONE"/>

+      </genEnums>

+      <genClasses image="false" ecoreClass="persistence.ecore#//v2_0/XmlPersistenceUnit_2_0">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//v2_0/XmlPersistenceUnit_2_0/sharedCacheMode"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//v2_0/XmlPersistenceUnit_2_0/validationMode"/>

+      </genClasses>

+    </nestedGenPackages>

+  </genPackages>

+</genmodel:GenModel>

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 5e78328cb1..fada35755e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore
@@ -1,584 +1,582 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="orm"
-    nsURI="jpt.orm.xmi" nsPrefix="org.eclipse.jpt.jpa.core.resource.orm">
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlAttributeMapping" abstract="true"
-      eSuperTypes="#//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBaseColumn" abstract="true" interface="true"
-      eSuperTypes="#//XmlNamedColumn">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="insertable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nullable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="table" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unique" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="updatable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlBaseColumn" abstract="true"
-      eSuperTypes="#//AbstractXmlNamedColumn #//XmlBaseColumn"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlBaseDiscriminatorColumn"
-      abstract="true" eSuperTypes="#//AbstractXmlNamedColumn #//XmlBaseDiscriminatorColumn"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlEmbedded" abstract="true"
-      eSuperTypes="#//AbstractXmlAttributeMapping #//XmlAttributeOverrideContainer"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlMultiRelationshipMapping"
-      abstract="true" eSuperTypes="#//AbstractXmlRelationshipMapping #//XmlMappedByMapping #//XmlJoinTableContainer #//XmlOrderable #//v2_0/XmlMultiRelationshipMapping_2_0">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mapKey" eType="#//MapKey"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedColumn" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="columnDefinition" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBaseDiscriminatorColumn" abstract="true"
-      interface="true" eSuperTypes="#//XmlNamedColumn">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="discriminatorType" eType="#//DiscriminatorType"
-        defaultValueLiteral="STRING"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="length" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBaseJoinColumn" abstract="true" interface="true"
-      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="AbstractXmlNamedColumn" abstract="true"
-      eSuperTypes="#//XmlNamedColumn"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlRelationshipMapping" abstract="true"
-      eSuperTypes="#//AbstractXmlAttributeMapping">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetEntity" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fetch" eType="#//FetchType"
-        defaultValueLiteral="LAZY"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cascade" eType="#//CascadeType"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlSingleRelationshipMapping"
-      abstract="true" eSuperTypes="#//AbstractXmlRelationshipMapping #//XmlJoinTableContainer #//XmlJoinColumnContainer #//v2_0/XmlSingleRelationshipMapping_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="optional" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlReferenceTable" abstract="true"
-      eSuperTypes="#//AbstractXmlTable #//XmlReferenceTable"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlTable" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="catalog" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="schema" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="uniqueConstraints" upperBound="-1"
-        eType="#//XmlUniqueConstraint" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlTypeMapping" abstract="true"
-      eSuperTypes="#//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>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlAttributeMapping" abstract="true"
-      interface="true" eSuperTypes="#//v2_0/XmlAttributeMapping_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlAssociationOverride" eSuperTypes="#//XmlOverride #//XmlJoinColumnContainer #//v2_0/XmlAssociationOverride_2_0"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlAssociationOverrideContainer" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="associationOverrides" upperBound="-1"
-        eType="#//XmlAssociationOverride" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlAttributeOverride" eSuperTypes="#//XmlOverride #//v2_0/XmlAttributeOverride_2_0">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="column" lowerBound="1"
-        eType="#//XmlColumn" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlAttributeOverrideContainer" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="attributeOverrides" upperBound="-1"
-        eType="#//XmlAttributeOverride" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Attributes" eSuperTypes="#//v2_0/XmlAttributes_2_0">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ids" upperBound="-1" eType="#//XmlId"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="embeddedIds" upperBound="-1"
-        eType="#//XmlEmbeddedId" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="basics" upperBound="-1"
-        eType="#//XmlBasic" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="versions" upperBound="-1"
-        eType="#//XmlVersion" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="manyToOnes" upperBound="-1"
-        eType="#//XmlManyToOne" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="oneToManys" upperBound="-1"
-        eType="#//XmlOneToMany" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="oneToOnes" upperBound="-1"
-        eType="#//XmlOneToOne" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="manyToManys" upperBound="-1"
-        eType="#//XmlManyToMany" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="embeddeds" upperBound="-1"
-        eType="#//XmlEmbedded" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="transients" upperBound="-1"
-        eType="#//XmlTransient" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasic" eSuperTypes="#//AbstractXmlAttributeMapping #//ColumnMapping #//XmlConvertibleMapping">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fetch" eType="#//FetchType"
-        defaultValueLiteral="LAZY"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="optional" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CascadeType" eSuperTypes="#//v2_0/XmlCascadeType_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeAll" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadePersist" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeMerge" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeRemove" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeRefresh" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlClassReference">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCollectionTable" eSuperTypes="#//AbstractXmlReferenceTable #//v2_0/XmlCollectionTable_2_0"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlColumn" eSuperTypes="#//AbstractXmlBaseColumn">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="length" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="precision" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scale" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ColumnMapping" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="column" eType="#//XmlColumn"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ColumnResult">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlConvertibleMapping" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lob" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="temporal" eType="#//TemporalType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enumerated" eType="#//EnumType"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlDiscriminatorColumn" eSuperTypes="#//AbstractXmlBaseDiscriminatorColumn"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection" eSuperTypes="#//AbstractXmlAttributeMapping #//v2_0/XmlElementCollection_2_0"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable" eSuperTypes="#//AbstractXmlTypeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded" eSuperTypes="#//AbstractXmlEmbedded #//v2_0/XmlEmbedded_2_0"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedId" eSuperTypes="#//AbstractXmlEmbedded"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEntity" eSuperTypes="#//AbstractXmlTypeMapping #//XmlQueryContainer #//XmlGeneratorContainer #//XmlEventMethodContainer #//XmlAttributeOverrideContainer #//XmlAssociationOverrideContainer #//v2_0/XmlEntity_2_0 #//XmlIdClassContainer">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="table" eType="#//XmlTable"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="secondaryTables" upperBound="-1"
-        eType="#//XmlSecondaryTable" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyJoinColumns"
-        upperBound="-1" eType="#//XmlPrimaryKeyJoinColumn" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inheritance" eType="#//Inheritance"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="discriminatorValue" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="discriminatorColumn" eType="#//XmlDiscriminatorColumn"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sqlResultSetMappings" upperBound="-1"
-        eType="#//SqlResultSetMapping" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultListeners"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeSuperclassListeners"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="entityListeners" eType="#//EntityListeners"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EntityListener" eSuperTypes="#//XmlEventMethodContainer #//v2_0/XmlEntityListener_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EntityListeners">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="entityListeners" upperBound="-1"
-        eType="#//EntityListener" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings" eSuperTypes="common.ecore#//AbstractJpaRootEObject #//XmlQueryContainer #//XmlAccessHolder">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="persistenceUnitMetadata"
-        eType="#//XmlPersistenceUnitMetadata" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="package" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="schema" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="catalog" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceGenerators" upperBound="-1"
-        eType="#//XmlSequenceGenerator" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tableGenerators" upperBound="-1"
-        eType="#//XmlTableGenerator" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sqlResultSetMappings" upperBound="-1"
-        eType="#//SqlResultSetMapping" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mappedSuperclasses" upperBound="-1"
-        eType="#//XmlMappedSuperclass" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="entities" upperBound="-1"
-        eType="#//XmlEntity" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="embeddables" upperBound="-1"
-        eType="#//XmlEmbeddable" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EntityResult">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="discriminatorColumn" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="entityClass" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="fieldResults" upperBound="-1"
-        eType="#//FieldResult" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EventMethod" abstract="true" eSuperTypes="#//v2_0/XmlEventMethod_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="methodName" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEventMethodContainer" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="prePersist" eType="#//PrePersist"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="postPersist" eType="#//PostPersist"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="preRemove" eType="#//PreRemove"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="postRemove" eType="#//PostRemove"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="preUpdate" eType="#//PreUpdate"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="postUpdate" eType="#//PostUpdate"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="postLoad" eType="#//PostLoad"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FieldResult">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="column" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlGeneratedValue">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generator" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strategy" eType="#//GenerationType"
-        defaultValueLiteral="TABLE"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlGenerator" abstract="true" interface="true"
-      eSuperTypes="#//v2_0/XmlGenerator_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="initialValue" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="allocationSize" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlGeneratorContainer" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceGenerator" eType="#//XmlSequenceGenerator"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tableGenerator" eType="#//XmlTableGenerator"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlId" eSuperTypes="#//AbstractXmlAttributeMapping #//ColumnMapping #//XmlConvertibleMapping #//XmlGeneratorContainer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="generatedValue" eType="#//XmlGeneratedValue"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlIdClassContainer" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="idClass" eType="#//XmlClassReference"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Inheritance">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strategy" eType="#//InheritanceType"
-        defaultValueLiteral="SINGLE_TABLE"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlJoinColumn" eSuperTypes="#//AbstractXmlBaseColumn #//XmlBaseJoinColumn"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlJoinColumnContainer" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="joinColumns" upperBound="-1"
-        eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlJoinTable" eSuperTypes="#//AbstractXmlReferenceTable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inverseJoinColumns" upperBound="-1"
-        eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlJoinTableContainer" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="joinTable" eType="#//XmlJoinTable"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Lob"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany" eSuperTypes="#//AbstractXmlMultiRelationshipMapping #//v2_0/XmlManyToMany_2_0"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne" eSuperTypes="#//AbstractXmlSingleRelationshipMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="MapKey">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlMappedByMapping" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mappedBy" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass" eSuperTypes="#//AbstractXmlTypeMapping #//XmlIdClassContainer">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultListeners"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeSuperclassListeners"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="entityListeners" eType="#//EntityListeners"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedNativeQuery" eSuperTypes="#//XmlQuery">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resultClass" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resultSetMapping" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedQuery" eSuperTypes="#//XmlQuery #//v2_0/XmlNamedQuery_2_0"/>
-  <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"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne" eSuperTypes="#//AbstractXmlSingleRelationshipMapping #//XmlMappedByMapping #//XmlPrimaryKeyJoinColumnContainer #//v2_0/XmlOneToOne_2_0"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOrderable" abstract="true" interface="true"
-      eSuperTypes="#//v2_0/XmlOrderable_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="orderBy" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOrderColumn" eSuperTypes="#//AbstractXmlNamedColumn #//v2_0/XmlOrderColumn_2_0"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOverride" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults" eSuperTypes="#//XmlAccessHolder #//v2_0/XmlPersistenceUnitDefaults_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="schema" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="catalog" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadePersist" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="entityListeners" eType="#//EntityListeners"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitMetadata" eSuperTypes="#//v2_0/XmlPersistenceUnitMetadata_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlMappingMetadataComplete"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="persistenceUnitDefaults"
-        eType="#//XmlPersistenceUnitDefaults" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlReferenceTable" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="joinColumns" upperBound="-1"
-        eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PostLoad" eSuperTypes="#//EventMethod"/>
-  <eClassifiers xsi:type="ecore:EClass" name="PostPersist" eSuperTypes="#//EventMethod"/>
-  <eClassifiers xsi:type="ecore:EClass" name="PostRemove" eSuperTypes="#//EventMethod"/>
-  <eClassifiers xsi:type="ecore:EClass" name="PostUpdate" eSuperTypes="#//EventMethod"/>
-  <eClassifiers xsi:type="ecore:EClass" name="PrePersist" eSuperTypes="#//EventMethod"/>
-  <eClassifiers xsi:type="ecore:EClass" name="PreRemove" eSuperTypes="#//EventMethod"/>
-  <eClassifiers xsi:type="ecore:EClass" name="PreUpdate" eSuperTypes="#//EventMethod"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPrimaryKeyJoinColumn" eSuperTypes="#//AbstractXmlNamedColumn #//XmlBaseJoinColumn"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPrimaryKeyJoinColumnContainer" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyJoinColumns"
-        upperBound="-1" eType="#//XmlPrimaryKeyJoinColumn" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlQuery" abstract="true" interface="true"
-      eSuperTypes="#//v2_0/XmlQuery_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="query" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="hints" upperBound="-1"
-        eType="#//XmlQueryHint" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlQueryContainer" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="namedQueries" upperBound="-1"
-        eType="#//XmlNamedQuery" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="namedNativeQueries" upperBound="-1"
-        eType="#//XmlNamedNativeQuery" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlQueryHint" eSuperTypes="#//v2_0/XmlQueryHint_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlSecondaryTable" eSuperTypes="#//AbstractXmlTable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyJoinColumns"
-        upperBound="-1" eType="#//XmlPrimaryKeyJoinColumn" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlSequenceGenerator" eSuperTypes="#//XmlGenerator #//v2_0/XmlSequenceGenerator_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sequenceName" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SqlResultSetMapping" eSuperTypes="#//v2_0/XmlSqlResultSetMapping_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="entityResults" upperBound="-1"
-        eType="#//EntityResult" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="columnResults" upperBound="-1"
-        eType="#//ColumnResult" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTable" eSuperTypes="#//AbstractXmlTable"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTableGenerator" eSuperTypes="#//XmlGenerator">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="table" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="catalog" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="schema" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pkColumnName" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueColumnName" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pkColumnValue" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="uniqueConstraints" upperBound="-1"
-        eType="#//XmlUniqueConstraint" containment="true" resolveProxies="false"/>
-  </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"/>
-    <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>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlUniqueConstraint" eSuperTypes="#//v2_0/XmlUniqueConstraint_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="columnNames" unique="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlVersion" eSuperTypes="#//AbstractXmlAttributeMapping #//ColumnMapping #//XmlConvertibleMapping"/>
-  <eClassifiers xsi:type="ecore:EEnum" name="DiscriminatorType">
-    <eLiterals name="STRING"/>
-    <eLiterals name="CHAR" value="1"/>
-    <eLiterals name="INTEGER" value="2"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="EnumType">
-    <eLiterals name="ORDINAL"/>
-    <eLiterals name="STRING" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="FetchType">
-    <eLiterals name="LAZY"/>
-    <eLiterals name="EAGER" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="GenerationType">
-    <eLiterals name="TABLE"/>
-    <eLiterals name="SEQUENCE" value="1"/>
-    <eLiterals name="IDENTITY" value="2"/>
-    <eLiterals name="AUTO" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="InheritanceType">
-    <eLiterals name="SINGLE_TABLE" literal="SINGLE_TABLE"/>
-    <eLiterals name="JOINED" value="1"/>
-    <eLiterals name="TABLE_PER_CLASS" value="2" literal="TABLE_PER_CLASS"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="TemporalType">
-    <eLiterals name="DATE"/>
-    <eLiterals name="TIME" value="1"/>
-    <eLiterals name="TIMESTAMP" value="2"/>
-  </eClassifiers>
-  <eSubpackages name="v2_0" nsURI="jpt.orm.v2_0.xmi" nsPrefix="org.eclipse.jpt.jpa.core.resource.orm.v2_0">
-    <eClassifiers xsi:type="ecore:EClass" name="XmlAssociationOverride_2_0" abstract="true"
-        interface="true" eSuperTypes="#//XmlJoinTableContainer">
-      <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="XmlAttributeMapping_2_0" abstract="true"
-        interface="true" eSuperTypes="#//XmlAccessHolder"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlAttributeOverride_2_0" abstract="true"
-        interface="true">
-      <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="XmlAttributes_2_0" 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:EReference" name="elementCollections" upperBound="-1"
-          eType="#//XmlElementCollection" containment="true" resolveProxies="false"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlCacheable_2_0" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="cacheable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlCascadeType_2_0" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeDetach" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlCollectionTable_2_0" abstract="true"
-        interface="true" eSuperTypes="#//XmlReferenceTable"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlDerivedId_2_0" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_0" abstract="true"
-        interface="true" eSuperTypes="#//XmlConvertibleMapping #//XmlOrderable #//XmlAttributeOverrideContainer #//XmlAssociationOverrideContainer #//v2_0/XmlMapKeyAttributeOverrideContainer_2_0 #//v2_0/XmlMapKeyConvertibleMapping_2_0">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetClass" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="fetch" eType="#//FetchType"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKey" eType="#//MapKey"
-          containment="true" resolveProxies="false"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyClass" eType="#//XmlClassReference"
-          containment="true" resolveProxies="false"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyColumn" eType="#//XmlColumn"
-          containment="true" resolveProxies="false"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyJoinColumns" upperBound="-1"
-          eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="column" eType="#//XmlColumn"
-          containment="true" resolveProxies="false"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="collectionTable" eType="#//XmlCollectionTable"
-          containment="true" resolveProxies="false"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded_2_0" abstract="true" interface="true"
-        eSuperTypes="#//XmlAssociationOverrideContainer"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_0" abstract="true" interface="true"
-        eSuperTypes="#//v2_0/XmlCacheable_2_0"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEntityListener_2_0" abstract="true"
-        interface="true">
-      <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="XmlEventMethod_2_0" abstract="true"
-        interface="true">
-      <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="XmlGenerator_2_0" abstract="true"
-        interface="true">
-      <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_2_0" abstract="true"
-        interface="true" eSuperTypes="#//v2_0/XmlMultiRelationshipMapping_2_0"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlMapKeyAttributeOverrideContainer_2_0"
-        abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyAttributeOverrides"
-          upperBound="-1" eType="#//XmlAttributeOverride" containment="true" resolveProxies="false"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlMapKeyConvertibleMapping_2_0" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="mapKeyTemporal" eType="#//TemporalType"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="mapKeyEnumerated" eType="#//EnumType"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlMapsId_2_0" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="mapsId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlMultiRelationshipMapping_2_0" abstract="true"
-        interface="true" eSuperTypes="#//v2_0/XmlOrderable_2_0 #//v2_0/XmlMapKeyAttributeOverrideContainer_2_0 #//v2_0/XmlMapKeyConvertibleMapping_2_0">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyClass" eType="#//XmlClassReference"
-          containment="true" resolveProxies="false"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyColumn" eType="#//XmlColumn"
-          containment="true" resolveProxies="false"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyJoinColumns" upperBound="-1"
-          eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlNamedQuery_2_0" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="lockMode" eType="#//v2_0/LockModeType_2_0"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany_2_0" abstract="true"
-        interface="true" eSuperTypes="#//v2_0/XmlMultiRelationshipMapping_2_0 #//v2_0/XmlOrphanRemovable_2_0"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne_2_0" abstract="true" interface="true"
-        eSuperTypes="#//v2_0/XmlSingleRelationshipMapping_2_0 #//v2_0/XmlOrphanRemovable_2_0"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlOrderable_2_0" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="orderColumn" eType="#//XmlOrderColumn"
-          containment="true" resolveProxies="false"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlOrderColumn_2_0" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="nullable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="insertable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="updatable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlOrphanRemovable_2_0" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="orphanRemoval" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults_2_0" 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="delimitedIdentifiers"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitMetadata_2_0" abstract="true"
-        interface="true">
-      <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="XmlQuery_2_0" abstract="true" interface="true">
-      <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="XmlQueryHint_2_0" abstract="true"
-        interface="true">
-      <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="XmlSequenceGenerator_2_0" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="catalog" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="schema" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlSingleRelationshipMapping_2_0"
-        abstract="true" interface="true" eSuperTypes="#//v2_0/XmlDerivedId_2_0 #//v2_0/XmlMapsId_2_0"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlSqlResultSetMapping_2_0" abstract="true"
-        interface="true">
-      <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="XmlUniqueConstraint_2_0" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="LockModeType_2_0">
-      <eLiterals name="NONE"/>
-      <eLiterals name="READ" value="1"/>
-      <eLiterals name="WRITE" value="2"/>
-      <eLiterals name="OPTIMISTIC" value="3"/>
-      <eLiterals name="OPTIMISTIC_FORCE_INCREMENT" value="4"/>
-      <eLiterals name="PESSIMISTIC_READ" value="5"/>
-      <eLiterals name="PESSIMISTIC_WRITE" value="6"/>
-      <eLiterals name="PESSIMISTIC_FORCE_INCREMENT" value="7"/>
-    </eClassifiers>
-  </eSubpackages>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="orm" nsURI="jpt.orm.xmi" nsPrefix="org.eclipse.jpt.jpa.core.resource.orm">

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

+      eSuperTypes="#//XmlAttributeMapping"/>

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

+      eSuperTypes="#//XmlNamedColumn">

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

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

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

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

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

+  </eClassifiers>

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

+      eSuperTypes="#//AbstractXmlNamedColumn #//XmlBaseColumn"/>

+  <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlBaseDiscriminatorColumn"

+      abstract="true" eSuperTypes="#//AbstractXmlNamedColumn #//XmlBaseDiscriminatorColumn"/>

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

+      eSuperTypes="#//AbstractXmlAttributeMapping #//XmlAttributeOverrideContainer"/>

+  <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlMultiRelationshipMapping"

+      abstract="true" eSuperTypes="#//AbstractXmlRelationshipMapping #//XmlMappedByMapping #//XmlJoinTableContainer #//XmlOrderable #//v2_0/XmlMultiRelationshipMapping_2_0">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="mapKey" eType="#//MapKey"

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

+  </eClassifiers>

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

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

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

+  </eClassifiers>

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

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="discriminatorType" eType="#//DiscriminatorType"

+        defaultValueLiteral="STRING"/>

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

+  </eClassifiers>

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

+      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="AbstractXmlNamedColumn" abstract="true"

+      eSuperTypes="#//XmlNamedColumn"/>

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

+      eSuperTypes="#//AbstractXmlAttributeMapping">

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fetch" eType="#//FetchType"

+        defaultValueLiteral="LAZY"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="cascade" eType="#//CascadeType"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AbstractXmlSingleRelationshipMapping"

+      abstract="true" eSuperTypes="#//AbstractXmlRelationshipMapping #//XmlJoinTableContainer #//XmlJoinColumnContainer #//v2_0/XmlSingleRelationshipMapping_2_0">

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

+  </eClassifiers>

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

+      eSuperTypes="#//AbstractXmlTable #//XmlReferenceTable"/>

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

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

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

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="uniqueConstraints" upperBound="-1"

+        eType="#//XmlUniqueConstraint" containment="true" resolveProxies="false"/>

+  </eClassifiers>

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

+      eSuperTypes="#//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>

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

+      interface="true" eSuperTypes="#//v2_0/XmlAttributeMapping_2_0">

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlAssociationOverride" eSuperTypes="#//XmlOverride #//XmlJoinColumnContainer #//v2_0/XmlAssociationOverride_2_0"/>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="associationOverrides" upperBound="-1"

+        eType="#//XmlAssociationOverride" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlAttributeOverride" eSuperTypes="#//XmlOverride #//v2_0/XmlAttributeOverride_2_0">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="column" lowerBound="1"

+        eType="#//XmlColumn" containment="true" resolveProxies="false"/>

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="attributeOverrides" upperBound="-1"

+        eType="#//XmlAttributeOverride" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Attributes" eSuperTypes="#//v2_0/XmlAttributes_2_0">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ids" upperBound="-1" eType="#//XmlId"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="embeddedIds" upperBound="-1"

+        eType="#//XmlEmbeddedId" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="basics" upperBound="-1"

+        eType="#//XmlBasic" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="versions" upperBound="-1"

+        eType="#//XmlVersion" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="manyToOnes" upperBound="-1"

+        eType="#//XmlManyToOne" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="oneToManys" upperBound="-1"

+        eType="#//XmlOneToMany" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="oneToOnes" upperBound="-1"

+        eType="#//XmlOneToOne" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="manyToManys" upperBound="-1"

+        eType="#//XmlManyToMany" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="embeddeds" upperBound="-1"

+        eType="#//XmlEmbedded" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="transients" upperBound="-1"

+        eType="#//XmlTransient" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlBasic" eSuperTypes="#//AbstractXmlAttributeMapping #//ColumnMapping #//XmlConvertibleMapping">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fetch" eType="#//FetchType"

+        defaultValueLiteral="LAZY"/>

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="CascadeType" eSuperTypes="#//v2_0/XmlCascadeType_2_0">

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

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

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

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

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlClassReference">

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

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlCollectionTable" eSuperTypes="#//AbstractXmlReferenceTable #//v2_0/XmlCollectionTable_2_0"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlColumn" eSuperTypes="#//AbstractXmlBaseColumn">

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

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

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

+  </eClassifiers>

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="column" eType="#//XmlColumn"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ColumnResult">

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

+  </eClassifiers>

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

+      interface="true">

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="temporal" eType="#//TemporalType"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enumerated" eType="#//EnumType"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlDiscriminatorColumn" eSuperTypes="#//AbstractXmlBaseDiscriminatorColumn"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection" eSuperTypes="#//AbstractXmlAttributeMapping #//v2_0/XmlElementCollection_2_0"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable" eSuperTypes="#//AbstractXmlTypeMapping"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded" eSuperTypes="#//AbstractXmlEmbedded #//v2_0/XmlEmbedded_2_0"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedId" eSuperTypes="#//AbstractXmlEmbedded"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlEntity" eSuperTypes="#//AbstractXmlTypeMapping #//XmlQueryContainer #//XmlGeneratorContainer #//XmlEventMethodContainer #//XmlAttributeOverrideContainer #//XmlAssociationOverrideContainer #//v2_0/XmlEntity_2_0 #//XmlIdClassContainer">

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="table" eType="#//XmlTable"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="secondaryTables" upperBound="-1"

+        eType="#//XmlSecondaryTable" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyJoinColumns"

+        upperBound="-1" eType="#//XmlPrimaryKeyJoinColumn" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="inheritance" eType="#//Inheritance"

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

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="discriminatorColumn" eType="#//XmlDiscriminatorColumn"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="sqlResultSetMappings" upperBound="-1"

+        eType="#//SqlResultSetMapping" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultListeners"

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeSuperclassListeners"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="entityListeners" eType="#//EntityListeners"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EntityListener" eSuperTypes="#//XmlEventMethodContainer #//v2_0/XmlEntityListener_2_0">

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

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EntityListeners">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="entityListeners" upperBound="-1"

+        eType="#//EntityListener" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings" eSuperTypes="../../org.eclipse.jpt.common.core/model/common.ecore#//ERootObjectImpl #//XmlQueryContainer #//XmlAccessHolder">

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="persistenceUnitMetadata"

+        eType="#//XmlPersistenceUnitMetadata" containment="true" resolveProxies="false"/>

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

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

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceGenerators" upperBound="-1"

+        eType="#//XmlSequenceGenerator" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="tableGenerators" upperBound="-1"

+        eType="#//XmlTableGenerator" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="sqlResultSetMappings" upperBound="-1"

+        eType="#//SqlResultSetMapping" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="mappedSuperclasses" upperBound="-1"

+        eType="#//XmlMappedSuperclass" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="entities" upperBound="-1"

+        eType="#//XmlEntity" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="embeddables" upperBound="-1"

+        eType="#//XmlEmbeddable" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EntityResult">

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

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

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="fieldResults" upperBound="-1"

+        eType="#//FieldResult" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EventMethod" abstract="true" eSuperTypes="#//v2_0/XmlEventMethod_2_0">

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

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

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="prePersist" eType="#//PrePersist"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="postPersist" eType="#//PostPersist"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="preRemove" eType="#//PreRemove"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="postRemove" eType="#//PostRemove"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="preUpdate" eType="#//PreUpdate"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="postUpdate" eType="#//PostUpdate"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="postLoad" eType="#//PostLoad"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="FieldResult">

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

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

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlGeneratedValue">

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strategy" eType="#//GenerationType"

+        defaultValueLiteral="TABLE"/>

+  </eClassifiers>

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

+      eSuperTypes="#//v2_0/XmlGenerator_2_0">

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

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

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

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceGenerator" eType="#//XmlSequenceGenerator"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="tableGenerator" eType="#//XmlTableGenerator"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlId" eSuperTypes="#//AbstractXmlAttributeMapping #//ColumnMapping #//XmlConvertibleMapping #//XmlGeneratorContainer">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="generatedValue" eType="#//XmlGeneratedValue"

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

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="idClass" eType="#//XmlClassReference"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Inheritance">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strategy" eType="#//InheritanceType"

+        defaultValueLiteral="SINGLE_TABLE"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlJoinColumn" eSuperTypes="#//AbstractXmlBaseColumn #//XmlBaseJoinColumn"/>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="joinColumns" upperBound="-1"

+        eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlJoinTable" eSuperTypes="#//AbstractXmlReferenceTable">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="inverseJoinColumns" upperBound="-1"

+        eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/>

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="joinTable" eType="#//XmlJoinTable"

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

+  </eClassifiers>

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

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

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

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

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

+  </eClassifiers>

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

+      interface="true">

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass" eSuperTypes="#//AbstractXmlTypeMapping #//XmlIdClassContainer">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultListeners"

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeSuperclassListeners"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="entityListeners" eType="#//EntityListeners"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedNativeQuery" eSuperTypes="#//XmlQuery">

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

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedQuery" eSuperTypes="#//XmlQuery #//v2_0/XmlNamedQuery_2_0"/>

+  <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"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne" eSuperTypes="#//AbstractXmlSingleRelationshipMapping #//XmlMappedByMapping #//XmlPrimaryKeyJoinColumnContainer #//v2_0/XmlOneToOne_2_0"/>

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

+      eSuperTypes="#//v2_0/XmlOrderable_2_0">

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlOrderColumn" eSuperTypes="#//AbstractXmlNamedColumn #//v2_0/XmlOrderColumn_2_0"/>

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

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults" eSuperTypes="#//XmlAccessHolder #//v2_0/XmlPersistenceUnitDefaults_2_0">

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

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

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="entityListeners" eType="#//EntityListeners"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitMetadata" eSuperTypes="#//v2_0/XmlPersistenceUnitMetadata_2_0">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlMappingMetadataComplete"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="persistenceUnitDefaults"

+        eType="#//XmlPersistenceUnitDefaults" containment="true" resolveProxies="false"/>

+  </eClassifiers>

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="joinColumns" upperBound="-1"

+        eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="PostLoad" eSuperTypes="#//EventMethod"/>

+  <eClassifiers xsi:type="ecore:EClass" name="PostPersist" eSuperTypes="#//EventMethod"/>

+  <eClassifiers xsi:type="ecore:EClass" name="PostRemove" eSuperTypes="#//EventMethod"/>

+  <eClassifiers xsi:type="ecore:EClass" name="PostUpdate" eSuperTypes="#//EventMethod"/>

+  <eClassifiers xsi:type="ecore:EClass" name="PrePersist" eSuperTypes="#//EventMethod"/>

+  <eClassifiers xsi:type="ecore:EClass" name="PreRemove" eSuperTypes="#//EventMethod"/>

+  <eClassifiers xsi:type="ecore:EClass" name="PreUpdate" eSuperTypes="#//EventMethod"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlPrimaryKeyJoinColumn" eSuperTypes="#//AbstractXmlNamedColumn #//XmlBaseJoinColumn"/>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyJoinColumns"

+        upperBound="-1" eType="#//XmlPrimaryKeyJoinColumn" containment="true" resolveProxies="false"/>

+  </eClassifiers>

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

+      eSuperTypes="#//v2_0/XmlQuery_2_0">

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

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="hints" upperBound="-1"

+        eType="#//XmlQueryHint" containment="true" resolveProxies="false"/>

+  </eClassifiers>

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="namedQueries" upperBound="-1"

+        eType="#//XmlNamedQuery" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="namedNativeQueries" upperBound="-1"

+        eType="#//XmlNamedNativeQuery" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlQueryHint" eSuperTypes="#//v2_0/XmlQueryHint_2_0">

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

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlSecondaryTable" eSuperTypes="#//AbstractXmlTable">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyJoinColumns"

+        upperBound="-1" eType="#//XmlPrimaryKeyJoinColumn" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlSequenceGenerator" eSuperTypes="#//XmlGenerator #//v2_0/XmlSequenceGenerator_2_0">

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="SqlResultSetMapping" eSuperTypes="#//v2_0/XmlSqlResultSetMapping_2_0">

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="entityResults" upperBound="-1"

+        eType="#//EntityResult" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="columnResults" upperBound="-1"

+        eType="#//ColumnResult" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlTable" eSuperTypes="#//AbstractXmlTable"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlTableGenerator" eSuperTypes="#//XmlGenerator">

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

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

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

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

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

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="uniqueConstraints" upperBound="-1"

+        eType="#//XmlUniqueConstraint" containment="true" resolveProxies="false"/>

+  </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"/>

+    <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>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlUniqueConstraint" eSuperTypes="#//v2_0/XmlUniqueConstraint_2_0">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="columnNames" unique="false"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlVersion" eSuperTypes="#//AbstractXmlAttributeMapping #//ColumnMapping #//XmlConvertibleMapping"/>

+  <eClassifiers xsi:type="ecore:EEnum" name="DiscriminatorType">

+    <eLiterals name="STRING"/>

+    <eLiterals name="CHAR" value="1"/>

+    <eLiterals name="INTEGER" value="2"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="EnumType">

+    <eLiterals name="ORDINAL"/>

+    <eLiterals name="STRING" value="1"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="FetchType">

+    <eLiterals name="LAZY"/>

+    <eLiterals name="EAGER" value="1"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="GenerationType">

+    <eLiterals name="TABLE"/>

+    <eLiterals name="SEQUENCE" value="1"/>

+    <eLiterals name="IDENTITY" value="2"/>

+    <eLiterals name="AUTO" value="3"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="InheritanceType">

+    <eLiterals name="SINGLE_TABLE" literal="SINGLE_TABLE"/>

+    <eLiterals name="JOINED" value="1"/>

+    <eLiterals name="TABLE_PER_CLASS" value="2" literal="TABLE_PER_CLASS"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="TemporalType">

+    <eLiterals name="DATE"/>

+    <eLiterals name="TIME" value="1"/>

+    <eLiterals name="TIMESTAMP" value="2"/>

+  </eClassifiers>

+  <eSubpackages name="v2_0" nsURI="jpt.orm.v2_0.xmi" nsPrefix="org.eclipse.jpt.jpa.core.resource.orm.v2_0">

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

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

+      <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="XmlAttributeMapping_2_0" abstract="true"

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

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

+        interface="true">

+      <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="XmlAttributes_2_0" 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:EReference" name="elementCollections" upperBound="-1"

+          eType="#//XmlElementCollection" containment="true" resolveProxies="false"/>

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

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

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true" eSuperTypes="#//XmlConvertibleMapping #//XmlOrderable #//XmlAttributeOverrideContainer #//XmlAssociationOverrideContainer #//v2_0/XmlMapKeyAttributeOverrideContainer_2_0 #//v2_0/XmlMapKeyConvertibleMapping_2_0">

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

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="fetch" eType="#//FetchType"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKey" eType="#//MapKey"

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyClass" eType="#//XmlClassReference"

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyColumn" eType="#//XmlColumn"

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyJoinColumns" upperBound="-1"

+          eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="column" eType="#//XmlColumn"

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="collectionTable" eType="#//XmlCollectionTable"

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

+    </eClassifiers>

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

+        eSuperTypes="#//XmlAssociationOverrideContainer"/>

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

+        eSuperTypes="#//v2_0/XmlCacheable_2_0"/>

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

+        interface="true">

+      <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="XmlEventMethod_2_0" abstract="true"

+        interface="true">

+      <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="XmlGenerator_2_0" abstract="true"

+        interface="true">

+      <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_2_0" abstract="true"

+        interface="true" eSuperTypes="#//v2_0/XmlMultiRelationshipMapping_2_0"/>

+    <eClassifiers xsi:type="ecore:EClass" name="XmlMapKeyAttributeOverrideContainer_2_0"

+        abstract="true" interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyAttributeOverrides"

+          upperBound="-1" eType="#//XmlAttributeOverride" containment="true" resolveProxies="false"/>

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="mapKeyTemporal" eType="#//TemporalType"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="mapKeyEnumerated" eType="#//EnumType"/>

+    </eClassifiers>

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

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

+    </eClassifiers>

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

+        interface="true" eSuperTypes="#//v2_0/XmlOrderable_2_0 #//v2_0/XmlMapKeyAttributeOverrideContainer_2_0 #//v2_0/XmlMapKeyConvertibleMapping_2_0">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyClass" eType="#//XmlClassReference"

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyColumn" eType="#//XmlColumn"

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyJoinColumns" upperBound="-1"

+          eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/>

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="lockMode" eType="#//v2_0/LockModeType_2_0"/>

+    </eClassifiers>

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

+        interface="true" eSuperTypes="#//v2_0/XmlMultiRelationshipMapping_2_0 #//v2_0/XmlOrphanRemovable_2_0"/>

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

+        eSuperTypes="#//v2_0/XmlSingleRelationshipMapping_2_0 #//v2_0/XmlOrphanRemovable_2_0"/>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="orderColumn" eType="#//XmlOrderColumn"

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

+    </eClassifiers>

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

+        interface="true">

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

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

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults_2_0" 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="delimitedIdentifiers"

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

+    </eClassifiers>

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

+        interface="true">

+      <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="XmlQuery_2_0" abstract="true" interface="true">

+      <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="XmlQueryHint_2_0" abstract="true"

+        interface="true">

+      <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="XmlSequenceGenerator_2_0" abstract="true"

+        interface="true">

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

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

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="XmlSingleRelationshipMapping_2_0"

+        abstract="true" interface="true" eSuperTypes="#//v2_0/XmlDerivedId_2_0 #//v2_0/XmlMapsId_2_0"/>

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

+        interface="true">

+      <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="XmlUniqueConstraint_2_0" abstract="true"

+        interface="true">

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

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EEnum" name="LockModeType_2_0">

+      <eLiterals name="NONE"/>

+      <eLiterals name="READ" value="1"/>

+      <eLiterals name="WRITE" value="2"/>

+      <eLiterals name="OPTIMISTIC" value="3"/>

+      <eLiterals name="OPTIMISTIC_FORCE_INCREMENT" value="4"/>

+      <eLiterals name="PESSIMISTIC_READ" value="5"/>

+      <eLiterals name="PESSIMISTIC_WRITE" value="6"/>

+      <eLiterals name="PESSIMISTIC_FORCE_INCREMENT" value="7"/>

+    </eClassifiers>

+  </eSubpackages>

+</ecore:EPackage>

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/persistence.ecore b/jpa/plugins/org.eclipse.jpt.jpa.core/model/persistence.ecore
index aaa8f23063..5a4388baef 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/persistence.ecore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/persistence.ecore
@@ -1,84 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="persistence"
-    nsURI="jpt.persistence.xmi" nsPrefix="org.eclipse.jpt.jpa.core.resource.persistence">
-  <eClassifiers xsi:type="ecore:EClass" name="XmlJavaClassRef">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" ordered="false"
-        unique="false" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlJarFileRef">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fileName" ordered="false"
-        unique="false" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlMappingFileRef">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fileName" ordered="false"
-        unique="false" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPersistence" eSuperTypes="common.ecore#//AbstractJpaRootEObject">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="persistenceUnits" upperBound="-1"
-        eType="#//XmlPersistenceUnit" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnit" eSuperTypes="#//v2_0/XmlPersistenceUnit_2_0">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="provider" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jtaDataSource" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nonJtaDataSource" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mappingFiles" upperBound="-1"
-        eType="#//XmlMappingFileRef" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="jarFiles" upperBound="-1"
-        eType="#//XmlJarFileRef" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="classes" upperBound="-1"
-        eType="#//XmlJavaClassRef" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeUnlistedClasses"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" eType="#//XmlProperties"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="transactionType" unique="false"
-        eType="#//XmlPersistenceUnitTransactionType" defaultValueLiteral="JTA"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="XmlPersistenceUnitTransactionType">
-    <eLiterals name="JTA"/>
-    <eLiterals name="RESOURCE_LOCAL" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlProperties">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlProperty">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eSubpackages name="v2_0" nsURI="jpt.persistence.v2_0.xmi" nsPrefix="org.eclipse.jpt.jpa.core.resource.persistence.v2_0">
-    <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnit_2_0" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="sharedCacheMode" unique="false"
-          eType="#//v2_0/XmlPersistenceUnitCachingType_2_0" defaultValueLiteral="UNSPECIFIED"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="validationMode" unique="false"
-          eType="#//v2_0/XmlPersistenceUnitValidationModeType_2_0" defaultValueLiteral="AUTO"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="XmlPersistenceUnitCachingType_2_0">
-      <eLiterals name="ALL"/>
-      <eLiterals name="NONE" value="1"/>
-      <eLiterals name="ENABLE_SELECTIVE" value="2"/>
-      <eLiterals name="DISABLE_SELECTIVE" value="3"/>
-      <eLiterals name="UNSPECIFIED" value="4"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="XmlPersistenceUnitValidationModeType_2_0">
-      <eLiterals name="AUTO"/>
-      <eLiterals name="CALLBACK" value="1"/>
-      <eLiterals name="NONE" value="2"/>
-    </eClassifiers>
-  </eSubpackages>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="persistence" nsURI="jpt.persistence.xmi" nsPrefix="org.eclipse.jpt.jpa.core.resource.persistence">

+  <eClassifiers xsi:type="ecore:EClass" name="XmlJavaClassRef">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" ordered="false"

+        unique="false" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"

+        defaultValueLiteral=""/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlJarFileRef">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fileName" ordered="false"

+        unique="false" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"

+        defaultValueLiteral=""/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlMappingFileRef">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fileName" ordered="false"

+        unique="false" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"

+        defaultValueLiteral=""/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlPersistence" eSuperTypes="../../org.eclipse.jpt.common.core/model/common.ecore#//ERootObjectImpl">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="persistenceUnits" upperBound="-1"

+        eType="#//XmlPersistenceUnit" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnit" eSuperTypes="#//v2_0/XmlPersistenceUnit_2_0">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" unique="false"

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="provider" unique="false"

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jtaDataSource" unique="false"

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nonJtaDataSource" unique="false"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="mappingFiles" upperBound="-1"

+        eType="#//XmlMappingFileRef" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="jarFiles" upperBound="-1"

+        eType="#//XmlJarFileRef" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="classes" upperBound="-1"

+        eType="#//XmlJavaClassRef" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeUnlistedClasses"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" eType="#//XmlProperties"

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

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

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="transactionType" unique="false"

+        eType="#//XmlPersistenceUnitTransactionType" defaultValueLiteral="JTA"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="XmlPersistenceUnitTransactionType">

+    <eLiterals name="JTA"/>

+    <eLiterals name="RESOURCE_LOCAL" value="1"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlProperties">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"

+        eType="#//XmlProperty" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlProperty">

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

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" lowerBound="1"

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

+  </eClassifiers>

+  <eSubpackages name="v2_0" nsURI="jpt.persistence.v2_0.xmi" nsPrefix="org.eclipse.jpt.jpa.core.resource.persistence.v2_0">

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="sharedCacheMode" unique="false"

+          eType="#//v2_0/XmlPersistenceUnitCachingType_2_0" defaultValueLiteral="UNSPECIFIED"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="validationMode" unique="false"

+          eType="#//v2_0/XmlPersistenceUnitValidationModeType_2_0" defaultValueLiteral="AUTO"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EEnum" name="XmlPersistenceUnitCachingType_2_0">

+      <eLiterals name="ALL"/>

+      <eLiterals name="NONE" value="1"/>

+      <eLiterals name="ENABLE_SELECTIVE" value="2"/>

+      <eLiterals name="DISABLE_SELECTIVE" value="3"/>

+      <eLiterals name="UNSPECIFIED" value="4"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EEnum" name="XmlPersistenceUnitValidationModeType_2_0">

+      <eLiterals name="AUTO"/>

+      <eLiterals name="CALLBACK" value="1"/>

+      <eLiterals name="NONE" value="2"/>

+    </eClassifiers>

+  </eSubpackages>

+</ecore:EPackage>

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/plugin.xml b/jpa/plugins/org.eclipse.jpt.jpa.core/plugin.xml
index 7c592c960d..8b465f474b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/plugin.xml
@@ -57,7 +57,7 @@
 			class="org.eclipse.jpt.jpa.core.internal.FileAdapterFactory">
 			<adapter type="org.eclipse.jpt.jpa.core.JpaFile$Reference"/>
 			<adapter type="org.eclipse.jpt.jpa.core.JpaFile"/>
-			<adapter type="org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource"/>
+			<adapter type="org.eclipse.jpt.common.core.resource.xml.JptXmlResource"/>
 		</factory>
 
 		<!-- IResource -> JpaPlatformDescription -->
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFactory.java
index d933b204aa..7d85127312 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFactory.java
@@ -15,6 +15,7 @@ import org.eclipse.jpt.common.core.JptResourceModel;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.context.JpaRootContextNode;
 import org.eclipse.jpt.jpa.core.context.MappingFile;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
@@ -103,7 +104,6 @@ import org.eclipse.jpt.jpa.core.resource.java.SecondaryTableAnnotation;
 import org.eclipse.jpt.jpa.core.resource.java.SequenceGeneratorAnnotation;
 import org.eclipse.jpt.jpa.core.resource.java.TableGeneratorAnnotation;
 import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 
 /**
  * Use a JPA factory to build any core (e.g. {@link JpaProject})
@@ -172,7 +172,7 @@ public interface JpaFactory
 
 	// ********** XML Context Model **********
 
-	PersistenceXml buildPersistenceXml(JpaRootContextNode parent, JpaXmlResource resource);
+	PersistenceXml buildPersistenceXml(JpaRootContextNode parent, JptXmlResource resource);
 
 	MappingFile buildMappingFile(MappingFileRef parent, Object resourceMappingFile);
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
index b6f5133d9b..1e1a05bf1e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
@@ -20,13 +20,13 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceCompilationUnit;
 import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage;
 import org.eclipse.jpt.common.core.resource.java.JavaResourcePackageFragmentRoot;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceTypeCache;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.core.utility.command.JobCommand;
 import org.eclipse.jpt.common.utility.ExceptionHandler;
 import org.eclipse.jpt.common.utility.command.ExtendedCommandExecutor;
 import org.eclipse.jpt.jpa.core.context.JpaRootContextNode;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.db.Catalog;
 import org.eclipse.jpt.jpa.db.ConnectionProfile;
 import org.eclipse.jpt.jpa.db.Schema;
@@ -205,7 +205,7 @@ public interface JpaProject
 	 * @see XmlPersistence#DEFAULT_RUNTIME_PATH
 	 * @see XmlPersistence#CONTENT_TYPE
 	 */
-	JpaXmlResource getPersistenceXmlResource();
+	JptXmlResource getPersistenceXmlResource();
 	
 	/**
 	 * Return the XML resource model corresponding to the file with the specified
@@ -214,7 +214,7 @@ public interface JpaProject
 	 * 
 	 * @see org.eclipse.jpt.jpa.core.resource.ResourceMappingFile.Root#CONTENT_TYPE
 	 */
-	JpaXmlResource getMappingFileXmlResource(IPath runtimePath);
+	JptXmlResource getMappingFileXmlResource(IPath runtimePath);
 
 	/**
 	 * Return the XML resource model corresponding to the file
@@ -222,7 +222,7 @@ public interface JpaProject
 	 * 
 	 * @see XmlEntityMappings#DEFAULT_RUNTIME_PATH
 	 */
-	JpaXmlResource getDefaultOrmXmlResource();
+	JptXmlResource getDefaultOrmXmlResource();
 	
 	
 	// ********** Java resources **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlFile.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlFile.java
index 6b56be1dad..ceaff68064 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlFile.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlFile.java
@@ -9,9 +9,9 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.context;
 
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.utility.internal.Tools;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 
 /**
  * Context representation of any JPA XML file.
@@ -42,7 +42,7 @@ public interface XmlFile
 	/**
 	 * Return the resource model object
 	 */
-	JpaXmlResource getXmlResource();
+	JptXmlResource getXmlResource();
 
 	/**
 	 * Return whether the XML file's version is the latest supported by its
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaFactory.java
index dd3a9624e0..107c129ebe 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaFactory.java
@@ -15,6 +15,7 @@ import org.eclipse.jpt.common.core.JptResourceModel;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.JpaDataSource;
 import org.eclipse.jpt.jpa.core.JpaFactory;
 import org.eclipse.jpt.jpa.core.JpaFile;
@@ -160,7 +161,6 @@ import org.eclipse.jpt.jpa.core.resource.java.SecondaryTableAnnotation;
 import org.eclipse.jpt.jpa.core.resource.java.SequenceGeneratorAnnotation;
 import org.eclipse.jpt.jpa.core.resource.java.TableGeneratorAnnotation;
 import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 
 /**
  * Central class that allows extenders to easily replace implementations of
@@ -198,12 +198,12 @@ public abstract class AbstractJpaFactory
 
 	// ********** XML Context Model **********
 
-	public PersistenceXml buildPersistenceXml(JpaRootContextNode parent, JpaXmlResource resource) {
+	public PersistenceXml buildPersistenceXml(JpaRootContextNode parent, JptXmlResource resource) {
 		return new GenericPersistenceXml(parent, resource);
 	}
 	
 	public OrmXml buildMappingFile(MappingFileRef parent, Object resourceMappingFile) {
-		return new GenericOrmXml(parent, (JpaXmlResource) resourceMappingFile);
+		return new GenericOrmXml(parent, (JptXmlResource) resourceMappingFile);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
index 81c072d78b..dc139e0b5d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
@@ -57,6 +57,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage;
 import org.eclipse.jpt.common.core.resource.java.JavaResourcePackageFragmentRoot;
 import org.eclipse.jpt.common.core.resource.java.JavaResourcePackageInfoCompilationUnit;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceTypeCache;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.core.utility.command.JobCommand;
 import org.eclipse.jpt.common.core.utility.command.JobCommandExecutor;
 import org.eclipse.jpt.common.core.utility.command.NotifyingRepeatingJobCommand;
@@ -88,7 +89,6 @@ import org.eclipse.jpt.jpa.core.libprov.JpaLibraryProviderInstallOperationConfig
 import org.eclipse.jpt.jpa.core.resource.ResourceMappingFile;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.db.Catalog;
 import org.eclipse.jpt.jpa.db.ConnectionProfile;
 import org.eclipse.jpt.jpa.db.Database;
@@ -769,19 +769,19 @@ public abstract class AbstractJpaProject
 
 	// ********** XML files **********
 
-	public JpaXmlResource getPersistenceXmlResource() {
-		return (JpaXmlResource) this.getResourceModel(
+	public JptXmlResource getPersistenceXmlResource() {
+		return (JptXmlResource) this.getResourceModel(
 				XmlPersistence.DEFAULT_RUNTIME_PATH,
 				XmlPersistence.CONTENT_TYPE
 			);
 	}
 
-	public JpaXmlResource getDefaultOrmXmlResource() {
+	public JptXmlResource getDefaultOrmXmlResource() {
 		return this.getMappingFileXmlResource(XmlEntityMappings.DEFAULT_RUNTIME_PATH);
 	}
 
-	public JpaXmlResource getMappingFileXmlResource(IPath runtimePath) {
-		return (JpaXmlResource) this.getResourceModel(runtimePath, ResourceMappingFile.Root.CONTENT_TYPE);
+	public JptXmlResource getMappingFileXmlResource(IPath runtimePath) {
+		return (JptXmlResource) this.getResourceModel(runtimePath, ResourceMappingFile.Root.CONTENT_TYPE);
 	}
 
 	/**
@@ -1606,13 +1606,13 @@ public abstract class AbstractJpaProject
 		}
 
 		public void resourceModelReverted(JptResourceModel jpaResourceModel) {
-			IFile file = WorkbenchResourceHelper.getFile((JpaXmlResource)jpaResourceModel);
+			IFile file = WorkbenchResourceHelper.getFile((JptXmlResource)jpaResourceModel);
 			AbstractJpaProject.this.removeJpaFile(file);
 			AbstractJpaProject.this.addJpaFileMaybe(file);
 		}
 
 		public void resourceModelUnloaded(JptResourceModel jpaResourceModel) {
-			IFile file = WorkbenchResourceHelper.getFile((JpaXmlResource)jpaResourceModel);
+			IFile file = WorkbenchResourceHelper.getFile((JptXmlResource)jpaResourceModel);
 			AbstractJpaProject.this.removeJpaFile(file);
 			if (file.exists()) { //false if file delete caused the unload event
 				//go ahead and re-add the JPA file here, otherwise a resource change event
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/FileAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/FileAdapterFactory.java
index 4e7f0fe96b..e6f52aa453 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/FileAdapterFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/FileAdapterFactory.java
@@ -13,10 +13,10 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.jpt.common.core.JptResourceModel;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.jpa.core.JpaFile;
 import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 
 /**
  * Factory to build Dali adapters for an {@link IFile}
@@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
  * are applicable here also):<ul>
  * <li>{@link org.eclipse.jpt.jpa.core.JpaFile.Reference JpaFile.Reference}
  * <li>{@link org.eclipse.jpt.jpa.core.JpaFile JpaFile}
- * <li>{@link JpaXmlResource} -
+ * <li>{@link JptXmlResource} -
  *     Like the JPA file adapter, this adapter will only return a JPA XML
  *     resource if it is immediately available.
  *     This adapter should be used by any process that can ignore
@@ -42,7 +42,7 @@ public class FileAdapterFactory
 	private static final Class<?>[] ADAPTER_LIST = new Class[] {
 			JpaFile.Reference.class,
 			JpaFile.class,
-			JpaXmlResource.class
+			JptXmlResource.class
 		};
 
 	public Class<?>[] getAdapterList() {
@@ -63,7 +63,7 @@ public class FileAdapterFactory
 		if (adapterType == JpaFile.class) {
 			return this.getJpaFile(file);
 		}
-		if (adapterType == JpaXmlResource.class) {
+		if (adapterType == JptXmlResource.class) {
 			return this.getJpaXmlResource(file);
 		}
 		return null;
@@ -78,12 +78,12 @@ public class FileAdapterFactory
 		return (jpaProject == null) ? null : jpaProject.getJpaFile(file);
 	}
 
-	private JpaXmlResource getJpaXmlResource(IFile file) {
+	private JptXmlResource getJpaXmlResource(IFile file) {
 		JpaFile jpaFile = this.getJpaFile(file);
 		if (jpaFile != null) {
 			JptResourceModel resourceModel = jpaFile.getResourceModel();
-			if (resourceModel instanceof JpaXmlResource) {
-				return (JpaXmlResource) resourceModel;
+			if (resourceModel instanceof JptXmlResource) {
+				return (JptXmlResource) resourceModel;
 			}
 		}
 		return null;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/OrmResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/OrmResourceModelProvider.java
index 877f91a6d2..32351c3652 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/OrmResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/OrmResourceModelProvider.java
@@ -11,11 +11,11 @@ package org.eclipse.jpt.jpa.core.internal;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.JpaResourceModelProvider;
 import org.eclipse.jpt.jpa.core.internal.resource.orm.OrmXmlResourceProvider;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 
 /**
  * orm.xml
@@ -44,7 +44,7 @@ public class OrmResourceModelProvider
 		return XmlEntityMappings.CONTENT_TYPE;
 	}
 
-	public JpaXmlResource buildResourceModel(JpaProject jpaProject, IFile file) {
+	public JptXmlResource buildResourceModel(JpaProject jpaProject, IFile file) {
 		return OrmXmlResourceProvider.getXmlResourceProvider(file).getXmlResource();
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/PersistenceResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/PersistenceResourceModelProvider.java
index 54f21ed78d..de1aa42eff 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/PersistenceResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/PersistenceResourceModelProvider.java
@@ -12,11 +12,11 @@ package org.eclipse.jpt.jpa.core.internal;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.JpaResourceModelProvider;
 import org.eclipse.jpt.jpa.core.internal.resource.persistence.PersistenceXmlResourceProvider;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 
 /**
  * persistence.xml
@@ -45,7 +45,7 @@ public class PersistenceResourceModelProvider
 		return XmlPersistence.CONTENT_TYPE;
 	}
 
-	public JpaXmlResource buildResourceModel(JpaProject jpaProject, IFile file) {
+	public JptXmlResource buildResourceModel(JpaProject jpaProject, IFile file) {
 		if (! file.isSynchronized(IResource.DEPTH_ZERO)) {
 			return null;
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmBasicMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmBasicMappingDefinition.java
index c81401a6c8..5e78b078c8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmBasicMappingDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmBasicMappingDefinition.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
 import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlBasic;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 public class OrmBasicMappingDefinition
 	implements OrmAttributeMappingDefinition
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddableDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddableDefinition.java
index 44b9ef4904..950c79b4aa 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddableDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddableDefinition.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddable;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 /**
  * default ORM Embeddable provider
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedIdMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedIdMappingDefinition.java
index e9bfb0d058..23c7d75cb3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedIdMappingDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedIdMappingDefinition.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddedId;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 public class OrmEmbeddedIdMappingDefinition
 	implements OrmAttributeMappingDefinition
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedMappingDefinition.java
index 52ba65ebb9..81f2573a71 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedMappingDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedMappingDefinition.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEmbedded;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 public class OrmEmbeddedMappingDefinition
 	implements OrmAttributeMappingDefinition
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEntityDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEntityDefinition.java
index ef4931f35b..622d5e6327 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEntityDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEntityDefinition.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntity;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 /**
  * default ORM Entity provider
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmIdMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmIdMappingDefinition.java
index 41fe43dfe8..9b674fe003 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmIdMappingDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmIdMappingDefinition.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlId;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 public class OrmIdMappingDefinition
 	implements OrmAttributeMappingDefinition
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToManyMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToManyMappingDefinition.java
index 6dd27f6677..16be818a78 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToManyMappingDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToManyMappingDefinition.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 public class OrmManyToManyMappingDefinition
 	implements OrmAttributeMappingDefinition
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToOneMappingDefinition.java
index a946535aa7..f320f6ddc3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToOneMappingDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToOneMappingDefinition.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlManyToOne;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 public class OrmManyToOneMappingDefinition
 	implements OrmAttributeMappingDefinition
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmMappedSuperclassDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmMappedSuperclassDefinition.java
index e0328eb994..fa2d9cbb9b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmMappedSuperclassDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmMappedSuperclassDefinition.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlMappedSuperclass;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 /**
  * default ORM MappedSuperclass definition
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToManyMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToManyMappingDefinition.java
index d2c706113d..ee94d6b75c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToManyMappingDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToManyMappingDefinition.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 public class OrmOneToManyMappingDefinition
 	implements OrmAttributeMappingDefinition
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToOneMappingDefinition.java
index 89afa88605..3ad39690ad 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToOneMappingDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToOneMappingDefinition.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 public class OrmOneToOneMappingDefinition
 	implements OrmAttributeMappingDefinition
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTransientMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTransientMappingDefinition.java
index db06f8f7a6..8276349430 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTransientMappingDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTransientMappingDefinition.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlTransient;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 public class OrmTransientMappingDefinition
 	implements OrmAttributeMappingDefinition
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmVersionMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmVersionMappingDefinition.java
index fba29f5c25..3996a63c2e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmVersionMappingDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmVersionMappingDefinition.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlVersion;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 public class OrmVersionMappingDefinition
 	implements OrmAttributeMappingDefinition
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
index 8031f77434..acdc0b2ae0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
@@ -23,6 +23,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Ki
 import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.common.core.utility.BodySourceWriter;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.common.core.utility.jdt.TypeBinding;
@@ -68,7 +69,6 @@ import org.eclipse.jpt.jpa.core.resource.orm.Attributes;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 import org.eclipse.text.edits.DeleteEdit;
 import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractOrmXmlRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractOrmXmlRef.java
index f7cb337b80..02c5be496d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractOrmXmlRef.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractOrmXmlRef.java
@@ -11,9 +11,9 @@ package org.eclipse.jpt.jpa.core.internal.context.persistence;
 
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jpt.common.core.JptResourceType;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.context.orm.OrmXml;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 
 /**
  * <code>persistence.xml</code> file
@@ -30,7 +30,7 @@ public abstract class AbstractOrmXmlRef
 
 	@Override
 	protected OrmXml buildMappingFile() {
-		JpaXmlResource xmlResource = this.resolveResourceMappingFile();
+		JptXmlResource xmlResource = this.resolveResourceMappingFile();
 		return (xmlResource == null) ? null : this.buildMappingFile(xmlResource);
 	}
 
@@ -40,11 +40,11 @@ public abstract class AbstractOrmXmlRef
 	 * the mapping file itself (<code>orm.xml</code>).
 	 */
 	@Override
-	protected JpaXmlResource resolveResourceMappingFile() {
+	protected JptXmlResource resolveResourceMappingFile() {
 		if (this.fileName == null) {
 			return null;
 		}
-		JpaXmlResource xmlResource = this.getJpaProject().getMappingFileXmlResource(new Path(this.fileName));
+		JptXmlResource xmlResource = this.getJpaProject().getMappingFileXmlResource(new Path(this.fileName));
 		if (xmlResource == null) {
 			return null;
 		}
@@ -65,7 +65,7 @@ public abstract class AbstractOrmXmlRef
 
 	@Override
 	protected boolean mappingFileContentIsUnsupported() {
-		JpaXmlResource xmlResource = this.getJpaProject().getMappingFileXmlResource(new Path(this.fileName));
+		JptXmlResource xmlResource = this.getJpaProject().getMappingFileXmlResource(new Path(this.fileName));
 		return (xmlResource != null) && ! this.getJpaPlatform().supportsResourceType(xmlResource.getResourceType());
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java
index b838bce793..c8112546d8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java
@@ -18,6 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jpt.common.core.JptResourceType;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.utility.internal.CollectionTools;
 import org.eclipse.jpt.common.utility.internal.HashBag;
 import org.eclipse.jpt.jpa.core.JpaProject;
@@ -32,7 +33,6 @@ import org.eclipse.jpt.jpa.core.jpa2.MetamodelSynchronizer;
 import org.eclipse.jpt.jpa.core.jpa2.context.JpaRootContextNode2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceXml2_0;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jst.j2ee.model.internal.validation.ValidationCancelledException;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
@@ -90,7 +90,7 @@ public class GenericRootContextNode
 	}
 
 	protected PersistenceXml buildPersistenceXml() {
-		JpaXmlResource xmlResource = this.resolvePersistenceXmlResource();
+		JptXmlResource xmlResource = this.resolvePersistenceXmlResource();
 		return (xmlResource == null) ? null : this.buildPersistenceXml(xmlResource);
 	}
 
@@ -110,7 +110,7 @@ public class GenericRootContextNode
 	 * </ul>
 	 */
 	protected void syncPersistenceXml(boolean sync) {
-		JpaXmlResource xmlResource = this.resolvePersistenceXmlResource();
+		JptXmlResource xmlResource = this.resolvePersistenceXmlResource();
 		if (xmlResource == null) {
 			if (this.persistenceXml != null) {
 				this.persistenceXml.dispose();
@@ -129,8 +129,8 @@ public class GenericRootContextNode
 		}
 	}
 
-	protected JpaXmlResource resolvePersistenceXmlResource() {
-		JpaXmlResource xmlResource = this.jpaProject.getPersistenceXmlResource();
+	protected JptXmlResource resolvePersistenceXmlResource() {
+		JptXmlResource xmlResource = this.jpaProject.getPersistenceXmlResource();
 		if (xmlResource == null) {
 			return null;
 		}
@@ -152,7 +152,7 @@ public class GenericRootContextNode
 	/**
 	 * pre-condition: 'xmlResource' is not <code>null</code>
 	 */
-	protected PersistenceXml buildPersistenceXml(JpaXmlResource xmlResource) {
+	protected PersistenceXml buildPersistenceXml(JptXmlResource xmlResource) {
 		return this.getJpaFactory().buildPersistenceXml(this, xmlResource);
 	}
 
@@ -247,7 +247,7 @@ public class GenericRootContextNode
 		int severity = IMessage.HIGH_SEVERITY;
 		IFile file = getPlatformFile();
 		if (file != null && file.exists()) {
-			JpaXmlResource xmlResource = this.jpaProject.getPersistenceXmlResource();
+			JptXmlResource xmlResource = this.jpaProject.getPersistenceXmlResource();
 			if (xmlResource != null 
 					&& ! getJpaPlatform().supportsResourceType(xmlResource.getResourceType())) {
 				return DefaultJpaValidationMessages.buildMessage(
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistenceUnitMetadata.java
index 4a4b5d79c3..84811845d2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistenceUnitMetadata.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistenceUnitMetadata.java
@@ -9,10 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm;
 
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitMetadata;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 /**
  * <code>orm.xml</code> file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java
index 35f61e1944..5a866ec4b9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java
@@ -16,6 +16,7 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jpt.common.core.JptResourceType;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.common.utility.internal.Tools;
 import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
@@ -33,7 +34,6 @@ import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef;
 import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode;
 import org.eclipse.jpt.jpa.core.resource.ResourceMappingFile;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.text.edits.DeleteEdit;
 import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
@@ -50,7 +50,7 @@ public class GenericOrmXml
 	 * If the XML resource's content type changes, the mapping file
 	 * ref will throw out its current mapping file.
 	 */
-	protected final JpaXmlResource xmlResource;  // never null
+	protected final JptXmlResource xmlResource;  // never null
 
 	/**
 	 * The resource type will only change if the XML file's version changes
@@ -70,7 +70,7 @@ public class GenericOrmXml
 	protected EntityMappings root;
 
 
-	public GenericOrmXml(MappingFileRef parent, JpaXmlResource xmlResource) {
+	public GenericOrmXml(MappingFileRef parent, JptXmlResource xmlResource) {
 		super(parent);
 		this.checkXmlResource(xmlResource);
 		this.xmlResource = xmlResource;
@@ -211,7 +211,7 @@ public class GenericOrmXml
 
 	// ********** misc **********
 
-	protected void checkXmlResource(JpaXmlResource resource) {
+	protected void checkXmlResource(JptXmlResource resource) {
 		if (resource == null) {
 			throw new NullPointerException();
 		}
@@ -244,7 +244,7 @@ public class GenericOrmXml
 		return this;
 	}
 
-	public JpaXmlResource getXmlResource() {
+	public JptXmlResource getXmlResource() {
 		return this.xmlResource;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXml.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXml.java
index c63ec9fe0f..e8336db296 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXml.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXml.java
@@ -15,6 +15,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jpt.common.core.JptResourceType;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.jpa.core.JpaFile;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
@@ -27,7 +28,6 @@ import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages;
 import org.eclipse.jpt.jpa.core.jpa2.context.persistence.Persistence2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceXml2_0;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 
@@ -42,7 +42,7 @@ public class GenericPersistenceXml
 	 * If the XML resource's content type changes, the root context
 	 * node will throw out its current persistence XML.
 	 */
-	protected final JpaXmlResource xmlResource;  // never null
+	protected final JptXmlResource xmlResource;  // never null
 
 	/**
 	 * The resource type will only change if the XML file's version changes
@@ -56,7 +56,7 @@ public class GenericPersistenceXml
 	protected Persistence root;
 
 
-	public GenericPersistenceXml(JpaRootContextNode parent, JpaXmlResource xmlResource) {
+	public GenericPersistenceXml(JpaRootContextNode parent, JptXmlResource xmlResource) {
 		super(parent);
 		this.checkXmlResource(xmlResource);
 		this.xmlResource = xmlResource;
@@ -165,7 +165,7 @@ public class GenericPersistenceXml
 
 	// ********** misc **********
 
-	protected void checkXmlResource(JpaXmlResource resource) {
+	protected void checkXmlResource(JptXmlResource resource) {
 		if (resource == null) {
 			throw new NullPointerException();
 		}
@@ -174,7 +174,7 @@ public class GenericPersistenceXml
 		}
 	}
 
-	public JpaXmlResource getXmlResource() {
+	public JptXmlResource getXmlResource() {
 		return this.xmlResource;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmElementCollectionMapping2_0Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmElementCollectionMapping2_0Definition.java
index f92a13dc83..2709dd1cc3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmElementCollectionMapping2_0Definition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmElementCollectionMapping2_0Definition.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
@@ -19,7 +20,6 @@ import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmXml2_0ContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlElementCollection;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 
 public class OrmElementCollectionMapping2_0Definition
 	implements OrmAttributeMappingDefinition
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/AbstractJpaFileCreationOperation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/AbstractJpaFileCreationOperation.java
index bb87485034..566d6a7c7a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/AbstractJpaFileCreationOperation.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/AbstractJpaFileCreationOperation.java
@@ -25,10 +25,10 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.jpt.common.core.internal.resource.xml.AbstractJptXmlResourceProvider;
 import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
+import org.eclipse.jpt.common.core.resource.xml.JpaXmlResourceProvider;
 import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.core.internal.resource.xml.AbstractJpaXmlResourceProvider;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResourceProvider;
 import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/OrmFileCreationOperation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/OrmFileCreationOperation.java
index 65184949ba..ba4c555a3e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/OrmFileCreationOperation.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/OrmFileCreationOperation.java
@@ -20,13 +20,13 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
 import org.eclipse.jpt.common.core.resource.ProjectResourceLocator;
+import org.eclipse.jpt.common.core.resource.xml.JpaXmlResourceProvider;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef;
 import org.eclipse.jpt.jpa.core.context.persistence.Persistence;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXml;
 import org.eclipse.jpt.jpa.core.internal.resource.orm.OrmXmlResourceProvider;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResourceProvider;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
 public class OrmFileCreationOperation
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/PersistenceFileCreationOperation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/PersistenceFileCreationOperation.java
index fb8f0020c8..1b678def66 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/PersistenceFileCreationOperation.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/PersistenceFileCreationOperation.java
@@ -10,8 +10,8 @@
 package org.eclipse.jpt.jpa.core.internal.operations;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.jpt.common.core.resource.xml.JpaXmlResourceProvider;
 import org.eclipse.jpt.jpa.core.internal.resource.persistence.PersistenceXmlResourceProvider;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResourceProvider;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
 public class PersistenceFileCreationOperation
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/orm/OrmXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/orm/OrmXmlResourceProvider.java
index 760b9b71cf..8474e9dfe5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/orm/OrmXmlResourceProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/orm/OrmXmlResourceProvider.java
@@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.resource.orm;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.jpt.common.core.internal.resource.xml.AbstractJptXmlResourceProvider;
 import org.eclipse.jpt.jpa.core.internal.operations.OrmFileCreationDataModelProperties;
-import org.eclipse.jpt.jpa.core.internal.resource.xml.AbstractJpaXmlResourceProvider;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitDefaults;
@@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitMetadata;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
 public class OrmXmlResourceProvider
-	extends AbstractJpaXmlResourceProvider
+	extends AbstractJptXmlResourceProvider
 	implements OrmFileCreationDataModelProperties
 {
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/persistence/PersistenceXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/persistence/PersistenceXmlResourceProvider.java
index c0637df8a7..b9a9892c2e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/persistence/PersistenceXmlResourceProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/persistence/PersistenceXmlResourceProvider.java
@@ -12,15 +12,15 @@ package org.eclipse.jpt.jpa.core.internal.resource.persistence;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.jpt.common.core.internal.resource.xml.AbstractJptXmlResourceProvider;
 import org.eclipse.jpt.jpa.core.internal.operations.PersistenceFileCreationDataModelProperties;
-import org.eclipse.jpt.jpa.core.internal.resource.xml.AbstractJpaXmlResourceProvider;
 import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
 public class PersistenceXmlResourceProvider
-	extends AbstractJpaXmlResourceProvider
+	extends AbstractJptXmlResourceProvider
 	implements PersistenceFileCreationDataModelProperties
 {
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlAttributeMapping.java
index 60d9290ae7..c08fd376b0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlAttributeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlAttributeMapping.java
@@ -12,8 +12,8 @@ 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.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -33,7 +33,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @generated
  */
 public abstract class AbstractXmlAttributeMapping
-	extends AbstractJpaEObject
+	extends EBaseObjectImpl
 	implements XmlAttributeMapping
 {
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlBaseDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlBaseDiscriminatorColumn.java
index 613d87c8b8..dd1d0fb92c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlBaseDiscriminatorColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlBaseDiscriminatorColumn.java
@@ -10,9 +10,7 @@
 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.wst.common.internal.emf.resource.Translator;
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlNamedColumn.java
index 961b31aaaa..963912c241 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlNamedColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlNamedColumn.java
@@ -12,8 +12,8 @@ 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.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -32,7 +32,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class" abstract="true"
  * @generated
  */
-public abstract class AbstractXmlNamedColumn extends AbstractJpaEObject implements XmlNamedColumn
+public abstract class AbstractXmlNamedColumn extends EBaseObjectImpl implements XmlNamedColumn
 {
 	/**
 	 * The default value of the '{@link #getColumnDefinition() <em>Column Definition</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTable.java
index f28ddccf69..b6d29499f6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTable.java
@@ -18,9 +18,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -46,10 +46,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlTable()
  * @model kind="class" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public abstract class AbstractXmlTable extends AbstractJpaEObject implements JpaEObject
+public abstract class AbstractXmlTable extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTypeMapping.java
index fb759529b2..5f8d393c8e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTypeMapping.java
@@ -15,8 +15,8 @@ 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.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
@@ -36,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class" abstract="true"
  * @generated
  */
-public abstract class AbstractXmlTypeMapping extends AbstractJpaEObject implements XmlTypeMapping
+public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements XmlTypeMapping
 {
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Attributes.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Attributes.java
index 865b71b343..b05b20bf7e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Attributes.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Attributes.java
@@ -22,11 +22,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.utility.internal.CollectionTools;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlAttributes_2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -60,7 +60,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class Attributes extends AbstractJpaEObject implements XmlAttributes_2_0
+public class Attributes extends EBaseObjectImpl implements XmlAttributes_2_0
 {
 	/**
 	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/CascadeType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/CascadeType.java
index 9ac4f35697..8656b85198 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/CascadeType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/CascadeType.java
@@ -15,9 +15,9 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.EmptyTagBooleanTranslator;
 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_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlCascadeType_2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -46,7 +46,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class CascadeType extends AbstractJpaEObject implements XmlCascadeType_2_0
+public class CascadeType extends EBaseObjectImpl implements XmlCascadeType_2_0
 {
 	/**
 	 * The default value of the '{@link #isCascadeDetach() <em>Cascade Detach</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/ColumnMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/ColumnMapping.java
index 7d56dd107e..c5fb0765e6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/ColumnMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/ColumnMapping.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getColumnMapping()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface ColumnMapping extends JpaEObject
+public interface ColumnMapping extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Column</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/ColumnResult.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/ColumnResult.java
index 5a62b6af10..2e451b04fa 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/ColumnResult.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/ColumnResult.java
@@ -14,8 +14,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -38,10 +38,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getColumnResult()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class ColumnResult extends AbstractJpaEObject implements JpaEObject
+public class ColumnResult extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EntityListener.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EntityListener.java
index 8786a2f9e7..a8c9e6a876 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EntityListener.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EntityListener.java
@@ -16,10 +16,10 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 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_0.JPA2_0;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlEntityListener_2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -44,7 +44,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class EntityListener extends AbstractJpaEObject implements XmlEventMethodContainer, XmlEntityListener_2_0
+public class EntityListener extends EBaseObjectImpl implements XmlEventMethodContainer, XmlEntityListener_2_0
 {
 	/**
 	 * The cached value of the '{@link #getPrePersist() <em>Pre Persist</em>}' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EntityListeners.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EntityListeners.java
index 7276b96958..5993dde3d3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EntityListeners.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EntityListeners.java
@@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -42,10 +42,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEntityListeners()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class EntityListeners extends AbstractJpaEObject implements JpaEObject
+public class EntityListeners extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The cached value of the '{@link #getEntityListeners() <em>Entity Listeners</em>}' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EntityResult.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EntityResult.java
index f7548f267b..516b7238e7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EntityResult.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EntityResult.java
@@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -46,10 +46,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEntityResult()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class EntityResult extends AbstractJpaEObject implements JpaEObject
+public class EntityResult extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getDiscriminatorColumn() <em>Discriminator Column</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EventMethod.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EventMethod.java
index 8487c7b6b8..8872df4129 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EventMethod.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/EventMethod.java
@@ -12,10 +12,10 @@ 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.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlEventMethod_2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 
@@ -41,7 +41,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class" abstract="true"
  * @generated
  */
-public abstract class EventMethod extends AbstractJpaEObject implements XmlEventMethod_2_0
+public abstract class EventMethod extends EBaseObjectImpl implements XmlEventMethod_2_0
 {
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/FieldResult.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/FieldResult.java
index c180b7b96f..4a39fd443a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/FieldResult.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/FieldResult.java
@@ -14,8 +14,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -39,10 +39,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getFieldResult()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class FieldResult extends AbstractJpaEObject implements JpaEObject
+public class FieldResult extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Inheritance.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Inheritance.java
index 7e83fc41ee..9847c5ff8d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Inheritance.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Inheritance.java
@@ -14,9 +14,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -39,10 +39,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getInheritance()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class Inheritance extends AbstractJpaEObject implements JpaEObject
+public class Inheritance extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * changed this to null and removed the generated flag so emf won't generate over it
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Lob.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Lob.java
index 28f1e40433..a6f0ba64dc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Lob.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Lob.java
@@ -10,8 +10,8 @@
 package org.eclipse.jpt.jpa.core.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getLob()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class Lob extends AbstractJpaEObject implements JpaEObject
+public class Lob extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/MapKey.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/MapKey.java
index 5eec067638..c172ec5d31 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/MapKey.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/MapKey.java
@@ -14,8 +14,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -38,10 +38,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getMapKey()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class MapKey extends AbstractJpaEObject implements JpaEObject
+public class MapKey extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
index 6edb8e0d7f..7bdcdc0304 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
@@ -17,10 +17,10 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
+import org.eclipse.jpt.common.core.resource.xml.CommonPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.persistence.PersistencePackage;
 import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.PersistenceV2_0Package;
-import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -3259,7 +3259,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__VERSION = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT__VERSION;
+	public static final int XML_ENTITY_MAPPINGS__VERSION = CommonPackage.EROOT_OBJECT_IMPL__VERSION;
 
 	/**
 	 * The feature id for the '<em><b>Schema Location</b></em>' attribute.
@@ -3268,7 +3268,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__SCHEMA_LOCATION = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT__SCHEMA_LOCATION;
+	public static final int XML_ENTITY_MAPPINGS__SCHEMA_LOCATION = CommonPackage.EROOT_OBJECT_IMPL__SCHEMA_LOCATION;
 
 	/**
 	 * The feature id for the '<em><b>Named Queries</b></em>' containment reference list.
@@ -3277,7 +3277,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__NAMED_QUERIES = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 0;
+	public static final int XML_ENTITY_MAPPINGS__NAMED_QUERIES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Named Native Queries</b></em>' containment reference list.
@@ -3286,7 +3286,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 1;
+	public static final int XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Access</b></em>' attribute.
@@ -3295,7 +3295,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__ACCESS = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 2;
+	public static final int XML_ENTITY_MAPPINGS__ACCESS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -3304,7 +3304,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__DESCRIPTION = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 3;
+	public static final int XML_ENTITY_MAPPINGS__DESCRIPTION = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Persistence Unit Metadata</b></em>' containment reference.
@@ -3313,7 +3313,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 4;
+	public static final int XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>Package</b></em>' attribute.
@@ -3322,7 +3322,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__PACKAGE = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 5;
+	public static final int XML_ENTITY_MAPPINGS__PACKAGE = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>Schema</b></em>' attribute.
@@ -3331,7 +3331,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__SCHEMA = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 6;
+	public static final int XML_ENTITY_MAPPINGS__SCHEMA = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 6;
 
 	/**
 	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
@@ -3340,7 +3340,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__CATALOG = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 7;
+	public static final int XML_ENTITY_MAPPINGS__CATALOG = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 7;
 
 	/**
 	 * The feature id for the '<em><b>Sequence Generators</b></em>' containment reference list.
@@ -3349,7 +3349,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__SEQUENCE_GENERATORS = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 8;
+	public static final int XML_ENTITY_MAPPINGS__SEQUENCE_GENERATORS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>Table Generators</b></em>' containment reference list.
@@ -3358,7 +3358,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__TABLE_GENERATORS = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 9;
+	public static final int XML_ENTITY_MAPPINGS__TABLE_GENERATORS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
@@ -3367,7 +3367,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 10;
+	public static final int XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>Mapped Superclasses</b></em>' containment reference list.
@@ -3376,7 +3376,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 11;
+	public static final int XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 11;
 
 	/**
 	 * The feature id for the '<em><b>Entities</b></em>' containment reference list.
@@ -3385,7 +3385,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__ENTITIES = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 12;
+	public static final int XML_ENTITY_MAPPINGS__ENTITIES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 12;
 
 	/**
 	 * The feature id for the '<em><b>Embeddables</b></em>' containment reference list.
@@ -3394,7 +3394,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS__EMBEDDABLES = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 13;
+	public static final int XML_ENTITY_MAPPINGS__EMBEDDABLES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 13;
 
 	/**
 	 * The number of structural features of the '<em>Xml Entity Mappings</em>' class.
@@ -3403,7 +3403,7 @@ public class OrmPackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ENTITY_MAPPINGS_FEATURE_COUNT = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 14;
+	public static final int XML_ENTITY_MAPPINGS_FEATURE_COUNT = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 14;
 
 	/**
 	 * The feature id for the '<em><b>Discriminator Column</b></em>' attribute.
@@ -6665,25 +6665,23 @@ public class OrmPackage extends EPackageImpl
 		isInited = true;
 
 		// Initialize simple dependencies
+		CommonPackage.eINSTANCE.eClass();
 		EcorePackage.eINSTANCE.eClass();
 		XMLTypePackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
-		CommonPackage theCommonPackage = (CommonPackage)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
 		OrmV2_0Package theOrmV2_0Package = (OrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(OrmV2_0Package.eNS_URI) instanceof OrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(OrmV2_0Package.eNS_URI) : OrmV2_0Package.eINSTANCE);
 		PersistencePackage thePersistencePackage = (PersistencePackage)(EPackage.Registry.INSTANCE.getEPackage(PersistencePackage.eNS_URI) instanceof PersistencePackage ? EPackage.Registry.INSTANCE.getEPackage(PersistencePackage.eNS_URI) : PersistencePackage.eINSTANCE);
 		PersistenceV2_0Package thePersistenceV2_0Package = (PersistenceV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(PersistenceV2_0Package.eNS_URI) instanceof PersistenceV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(PersistenceV2_0Package.eNS_URI) : PersistenceV2_0Package.eINSTANCE);
 
 		// Create package meta-data objects
 		theOrmPackage.createPackageContents();
-		theCommonPackage.createPackageContents();
 		theOrmV2_0Package.createPackageContents();
 		thePersistencePackage.createPackageContents();
 		thePersistenceV2_0Package.createPackageContents();
 
 		// Initialize created meta-data
 		theOrmPackage.initializePackageContents();
-		theCommonPackage.initializePackageContents();
 		theOrmV2_0Package.initializePackageContents();
 		thePersistencePackage.initializePackageContents();
 		thePersistenceV2_0Package.initializePackageContents();
@@ -10422,7 +10420,7 @@ public class OrmPackage extends EPackageImpl
 		xmlEntityEClass.getESuperTypes().add(this.getXmlIdClassContainer());
 		entityListenerEClass.getESuperTypes().add(this.getXmlEventMethodContainer());
 		entityListenerEClass.getESuperTypes().add(theOrmV2_0Package.getXmlEntityListener_2_0());
-		xmlEntityMappingsEClass.getESuperTypes().add(theCommonPackage.getAbstractJpaRootEObject());
+		xmlEntityMappingsEClass.getESuperTypes().add(theCommonPackage.getERootObjectImpl());
 		xmlEntityMappingsEClass.getESuperTypes().add(this.getXmlQueryContainer());
 		xmlEntityMappingsEClass.getESuperTypes().add(this.getXmlAccessHolder());
 		eventMethodEClass.getESuperTypes().add(theOrmV2_0Package.getXmlEventMethod_2_0());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/OrmXmlResourceFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/OrmXmlResourceFactory.java
index 2ee9e17b21..6dd5624e71 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/OrmXmlResourceFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/OrmXmlResourceFactory.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.jpa.core.resource.orm;
 
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.wst.common.internal.emf.resource.Renderer;
 import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
 import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
@@ -41,6 +41,6 @@ public class OrmXmlResourceFactory
 	
 	@Override
 	protected TranslatorResource createResource(URI uri, Renderer renderer) {
-		return new JpaXmlResource(uri, renderer, XmlEntityMappings.CONTENT_TYPE, XmlEntityMappings.getRootTranslator());
+		return new JptXmlResource(uri, renderer, XmlEntityMappings.CONTENT_TYPE, XmlEntityMappings.getRootTranslator());
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/SqlResultSetMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/SqlResultSetMapping.java
index d9db475f64..3b5a694477 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/SqlResultSetMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/SqlResultSetMapping.java
@@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlSqlResultSetMapping_2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -50,7 +50,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class SqlResultSetMapping extends AbstractJpaEObject implements XmlSqlResultSetMapping_2_0
+public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResultSetMapping_2_0
 {
 	/**
 	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAccessHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAccessHolder.java
index 3a56a65a6f..cbaf007bae 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAccessHolder.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAccessHolder.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAccessHolder()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlAccessHolder extends JpaEObject
+public interface XmlAccessHolder extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Access</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverride.java
index 3ac33d4e50..b5117c4b61 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverride.java
@@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlAssociationOverride_2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -42,7 +42,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlAssociationOverride extends AbstractJpaEObject implements XmlOverride, XmlJoinColumnContainer, XmlAssociationOverride_2_0
+public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverride, XmlJoinColumnContainer, XmlAssociationOverride_2_0
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverrideContainer.java
index e708bd3f21..a701897ec5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverrideContainer.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.jpa.core.resource.orm;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAssociationOverrideContainer()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlAssociationOverrideContainer extends JpaEObject
+public interface XmlAssociationOverrideContainer extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Association Overrides</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAttributeOverride.java
index 97110e39ee..b5a8e5b475 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAttributeOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAttributeOverride.java
@@ -16,10 +16,10 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlAttributeOverride_2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -44,7 +44,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlAttributeOverride extends AbstractJpaEObject implements XmlOverride, XmlAttributeOverride_2_0
+public class XmlAttributeOverride extends EBaseObjectImpl implements XmlOverride, XmlAttributeOverride_2_0
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAttributeOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAttributeOverrideContainer.java
index db8605ea67..0ecf8f50f5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAttributeOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAttributeOverrideContainer.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.jpa.core.resource.orm;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAttributeOverrideContainer()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlAttributeOverrideContainer extends JpaEObject
+public interface XmlAttributeOverrideContainer extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Attribute Overrides</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlClassReference.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlClassReference.java
index e27127c2a2..361bd1b904 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlClassReference.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlClassReference.java
@@ -17,9 +17,9 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
@@ -37,10 +37,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlClassReference()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlClassReference extends AbstractJpaEObject implements JpaEObject
+public class XmlClassReference extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConvertibleMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConvertibleMapping.java
index c15adb817e..737f685c2f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConvertibleMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConvertibleMapping.java
@@ -9,8 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,10 +34,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvertibleMapping()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlConvertibleMapping extends JpaEObject
+public interface XmlConvertibleMapping extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Lob</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java
index fb3b0044ea..df751b99e5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java
@@ -25,11 +25,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleRootTranslator;
+import org.eclipse.jpt.common.core.resource.xml.ERootObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.common.utility.internal.CollectionTools;
 import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaRootEObject;
 import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
@@ -65,7 +65,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlEntityMappings extends AbstractJpaRootEObject implements XmlQueryContainer, XmlAccessHolder
+public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContainer, XmlAccessHolder
 {
 	/**
 	 * The cached value of the '{@link #getNamedQueries() <em>Named Queries</em>}' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEventMethodContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEventMethodContainer.java
index 9ecc87ac43..2e513073c2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEventMethodContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEventMethodContainer.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,10 +37,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEventMethodContainer()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlEventMethodContainer extends JpaEObject
+public interface XmlEventMethodContainer extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Pre Persist</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlGeneratedValue.java
index ba2ac38708..43f8028ae7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlGeneratedValue.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlGeneratedValue.java
@@ -14,9 +14,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -40,10 +40,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlGeneratedValue()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlGeneratedValue extends AbstractJpaEObject implements JpaEObject
+public class XmlGeneratedValue extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getGenerator() <em>Generator</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlGeneratorContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlGeneratorContainer.java
index cea5412ca4..e7c1795ed1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlGeneratorContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlGeneratorContainer.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -26,10 +26,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlGeneratorContainer()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlGeneratorContainer extends JpaEObject
+public interface XmlGeneratorContainer extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Sequence Generator</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlIdClassContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlIdClassContainer.java
index 9d50cfc687..41c7d741e0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlIdClassContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlIdClassContainer.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlIdClassContainer()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlIdClassContainer extends JpaEObject
+public interface XmlIdClassContainer extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Id Class</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinColumnContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinColumnContainer.java
index 811b99e9c7..4d0b6f2b34 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinColumnContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinColumnContainer.java
@@ -10,8 +10,7 @@
 package org.eclipse.jpt.jpa.core.resource.orm;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +26,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinColumnContainer()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlJoinColumnContainer extends JpaEObject
+public interface XmlJoinColumnContainer extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinTableContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinTableContainer.java
index 3199364e79..5b32ef80f8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinTableContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinTableContainer.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinTableContainer()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlJoinTableContainer extends JpaEObject
+public interface XmlJoinTableContainer extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Join Table</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlMappedByMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlMappedByMapping.java
index f1cb8c0d9f..fdd7aa3025 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlMappedByMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlMappedByMapping.java
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlMappedByMapping()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlMappedByMapping extends JpaEObject
+public interface XmlMappedByMapping extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Mapped By</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedColumn.java
index ae411ae785..1860e526cd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedColumn.java
@@ -9,8 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedColumn()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlNamedColumn extends JpaEObject
+public interface XmlNamedColumn extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Column Definition</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedNativeQuery.java
index fae596a306..dee7d40c87 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedNativeQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedNativeQuery.java
@@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -49,7 +49,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlNamedNativeQuery extends AbstractJpaEObject implements XmlQuery
+public class XmlNamedNativeQuery extends EBaseObjectImpl implements XmlQuery
 {
 	/**
 	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedQuery.java
index 61d0a7bd10..6a84f78953 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedQuery.java
@@ -21,12 +21,12 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.SimpleTextRange;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.LockModeType_2_0;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlNamedQuery_2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 
@@ -46,7 +46,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
  * @model kind="class"
  * @generated
  */
-public class XmlNamedQuery extends AbstractJpaEObject implements XmlQuery, XmlNamedQuery_2_0
+public class XmlNamedQuery extends EBaseObjectImpl implements XmlQuery, XmlNamedQuery_2_0
 {
 	/**
 	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOverride.java
index 2879591072..8622238899 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOverride.java
@@ -9,8 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -32,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOverride()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlOverride extends JpaEObject
+public interface XmlOverride extends EBaseObject
 {
 	/**
 	 * 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/XmlPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlPersistenceUnitDefaults.java
index ba54ef728f..e98bc03e42 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlPersistenceUnitDefaults.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlPersistenceUnitDefaults.java
@@ -17,11 +17,11 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.EmptyTagBooleanTranslator;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlPersistenceUnitDefaults_2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -49,7 +49,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlPersistenceUnitDefaults extends AbstractJpaEObject implements XmlAccessHolder, XmlPersistenceUnitDefaults_2_0
+public class XmlPersistenceUnitDefaults extends EBaseObjectImpl implements XmlAccessHolder, XmlPersistenceUnitDefaults_2_0
 {
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlPersistenceUnitMetadata.java
index b2617324dd..6f92ab2d09 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlPersistenceUnitMetadata.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlPersistenceUnitMetadata.java
@@ -17,10 +17,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.EmptyTagBooleanTranslator;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlPersistenceUnitMetadata_2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -46,7 +45,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlPersistenceUnitMetadata extends AbstractJpaEObject implements XmlPersistenceUnitMetadata_2_0
+public class XmlPersistenceUnitMetadata extends EBaseObjectImpl implements XmlPersistenceUnitMetadata_2_0
 {
 	/**
 	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlPrimaryKeyJoinColumnContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlPrimaryKeyJoinColumnContainer.java
index 9f23754f8c..c656b92222 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlPrimaryKeyJoinColumnContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlPrimaryKeyJoinColumnContainer.java
@@ -10,8 +10,7 @@
 package org.eclipse.jpt.jpa.core.resource.orm;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +26,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumnContainer()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlPrimaryKeyJoinColumnContainer extends JpaEObject
+public interface XmlPrimaryKeyJoinColumnContainer extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQueryContainer.java
index 12f9387dba..583e89ade4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQueryContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQueryContainer.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.jpa.core.resource.orm;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQueryContainer()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlQueryContainer extends JpaEObject
+public interface XmlQueryContainer extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Named Queries</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQueryHint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQueryHint.java
index a798b5aa55..e8d04c4931 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQueryHint.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQueryHint.java
@@ -14,10 +14,10 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 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_0.JPA2_0;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlQueryHint_2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -43,7 +43,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlQueryHint extends AbstractJpaEObject implements XmlQueryHint_2_0
+public class XmlQueryHint extends EBaseObjectImpl implements XmlQueryHint_2_0
 {
 	/**
 	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlReferenceTable.java
index 5e739e65bd..0272a18583 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlReferenceTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlReferenceTable.java
@@ -10,8 +10,7 @@
 package org.eclipse.jpt.jpa.core.resource.orm;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlReferenceTable()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlReferenceTable extends JpaEObject
+public interface XmlReferenceTable extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSequenceGenerator.java
index 7d605837a6..e9891ce975 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSequenceGenerator.java
@@ -14,10 +14,10 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlSequenceGenerator_2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -42,7 +42,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlSequenceGenerator extends AbstractJpaEObject implements XmlGenerator, XmlSequenceGenerator_2_0
+public class XmlSequenceGenerator extends EBaseObjectImpl implements XmlGenerator, XmlSequenceGenerator_2_0
 {
 	/**
 	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTableGenerator.java
index abcd7fe1fe..6140e6bb7d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTableGenerator.java
@@ -20,9 +20,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -53,7 +53,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlTableGenerator extends AbstractJpaEObject implements XmlGenerator
+public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator
 {
 	/**
 	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlUniqueConstraint.java
index e0c0106e7f..70390a6763 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlUniqueConstraint.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlUniqueConstraint.java
@@ -17,10 +17,10 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EDataTypeEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlUniqueConstraint_2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -45,7 +45,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlUniqueConstraint extends AbstractJpaEObject implements XmlUniqueConstraint_2_0
+public class XmlUniqueConstraint extends EBaseObjectImpl implements XmlUniqueConstraint_2_0
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/OrmV2_0Package.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/OrmV2_0Package.java
index 73829aed1a..602cfbfe92 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/OrmV2_0Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/OrmV2_0Package.java
@@ -17,10 +17,10 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
+import org.eclipse.jpt.common.core.resource.xml.CommonPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.persistence.PersistencePackage;
 import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.PersistenceV2_0Package;
-import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -1706,25 +1706,23 @@ public class OrmV2_0Package extends EPackageImpl
 		isInited = true;
 
 		// Initialize simple dependencies
+		CommonPackage.eINSTANCE.eClass();
 		EcorePackage.eINSTANCE.eClass();
 		XMLTypePackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
-		CommonPackage theCommonPackage = (CommonPackage)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
 		OrmPackage theOrmPackage = (OrmPackage)(EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI) instanceof OrmPackage ? EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI) : OrmPackage.eINSTANCE);
 		PersistencePackage thePersistencePackage = (PersistencePackage)(EPackage.Registry.INSTANCE.getEPackage(PersistencePackage.eNS_URI) instanceof PersistencePackage ? EPackage.Registry.INSTANCE.getEPackage(PersistencePackage.eNS_URI) : PersistencePackage.eINSTANCE);
 		PersistenceV2_0Package thePersistenceV2_0Package = (PersistenceV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(PersistenceV2_0Package.eNS_URI) instanceof PersistenceV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(PersistenceV2_0Package.eNS_URI) : PersistenceV2_0Package.eINSTANCE);
 
 		// Create package meta-data objects
 		theOrmV2_0Package.createPackageContents();
-		theCommonPackage.createPackageContents();
 		theOrmPackage.createPackageContents();
 		thePersistencePackage.createPackageContents();
 		thePersistenceV2_0Package.createPackageContents();
 
 		// Initialize created meta-data
 		theOrmV2_0Package.initializePackageContents();
-		theCommonPackage.initializePackageContents();
 		theOrmPackage.initializePackageContents();
 		thePersistencePackage.initializePackageContents();
 		thePersistenceV2_0Package.initializePackageContents();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlAttributeOverride_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlAttributeOverride_2_0.java
index 7c618f794a..e0afeb4056 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlAttributeOverride_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlAttributeOverride_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlAttributeOverride_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlAttributeOverride_2_0 extends JpaEObject
+public interface XmlAttributeOverride_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Description</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlAttributes_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlAttributes_2_0.java
index 068f755bca..e1c5f46809 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlAttributes_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlAttributes_2_0.java
@@ -12,8 +12,8 @@
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlElementCollection;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,10 +36,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlAttributes_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlAttributes_2_0 extends JpaEObject
+public interface XmlAttributes_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Description</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlCacheable_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlCacheable_2_0.java
index 6bac56d8a0..ffa6a5682e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlCacheable_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlCacheable_2_0.java
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlCacheable_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlCacheable_2_0 extends JpaEObject
+public interface XmlCacheable_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Cacheable</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlCascadeType_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlCascadeType_2_0.java
index 6ebb968679..643d64bf87 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlCascadeType_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlCascadeType_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlCascadeType_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlCascadeType_2_0 extends JpaEObject
+public interface XmlCascadeType_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Cascade Detach</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlDerivedId_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlDerivedId_2_0.java
index b70d585770..36a627611b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlDerivedId_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlDerivedId_2_0.java
@@ -11,8 +11,8 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,10 +34,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlDerivedId_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlDerivedId_2_0 extends JpaEObject
+public interface XmlDerivedId_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Id</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlEntityListener_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlEntityListener_2_0.java
index 55e1f2d449..33da87b3d2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlEntityListener_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlEntityListener_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlEntityListener_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlEntityListener_2_0 extends JpaEObject
+public interface XmlEntityListener_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Description</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlEventMethod_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlEventMethod_2_0.java
index a4659e0532..2b8fe3e4b1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlEventMethod_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlEventMethod_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlEventMethod_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlEventMethod_2_0 extends JpaEObject
+public interface XmlEventMethod_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Description</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlGenerator_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlGenerator_2_0.java
index 5eea431c28..5f23c278ec 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlGenerator_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlGenerator_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlGenerator_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlGenerator_2_0 extends JpaEObject
+public interface XmlGenerator_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Description</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapKeyAttributeOverrideContainer_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapKeyAttributeOverrideContainer_2_0.java
index e0a206e520..f17acb428a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapKeyAttributeOverrideContainer_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapKeyAttributeOverrideContainer_2_0.java
@@ -11,10 +11,8 @@
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
 import org.eclipse.emf.common.util.EList;
-
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverride;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,10 +34,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyAttributeOverrideContainer_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlMapKeyAttributeOverrideContainer_2_0 extends JpaEObject
+public interface XmlMapKeyAttributeOverrideContainer_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapKeyClass_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapKeyClass_2_0.java
index d9b7b95f82..a3cf62b0fd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapKeyClass_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapKeyClass_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyClass_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlMapKeyClass_2_0 extends JpaEObject
+public interface XmlMapKeyClass_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapKeyConvertibleMapping_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapKeyConvertibleMapping_2_0.java
index d0fe51b6ad..e743b96adf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapKeyConvertibleMapping_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapKeyConvertibleMapping_2_0.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.jpa.core.resource.orm.EnumType;
 import org.eclipse.jpt.jpa.core.resource.orm.TemporalType;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,10 +37,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyConvertibleMapping_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlMapKeyConvertibleMapping_2_0 extends JpaEObject
+public interface XmlMapKeyConvertibleMapping_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Map Key Temporal</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapsId_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapsId_2_0.java
index 1c0ea5d737..fb408050d6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapsId_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlMapsId_2_0.java
@@ -9,8 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -32,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapsId_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlMapsId_2_0 extends JpaEObject
+public interface XmlMapsId_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Maps Id</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlNamedQuery_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlNamedQuery_2_0.java
index dc0f6344be..a170799adb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlNamedQuery_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlNamedQuery_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlNamedQuery_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlNamedQuery_2_0 extends JpaEObject
+public interface XmlNamedQuery_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Lock Mode</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlOrderColumn_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlOrderColumn_2_0.java
index 6cdaf0c7b1..d9f1b29b22 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlOrderColumn_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlOrderColumn_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,10 +35,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrderColumn_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlOrderColumn_2_0 extends JpaEObject
+public interface XmlOrderColumn_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Nullable</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlOrderable_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlOrderable_2_0.java
index abd661bac4..e762f04089 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlOrderable_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlOrderable_2_0.java
@@ -10,8 +10,8 @@
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlOrderColumn;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrderable_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlOrderable_2_0 extends JpaEObject
+public interface XmlOrderable_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Order Column</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlOrphanRemovable_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlOrphanRemovable_2_0.java
index 36a8546714..38e199393c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlOrphanRemovable_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlOrphanRemovable_2_0.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrphanRemovable_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlOrphanRemovable_2_0 extends JpaEObject
+public interface XmlOrphanRemovable_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Orphan Removal</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlPersistenceUnitDefaults_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlPersistenceUnitDefaults_2_0.java
index 2e05bf1fb4..61326dfbf4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlPersistenceUnitDefaults_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlPersistenceUnitDefaults_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,10 +34,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlPersistenceUnitDefaults_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlPersistenceUnitDefaults_2_0 extends JpaEObject
+public interface XmlPersistenceUnitDefaults_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Description</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlPersistenceUnitMetadata_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlPersistenceUnitMetadata_2_0.java
index 2ac9ece061..48fcff99fd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlPersistenceUnitMetadata_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlPersistenceUnitMetadata_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlPersistenceUnitMetadata_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlPersistenceUnitMetadata_2_0 extends JpaEObject
+public interface XmlPersistenceUnitMetadata_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Description</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlQueryHint_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlQueryHint_2_0.java
index e4e68d2f8c..96d69c83c1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlQueryHint_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlQueryHint_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlQueryHint_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlQueryHint_2_0 extends JpaEObject
+public interface XmlQueryHint_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Description</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlQuery_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlQuery_2_0.java
index 3baa46238a..d96d8cb2db 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlQuery_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlQuery_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlQuery_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlQuery_2_0 extends JpaEObject
+public interface XmlQuery_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Description</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlSequenceGenerator_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlSequenceGenerator_2_0.java
index b8549701a9..336514e063 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlSequenceGenerator_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlSequenceGenerator_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,10 +34,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlSequenceGenerator_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlSequenceGenerator_2_0 extends JpaEObject
+public interface XmlSequenceGenerator_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Catalog</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlSqlResultSetMapping_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlSqlResultSetMapping_2_0.java
index b104b9b73d..d9ff32a235 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlSqlResultSetMapping_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlSqlResultSetMapping_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlSqlResultSetMapping_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlSqlResultSetMapping_2_0 extends JpaEObject
+public interface XmlSqlResultSetMapping_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Description</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlUniqueConstraint_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlUniqueConstraint_2_0.java
index 6146069012..4008ff258f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlUniqueConstraint_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/XmlUniqueConstraint_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package#getXmlUniqueConstraint_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlUniqueConstraint_2_0 extends JpaEObject
+public interface XmlUniqueConstraint_2_0 extends EBaseObject
 {
 	/**
 	 * 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/persistence/PersistencePackage.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/PersistencePackage.java
index d11527a508..e0f939e93f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/PersistencePackage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/PersistencePackage.java
@@ -19,10 +19,10 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
+import org.eclipse.jpt.common.core.resource.xml.CommonPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.PersistenceV2_0Package;
-import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -174,7 +174,7 @@ public class PersistencePackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_PERSISTENCE__VERSION = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT__VERSION;
+	public static final int XML_PERSISTENCE__VERSION = CommonPackage.EROOT_OBJECT_IMPL__VERSION;
 
 	/**
 	 * The feature id for the '<em><b>Schema Location</b></em>' attribute.
@@ -183,7 +183,7 @@ public class PersistencePackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_PERSISTENCE__SCHEMA_LOCATION = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT__SCHEMA_LOCATION;
+	public static final int XML_PERSISTENCE__SCHEMA_LOCATION = CommonPackage.EROOT_OBJECT_IMPL__SCHEMA_LOCATION;
 
 	/**
 	 * The feature id for the '<em><b>Persistence Units</b></em>' containment reference list.
@@ -192,7 +192,7 @@ public class PersistencePackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_PERSISTENCE__PERSISTENCE_UNITS = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 0;
+	public static final int XML_PERSISTENCE__PERSISTENCE_UNITS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 0;
 
 	/**
 	 * The number of structural features of the '<em>Xml Persistence</em>' class.
@@ -201,7 +201,7 @@ public class PersistencePackage extends EPackageImpl
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_PERSISTENCE_FEATURE_COUNT = CommonPackage.ABSTRACT_JPA_ROOT_EOBJECT_FEATURE_COUNT + 1;
+	public static final int XML_PERSISTENCE_FEATURE_COUNT = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 1;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}' class.
@@ -519,25 +519,23 @@ public class PersistencePackage extends EPackageImpl
 		isInited = true;
 
 		// Initialize simple dependencies
+		CommonPackage.eINSTANCE.eClass();
 		EcorePackage.eINSTANCE.eClass();
 		XMLTypePackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
-		CommonPackage theCommonPackage = (CommonPackage)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
 		OrmPackage theOrmPackage = (OrmPackage)(EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI) instanceof OrmPackage ? EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI) : OrmPackage.eINSTANCE);
 		OrmV2_0Package theOrmV2_0Package = (OrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(OrmV2_0Package.eNS_URI) instanceof OrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(OrmV2_0Package.eNS_URI) : OrmV2_0Package.eINSTANCE);
 		PersistenceV2_0Package thePersistenceV2_0Package = (PersistenceV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(PersistenceV2_0Package.eNS_URI) instanceof PersistenceV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(PersistenceV2_0Package.eNS_URI) : PersistenceV2_0Package.eINSTANCE);
 
 		// Create package meta-data objects
 		thePersistencePackage.createPackageContents();
-		theCommonPackage.createPackageContents();
 		theOrmPackage.createPackageContents();
 		theOrmV2_0Package.createPackageContents();
 		thePersistenceV2_0Package.createPackageContents();
 
 		// Initialize created meta-data
 		thePersistencePackage.initializePackageContents();
-		theCommonPackage.initializePackageContents();
 		theOrmPackage.initializePackageContents();
 		theOrmV2_0Package.initializePackageContents();
 		thePersistenceV2_0Package.initializePackageContents();
@@ -1014,7 +1012,7 @@ public class PersistencePackage extends EPackageImpl
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		xmlPersistenceEClass.getESuperTypes().add(theCommonPackage.getAbstractJpaRootEObject());
+		xmlPersistenceEClass.getESuperTypes().add(theCommonPackage.getERootObjectImpl());
 		xmlPersistenceUnitEClass.getESuperTypes().add(thePersistenceV2_0Package.getXmlPersistenceUnit_2_0());
 
 		// Initialize classes and features; add operations and parameters
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/PersistenceXmlResourceFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/PersistenceXmlResourceFactory.java
index f51b3f1c2b..301d7c4ffd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/PersistenceXmlResourceFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/PersistenceXmlResourceFactory.java
@@ -11,7 +11,7 @@
 package org.eclipse.jpt.jpa.core.resource.persistence;
 
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.wst.common.internal.emf.resource.Renderer;
 import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
 import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
@@ -46,6 +46,6 @@ public class PersistenceXmlResourceFactory extends TranslatorResourceFactory
 	 */
 	@Override
 	protected TranslatorResource createResource(URI uri, Renderer renderer) {
-		return new JpaXmlResource(uri, renderer, XmlPersistence.CONTENT_TYPE, XmlPersistence.getRootTranslator());
+		return new JptXmlResource(uri, renderer, XmlPersistence.CONTENT_TYPE, XmlPersistence.getRootTranslator());
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJarFileRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJarFileRef.java
index 262a22e9c5..d3846196fa 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJarFileRef.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJarFileRef.java
@@ -16,10 +16,10 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
@@ -38,10 +38,10 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
  *
  * @see org.eclipse.jpt.jpa.core.resource.persistence.PersistencePackage#getXmlJarFileRef()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlJarFileRef extends AbstractJpaEObject implements JpaEObject
+public class XmlJarFileRef extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getFileName() <em>File Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJavaClassRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJavaClassRef.java
index 876b169bcb..11fb18cc0a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJavaClassRef.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJavaClassRef.java
@@ -16,8 +16,8 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
@@ -41,10 +41,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.core.resource.persistence.PersistencePackage#getXmlJavaClassRef()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlJavaClassRef extends AbstractJpaEObject implements JpaEObject
+public class XmlJavaClassRef extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getJavaClass() <em>Java Class</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlMappingFileRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlMappingFileRef.java
index 42470d7f90..068a68da1e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlMappingFileRef.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlMappingFileRef.java
@@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
@@ -46,10 +46,10 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
  *
  * @see org.eclipse.jpt.jpa.core.resource.persistence.PersistencePackage#getXmlMappingFileRef()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlMappingFileRef extends AbstractJpaEObject implements JpaEObject
+public class XmlMappingFileRef extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getFileName() <em>File Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistence.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistence.java
index 635ce68ef3..bbc27da442 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistence.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistence.java
@@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleRootTranslator;
+import org.eclipse.jpt.common.core.resource.xml.ERootObjectImpl;
 import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin;
 import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.JPA2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaRootEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -49,7 +49,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlPersistence extends AbstractJpaRootEObject
+public class XmlPersistence extends ERootObjectImpl
 {
 	/**
 	 * The cached value of the '{@link #getPersistenceUnits() <em>Persistence Units</em>}' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistenceUnit.java
index 5e9b32d7ab..839632947b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistenceUnit.java
@@ -22,13 +22,13 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 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.common.utility.internal.CollectionTools;
 import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.JPA2_0;
 import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.PersistenceV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.XmlPersistenceUnitCachingType_2_0;
 import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.XmlPersistenceUnitValidationModeType_2_0;
 import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.XmlPersistenceUnit_2_0;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 
@@ -64,7 +64,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
  * @model kind="class"
  * @generated
  */
-public class XmlPersistenceUnit extends AbstractJpaEObject implements XmlPersistenceUnit_2_0
+public class XmlPersistenceUnit extends EBaseObjectImpl implements XmlPersistenceUnit_2_0
 {
 	/**
 	 * changed this to null and removed the generated flag so emf won't generate over it
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlProperties.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlProperties.java
index 6254cdafce..1d6a86c156 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlProperties.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlProperties.java
@@ -19,8 +19,8 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -43,10 +43,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.core.resource.persistence.PersistencePackage#getXmlProperties()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlProperties extends AbstractJpaEObject implements JpaEObject
+public class XmlProperties extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlProperty.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlProperty.java
index 1f5583c7a6..bdbcac6712 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlProperty.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlProperty.java
@@ -16,8 +16,8 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
@@ -42,10 +42,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.core.resource.persistence.PersistencePackage#getXmlProperty()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlProperty extends AbstractJpaEObject implements JpaEObject
+public class XmlProperty extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/v2_0/PersistenceV2_0Package.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/v2_0/PersistenceV2_0Package.java
index 6bc9f2150e..7a6081d216 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/v2_0/PersistenceV2_0Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/v2_0/PersistenceV2_0Package.java
@@ -17,10 +17,10 @@ import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.jpt.common.core.resource.xml.CommonPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.core.resource.persistence.PersistencePackage;
-import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -198,24 +198,22 @@ public class PersistenceV2_0Package extends EPackageImpl
 		isInited = true;
 
 		// Initialize simple dependencies
+		CommonPackage.eINSTANCE.eClass();
 		EcorePackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
-		CommonPackage theCommonPackage = (CommonPackage)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
 		OrmPackage theOrmPackage = (OrmPackage)(EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI) instanceof OrmPackage ? EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI) : OrmPackage.eINSTANCE);
 		OrmV2_0Package theOrmV2_0Package = (OrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(OrmV2_0Package.eNS_URI) instanceof OrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(OrmV2_0Package.eNS_URI) : OrmV2_0Package.eINSTANCE);
 		PersistencePackage thePersistencePackage = (PersistencePackage)(EPackage.Registry.INSTANCE.getEPackage(PersistencePackage.eNS_URI) instanceof PersistencePackage ? EPackage.Registry.INSTANCE.getEPackage(PersistencePackage.eNS_URI) : PersistencePackage.eINSTANCE);
 
 		// Create package meta-data objects
 		thePersistenceV2_0Package.createPackageContents();
-		theCommonPackage.createPackageContents();
 		theOrmPackage.createPackageContents();
 		theOrmV2_0Package.createPackageContents();
 		thePersistencePackage.createPackageContents();
 
 		// Initialize created meta-data
 		thePersistenceV2_0Package.initializePackageContents();
-		theCommonPackage.initializePackageContents();
 		theOrmPackage.initializePackageContents();
 		theOrmV2_0Package.initializePackageContents();
 		thePersistencePackage.initializePackageContents();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/v2_0/XmlPersistenceUnit_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/v2_0/XmlPersistenceUnit_2_0.java
index b5e85154b5..57539f05f8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/v2_0/XmlPersistenceUnit_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/v2_0/XmlPersistenceUnit_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.core.resource.persistence.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,10 +28,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.core.resource.persistence.v2_0.PersistenceV2_0Package#getXmlPersistenceUnit_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlPersistenceUnit_2_0 extends JpaEObject
+public interface XmlPersistenceUnit_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Shared Cache Mode</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel
index 4cd44d8953..ae29d850f8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel
@@ -1,688 +1,686 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jpt.jpa.eclipselink.core/src"
-    creationCommands="false" creationIcons="false" editDirectory="" editorDirectory=""
-    modelPluginID="org.eclipse.jpt.jpa.eclipselink.core" modelName="EclipseLinkCore"
-    editPluginClass="" editorPluginClass="" updateClasspath="false" rootExtendsInterface="org.eclipse.jpt.jpa.core.resource.xml.JpaEObject"
-    rootExtendsClass="org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject" suppressInterfaces="true"
-    testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel#//orm ../../org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel#//xml">
-  <foreignModel>eclipselink_orm.ecore</foreignModel>
-  <genPackages prefix="EclipseLinkOrm" basePackage="org.eclipse.jpt.jpa.eclipselink.core.resource"
-      disposableProviderFactory="true" adapterFactory="false" ecorePackage="eclipselink_orm.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//CacheCoordinationType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/SEND_OBJECT_CHANGES"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/INVALIDATE_CHANGED_OBJECTS"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/SEND_NEW_OBJECTS_WITH_CHANGES"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/NONE"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//CacheType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/FULL"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/WEAK"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/SOFT"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/SOFT_WEAK"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/HARD_WEAK"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/CACHE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/NONE"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlChangeTrackingType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/ATTRIBUTE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/OBJECT"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/DEFERRED"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/AUTO"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlDirection">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/IN"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/OUT"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/IN_OUT"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/OUT_CURSOR"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//ExistenceType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/CHECK_CACHE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/CHECK_DATABASE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/ASSUME_EXISTENCE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/ASSUME_NON_EXISTENCE"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlJoinFetchType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlJoinFetchType/INNER"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlJoinFetchType/OUTER"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlOptimisticLockingType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/ALL_COLUMNS"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/CHANGED_COLUMNS"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/SELECTED_COLUMNS"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/VERSION_COLUMN"/>
-    </genEnums>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlAccessMethods">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlAccessMethods/getMethod"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlAccessMethods/setMethod"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlAccessMethodsHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlAccessMethodsHolder/accessMethods"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlAdditionalCriteria"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlArray"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlAttributeMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlAttributeMapping/attributeType"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//Attributes">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/basicCollections"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/basicMaps"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/transformations"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/variableOneToOnes"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlBasic"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlBasicCollection"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlBasicMap"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlBatchFetch"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlBatchFetchHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlBatchFetchHolder/batchFetch"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCache">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/expiry"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/size"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/shared"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/alwaysRefresh"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/refreshOnlyIfNewer"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/disableHits"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/coordinationType"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlCache/expiryTimeOfDay"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlCacheHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlCacheHolder/cache"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCacheHolder/existenceChecking"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCacheIndex"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlChangeTracking">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlChangeTracking/type"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlChangeTrackingHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlChangeTrackingHolder/changeTracking"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCloneCopyPolicy">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCloneCopyPolicy/method"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCloneCopyPolicy/workingCopyMethod"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCollectionTable"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConversionValue">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConversionValue/dataValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConversionValue/objectValue"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConverter/className"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlConverterContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterContainer/converters"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterContainer/typeConverters"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterContainer/objectTypeConverters"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterContainer/structConverters"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConvertibleMapping">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConvertibleMapping/convert"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCopyPolicy">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCopyPolicy/class"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlCustomizer">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCustomizer/customizerClassName"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlCustomizerHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlCustomizerHolder/customizer"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlElementCollection"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEmbeddable">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddable/copyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddable/instantiationCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddable/cloneCopyPolicy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlEmbeddable/excludeDefaultMappings"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlEmbedded"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlEmbeddedId"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEntity">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/optimisticLocking"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/copyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/instantiationCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/cloneCopyPolicy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlEntity/excludeDefaultMappings"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEntityMappings"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlFetchAttribute"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlFetchGroup"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlField"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlHashPartitioning"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlId"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlIndex"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlInstantiationCopyPolicy"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlJoinFetch">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlJoinFetch/joinFetch"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlJoinField"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlJoinTable"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlManyToMany"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlManyToOne"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlMappedSuperclass">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/optimisticLocking"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/copyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/instantiationCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/cloneCopyPolicy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlMappedSuperclass/excludeDefaultMappings"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlMultitenant"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlMultitenantHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMultitenantHolder/multitenant"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlMutable">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlMutable/mutable"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlNamedConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedConverter/name"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlNamedPlsqlStoredFunctionQuery"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlNamedPlsqlStoredProcedureQuery"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlNamedStoredFunctionQuery"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/resultClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/resultSetMapping"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/procedureName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/returnsResultSet"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/hints"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/parameters"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlNoSql"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlObjectTypeConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlObjectTypeConverter/dataType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlObjectTypeConverter/objectType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlObjectTypeConverter/conversionValues"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlObjectTypeConverter/defaultObjectValue"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOneToMany"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOneToOne"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOptimisticLocking">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlOptimisticLocking/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlOptimisticLocking/cascade"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlOptimisticLocking/selectedColumns"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOrderColumn"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPartitioning"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPersistenceUnitDefaults"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPersistenceUnitMetadata">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlPersistenceUnitMetadata/excludeDefaultMappings"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPinnedPartitioning"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPlsqlRecord"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPlsqlTable"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPrimaryKey"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlPrivateOwned">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlPrivateOwned/privateOwned"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlProperty">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlProperty/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlProperty/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlProperty/valueType"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlPropertyContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlPropertyContainer/properties"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlQueryContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlQueryContainer/namedStoredProcedureQueries"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlQueryRedirectors"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlRangePartitioning"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlReadOnly">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlReadOnly/readOnly"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlReplicationPartitioning"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlReturnInsert"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlRoundRobinPartitioning"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlSecondaryTable"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStoredProcedureParameter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/direction"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/queryParameter"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/jdbcType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/jdbcTypeName"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStruct"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStructConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStructConverter/converter"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStructure"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTable"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTableGenerator"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTenantDiscriminatorColumn"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTenantTableDiscriminator"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTimeOfDay">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/hour"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/minute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/second"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/millisecond"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlTransformation"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTransient"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTypeConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTypeConverter/dataType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTypeConverter/objectType"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlTypeMapping"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlUnionPartitioning"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlUuidGenerator"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlValuePartitioning"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlVariableOneToOne">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlVariableOneToOne/targetInterface"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlVersion"/>
-    <nestedGenPackages prefix="EclipseLinkOrmV1_1" basePackage="org.eclipse.jpt.jpa.eclipselink.core.resource.orm"
-        disposableProviderFactory="true" adapterFactory="false" ecorePackage="eclipselink_orm.ecore#//v1_1">
-      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v1_1/IdValidationType_1_1">
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v1_1/IdValidationType_1_1/NULL"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v1_1/IdValidationType_1_1/ZERO"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v1_1/IdValidationType_1_1/NONE"/>
-      </genEnums>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v1_1/XmlBasic_1_1">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v1_1/XmlBasic_1_1/generatedValue"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v1_1/XmlEntity_1_1">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v1_1/XmlEntity_1_1/primaryKey"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v1_1/XmlMappedSuperclass_1_1">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v1_1/XmlMappedSuperclass_1_1/primaryKey"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v1_1/XmlPrimaryKey_1_1">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v1_1/XmlPrimaryKey_1_1/validation"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v1_1/XmlPrimaryKey_1_1/columns"/>
-      </genClasses>
-    </nestedGenPackages>
-    <nestedGenPackages prefix="EclipseLinkOrmV2_0" basePackage="org.eclipse.jpt.jpa.eclipselink.core.resource.orm"
-        disposableProviderFactory="true" adapterFactory="false" ecorePackage="eclipselink_orm.ecore#//v2_0">
-      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_0/OrderCorrectionType_2_0">
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_0/OrderCorrectionType_2_0/READ"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_0/OrderCorrectionType_2_0/READ_WRITE"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_0/OrderCorrectionType_2_0/EXCEPTION"/>
-      </genEnums>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlCollectionMapping_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlCollectionMapping_2_0/mapKeyConvert"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlElementCollection_2_0"/>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlEntity_2_0">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlEntity_2_0/cacheInterceptor"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlEntity_2_0/queryRedirectors"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlManyToMany_2_0"/>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlMapKeyAssociationOverrideContainer_2_0">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlMapKeyAssociationOverrideContainer_2_0/mapKeyAssociationOverrides"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlMappedSuperclass_2_0">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlMappedSuperclass_2_0/cacheInterceptor"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlOneToMany_2_0"/>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlOrderColumn_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlOrderColumn_2_0/correctionType"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/allQueries"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/readAll"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/readObject"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/report"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/update"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/insert"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/delete"/>
-      </genClasses>
-    </nestedGenPackages>
-    <nestedGenPackages prefix="EclipseLinkOrmV2_1" basePackage="org.eclipse.jpt.jpa.eclipselink.core.resource.orm"
-        disposableProviderFactory="true" adapterFactory="false" fileExtensions="eclipselinkormv2_1"
-        ecorePackage="eclipselink_orm.ecore#//v2_1">
-      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1">
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/ID_VALUE"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/CACHE_KEY"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/AUTO"/>
-      </genEnums>
-      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_1/BatchFetchType_2_1">
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/BatchFetchType_2_1/JOIN"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/BatchFetchType_2_1/EXISTS"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/BatchFetchType_2_1/IN"/>
-      </genEnums>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlBasic_2_1">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlBasic_2_1/returnInsert"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlBasic_2_1/returnUpdate"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlBatchFetch_2_1">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlBatchFetch_2_1/size"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlBatchFetch_2_1/batchFetchType"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlElementCollection_2_1"/>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlEntity_2_1">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlEntity_2_1/classExtractor"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlEntityMappings_2_1"/>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlFetchAttribute_2_1">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlFetchAttribute_2_1/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1/name"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1/load"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1/attributes"/>
-      </genClasses>
-      <genClasses ecoreClass="eclipselink_orm.ecore#//v2_1/XmlFetchGroupContainer_2_1">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlFetchGroupContainer_2_1/fetchGroups"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlManyToMany_2_1"/>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlManyToOne_2_1"/>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1/sqlResultSetMappings"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1/queryRedirectors"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlOneToMany_2_1"/>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlOneToOne_2_1"/>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlPersistenceUnitDefaults_2_1"/>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlPrimaryKey_2_1">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlPrimaryKey_2_1/cacheKeyType"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlReturnInsert_2_1">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlReturnInsert_2_1/returnOnly"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlTypeMapping_2_1">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlTypeMapping_2_1/parentClass"/>
-      </genClasses>
-    </nestedGenPackages>
-    <nestedGenPackages prefix="EclipseLinkOrmV2_2" basePackage="org.eclipse.jpt.jpa.eclipselink.core.resource.orm"
-        disposableProviderFactory="true" adapterFactory="false" fileExtensions="EclipseLinkOrmV2_2"
-        ecorePackage="eclipselink_orm.ecore#//v2_2">
-      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_2/CacheIsolationType">
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_2/CacheIsolationType/SHARED"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_2/CacheIsolationType/PROTECTED"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_2/CacheIsolationType/ISOLATED"/>
-      </genEnums>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlAdditionalCriteria_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlAdditionalCriteria_2_2/criteria"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlBasic_2_2">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlBasic_2_2/index"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlBasicCollection_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlBasicCollection_2_2/cascadeOnDelete"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlBasicMap_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlBasicMap_2_2/cascadeOnDelete"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlCache_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlCache_2_2/isolation"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlCollectionTable_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlCollectionTable_2_2/creationSuffix"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlElementCollection_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlElementCollection_2_2/cascadeOnDelete"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlElementCollection_2_2/noncacheable"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlEmbeddable_2_2"/>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlEntity_2_2">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntity_2_2/additionalCriteria"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlEntity_2_2/cascadeOnDelete"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntity_2_2/index"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/partitioning"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/replicationPartitioning"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/roundRobinPartitioning"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/pinnedPartitioning"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/rangePartitioning"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/valuePartitioning"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/hashPartitioning"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/unionPartitioning"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlHashPartitioning_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlHashPartitioning_2_2/name"/>
-      </genClasses>
-      <genClasses ecoreClass="eclipselink_orm.ecore#//v2_2/XmlId_2_2">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlId_2_2/index"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlIndex_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlIndex_2_2/name"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlIndex_2_2/schema"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlIndex_2_2/catalog"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlIndex_2_2/table"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlIndex_2_2/unique"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlIndex_2_2/columnNames"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlJoinTable_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlJoinTable_2_2/creationSuffix"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlManyToMany_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlManyToMany_2_2/cascadeOnDelete"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlManyToMany_2_2/nonCacheable"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlManyToOne_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlManyToOne_2_2/nonCacheable"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlMappedSuperclass_2_2">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlMappedSuperclass_2_2/additionalCriteria"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlOneToOne_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlOneToOne_2_2/cascadeOnDelete"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlOneToOne_2_2/nonCacheable"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlOneToMany_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlOneToMany_2_2/cascadeOnDelete"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlOneToMany_2_2/noncacheable"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlPartitioning_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlPartitioning_2_2/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/partitioning"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/replicationPartitioning"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/roundRobinPartitioning"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/pinnedPartitioning"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/rangePartitioning"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/valuePartitioning"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/hashPartitioning"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/unionPartitioning"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/partitioned"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlPinnedPartitioning_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlPinnedPartitioning_2_2/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlRangePartitioning_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlRangePartitioning_2_2/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlReplicationPartitioning_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlReplicationPartitioning_2_2/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlRoundRobinPartitioning_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlRoundRobinPartitioning_2_2/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlSecondaryTable_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlSecondaryTable_2_2/creationSuffix"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlTable_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlTable_2_2/creationSuffix"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlTableGenerator_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlTableGenerator_2_2/creationSuffix"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlUnionPartitioning_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlUnionPartitioning_2_2/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlValuePartitioning_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlValuePartitioning_2_2/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlVariableOneToOne_2_2">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlVariableOneToOne_2_2/nonCacheable"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlVersion_2_2">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlVersion_2_2/index"/>
-      </genClasses>
-    </nestedGenPackages>
-    <nestedGenPackages prefix="EclipseLinkOrmV2_3" basePackage="org.eclipse.jpt.jpa.eclipselink.core.resource.orm"
-        disposableProviderFactory="true" adapterFactory="false" fileExtensions="EclipselinkOrmV2_3"
-        ecorePackage="eclipselink_orm.ecore#//v2_3">
-      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_3/MultitenantType">
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_3/MultitenantType/SINGLE_TABLE"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_3/MultitenantType/TABLE_PER_TENANT"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_3/MultitenantType/VPD"/>
-      </genEnums>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlArray_2_3">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlArray_2_3/databaseType"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlArray_2_3/targetClass"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlAttributes_2_3">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlAttributes_2_3/structures"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlAttributes_2_3/arrays"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlElementCollection_2_3">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlElementCollection_2_3/compositeMember"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlEmbeddable_2_3">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEmbeddable_2_3/plsqlRecords"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEmbeddable_2_3/plsqlTables"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEmbeddable_2_3/struct"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlEntity_2_3">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntity_2_3/namedStoredFunctionQueries"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntity_2_3/namedPlsqlStoredFunctionQueries"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntity_2_3/namedPlsqlStoredProcedureQueries"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntity_2_3/plsqlRecords"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntity_2_3/plsqlTables"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntity_2_3/struct"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/tenantDiscriminatorColumns"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/namedStoredFunctionQueries"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/namedPlsqlStoredFunctionQueries"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/namedPlsqlStoredProcedureQueries"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/plsqlRecords"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/plsqlTables"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlMappedSuperclass_2_3">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlMappedSuperclass_2_3/namedStoredFunctionQueries"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlMappedSuperclass_2_3/namedPlsqlStoredFunctionQueries"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlMappedSuperclass_2_3/namedPlsqlStoredProcedureQueries"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlMappedSuperclass_2_3/plsqlRecords"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlMappedSuperclass_2_3/plsqlTables"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlMultitenant_2_3">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlMultitenant_2_3/type"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlMultitenant_2_3/tenantDiscriminatorColumns"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlNamedStoredFunctionQuery_2_3">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlNamedStoredFunctionQuery_2_3/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlPersistenceUnitDefaults_2_3">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlPersistenceUnitDefaults_2_3/tenantDiscriminatorColumns"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlPlsqlRecord_2_3">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlPlsqlRecord_2_3/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlPlsqlTable_2_3">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlPlsqlTable_2_3/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlStruct_2_3">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlStruct_2_3/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlTenantDiscriminatorColumn_2_3">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlTenantDiscriminatorColumn_2_3/contextProperty"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlTenantDiscriminatorColumn_2_3/table"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlTenantDiscriminatorColumn_2_3/primaryKey"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlStructure_2_3"/>
-    </nestedGenPackages>
-    <nestedGenPackages prefix="EclipseLinkOrmV2_4" basePackage="org.eclipse.jpt.jpa.eclipselink.core.resource.orm"
-        disposableProviderFactory="true" adapterFactory="false" fileExtensions="EclipselinkOrmV2_4"
-        ecorePackage="eclipselink_orm.ecore#//v2_4">
-      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_4/DatabaseChangeNotificationType">
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/DatabaseChangeNotificationType/NONE"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/DatabaseChangeNotificationType/INVALIDATION"/>
-      </genEnums>
-      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_4/TenantTableDiscriminatorType">
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/TenantTableDiscriminatorType/SCHEMA"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/TenantTableDiscriminatorType/SUFFIX"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/TenantTableDiscriminatorType/PREFIX"/>
-      </genEnums>
-      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_4/DataFormatType">
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/DataFormatType/XML"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/DataFormatType/INDEXED"/>
-        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/DataFormatType/MAPPED"/>
-      </genEnums>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlBasic_2_4">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlBasic_2_4/field"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlBasic_2_4/cacheIndex"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlCache_2_4">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlCache_2_4/databaseChangeNotificationType"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlCacheIndex_2_4">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlCacheIndex_2_4/columnNames"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlGeneratorContainer2_4">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlGeneratorContainer2_4/uuidGenerator"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlElementCollection_2_4">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlElementCollection_2_4/field"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlElementCollection_2_4/deleteAll"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlEmbeddable_2_4">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlEmbeddable_2_4/noSql"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlEmbedded_2_4">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlEmbedded_2_4/field"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlEntity_2_4">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlEntity_2_4/cacheIndex"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlEntity_2_4/noSql"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlEntityMappings_2_4">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlEntityMappings_2_4/uuidGenerators"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlField_2_4">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlField_2_4/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlId_2_4">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlId_2_4/field"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlId_2_4/cacheIndex"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlJoinField_2_4">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlJoinField_2_4/name"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlJoinField_2_4/referencedFieldName"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlManyToMany_2_4">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlManyToMany_2_4/joinFields"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlManyToOne_2_4">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlManyToOne_2_4/joinFields"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlMappedSuperclass_2_4">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlMappedSuperclass_2_4/cacheIndex"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlMultitenant_2_4">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlMultitenant_2_4/includeCriteria"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlMultitenant_2_4/tenantTableDiscriminator"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlNoSql_2_4">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlNoSql_2_4/dataType"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlNoSql_2_4/dataFormat"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlOneToMany_2_4">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlOneToMany_2_4/joinFields"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlOneToMany_2_4/deleteAll"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlOneToOne_2_4">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlOneToOne_2_4/joinFields"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlTenantTableDiscriminator_2_4">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlTenantTableDiscriminator_2_4/contextProperty"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlTenantTableDiscriminator_2_4/type"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlUuidGenerator_2_4"/>
-    </nestedGenPackages>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jpt.jpa.eclipselink.core/src" creationCommands="false"

+    creationIcons="false" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.jpt.jpa.eclipselink.core"

+    modelName="EclipseLinkCore" editPluginClass="" editorPluginClass="" updateClasspath="false"

+    rootExtendsInterface="org.eclipse.jpt.common.core.resource.xml.EBaseObject" rootExtendsClass="org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl"

+    suppressInterfaces="true" testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"

+    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel#//orm ../../org.eclipse.jpt.common.core/model/commonResourceModels.genmodel#//xml">

+  <foreignModel>eclipselink_orm.ecore</foreignModel>

+  <genPackages prefix="EclipseLinkOrm" basePackage="org.eclipse.jpt.jpa.eclipselink.core.resource"

+      disposableProviderFactory="true" adapterFactory="false" ecorePackage="eclipselink_orm.ecore#/">

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//CacheCoordinationType">

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/SEND_OBJECT_CHANGES"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/INVALIDATE_CHANGED_OBJECTS"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/SEND_NEW_OBJECTS_WITH_CHANGES"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/NONE"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//CacheType">

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/FULL"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/WEAK"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/SOFT"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/SOFT_WEAK"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/HARD_WEAK"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/CACHE"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/NONE"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlChangeTrackingType">

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/ATTRIBUTE"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/OBJECT"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/DEFERRED"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/AUTO"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlDirection">

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/IN"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/OUT"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/IN_OUT"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/OUT_CURSOR"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//ExistenceType">

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/CHECK_CACHE"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/CHECK_DATABASE"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/ASSUME_EXISTENCE"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/ASSUME_NON_EXISTENCE"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlJoinFetchType">

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlJoinFetchType/INNER"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlJoinFetchType/OUTER"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlOptimisticLockingType">

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/ALL_COLUMNS"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/CHANGED_COLUMNS"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/SELECTED_COLUMNS"/>

+      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/VERSION_COLUMN"/>

+    </genEnums>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlAccessMethods">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlAccessMethods/getMethod"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlAccessMethods/setMethod"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlAccessMethodsHolder">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlAccessMethodsHolder/accessMethods"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlAdditionalCriteria"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlArray"/>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlAttributeMapping">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlAttributeMapping/attributeType"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//Attributes">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/basicCollections"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/basicMaps"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/transformations"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/variableOneToOnes"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlBasic"/>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlBasicCollection"/>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlBasicMap"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlBatchFetch"/>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlBatchFetchHolder">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlBatchFetchHolder/batchFetch"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCache">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/expiry"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/size"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/shared"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/type"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/alwaysRefresh"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/refreshOnlyIfNewer"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/disableHits"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/coordinationType"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlCache/expiryTimeOfDay"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlCacheHolder">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlCacheHolder/cache"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCacheHolder/existenceChecking"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCacheIndex"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlChangeTracking">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlChangeTracking/type"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlChangeTrackingHolder">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlChangeTrackingHolder/changeTracking"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCloneCopyPolicy">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCloneCopyPolicy/method"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCloneCopyPolicy/workingCopyMethod"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCollectionTable"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConversionValue">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConversionValue/dataValue"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConversionValue/objectValue"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConverter">

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

+    </genClasses>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlConverterContainer">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterContainer/converters"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterContainer/typeConverters"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterContainer/objectTypeConverters"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterContainer/structConverters"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConvertibleMapping">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConvertibleMapping/convert"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCopyPolicy">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCopyPolicy/class"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlCustomizer">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCustomizer/customizerClassName"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlCustomizerHolder">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlCustomizerHolder/customizer"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlElementCollection"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEmbeddable">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddable/copyPolicy"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddable/instantiationCopyPolicy"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddable/cloneCopyPolicy"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlEmbeddable/excludeDefaultMappings"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlEmbedded"/>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlEmbeddedId"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEntity">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/optimisticLocking"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/copyPolicy"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/instantiationCopyPolicy"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/cloneCopyPolicy"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlEntity/excludeDefaultMappings"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEntityMappings"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlFetchAttribute"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlFetchGroup"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlField"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlHashPartitioning"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlId"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlIndex"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlInstantiationCopyPolicy"/>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlJoinFetch">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlJoinFetch/joinFetch"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlJoinField"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlJoinTable"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlManyToMany"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlManyToOne"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlMappedSuperclass">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/optimisticLocking"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/copyPolicy"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/instantiationCopyPolicy"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/cloneCopyPolicy"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlMappedSuperclass/excludeDefaultMappings"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlMultitenant"/>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlMultitenantHolder">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMultitenantHolder/multitenant"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlMutable">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlMutable/mutable"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlNamedConverter">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedConverter/name"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlNamedPlsqlStoredFunctionQuery"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlNamedPlsqlStoredProcedureQuery"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlNamedStoredFunctionQuery"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/resultClass"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/resultSetMapping"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/procedureName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/returnsResultSet"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/hints"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/parameters"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlNoSql"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlObjectTypeConverter">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlObjectTypeConverter/dataType"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlObjectTypeConverter/objectType"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlObjectTypeConverter/conversionValues"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlObjectTypeConverter/defaultObjectValue"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOneToMany"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOneToOne"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOptimisticLocking">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlOptimisticLocking/type"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlOptimisticLocking/cascade"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlOptimisticLocking/selectedColumns"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOrderColumn"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPartitioning"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPersistenceUnitDefaults"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPersistenceUnitMetadata">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlPersistenceUnitMetadata/excludeDefaultMappings"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPinnedPartitioning"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPlsqlRecord"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPlsqlTable"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPrimaryKey"/>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlPrivateOwned">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlPrivateOwned/privateOwned"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlProperty">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlProperty/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlProperty/value"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlProperty/valueType"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlPropertyContainer">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlPropertyContainer/properties"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlQueryContainer">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlQueryContainer/namedStoredProcedureQueries"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlQueryRedirectors"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlRangePartitioning"/>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlReadOnly">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlReadOnly/readOnly"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlReplicationPartitioning"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlReturnInsert"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlRoundRobinPartitioning"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlSecondaryTable"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStoredProcedureParameter">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/direction"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/queryParameter"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/type"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/jdbcType"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/jdbcTypeName"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStruct"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStructConverter">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStructConverter/converter"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStructure"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTable"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTableGenerator"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTenantDiscriminatorColumn"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTenantTableDiscriminator"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTimeOfDay">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/hour"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/minute"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/second"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/millisecond"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlTransformation"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTransient"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTypeConverter">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTypeConverter/dataType"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTypeConverter/objectType"/>

+    </genClasses>

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

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlUnionPartitioning"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlUuidGenerator"/>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlValuePartitioning"/>

+    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlVariableOneToOne">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlVariableOneToOne/targetInterface"/>

+    </genClasses>

+    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlVersion"/>

+    <nestedGenPackages prefix="EclipseLinkOrmV1_1" basePackage="org.eclipse.jpt.jpa.eclipselink.core.resource.orm"

+        disposableProviderFactory="true" adapterFactory="false" ecorePackage="eclipselink_orm.ecore#//v1_1">

+      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v1_1/IdValidationType_1_1">

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v1_1/IdValidationType_1_1/NULL"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v1_1/IdValidationType_1_1/ZERO"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v1_1/IdValidationType_1_1/NONE"/>

+      </genEnums>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v1_1/XmlBasic_1_1">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v1_1/XmlBasic_1_1/generatedValue"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v1_1/XmlEntity_1_1">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v1_1/XmlEntity_1_1/primaryKey"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v1_1/XmlMappedSuperclass_1_1">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v1_1/XmlMappedSuperclass_1_1/primaryKey"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v1_1/XmlPrimaryKey_1_1">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v1_1/XmlPrimaryKey_1_1/validation"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v1_1/XmlPrimaryKey_1_1/columns"/>

+      </genClasses>

+    </nestedGenPackages>

+    <nestedGenPackages prefix="EclipseLinkOrmV2_0" basePackage="org.eclipse.jpt.jpa.eclipselink.core.resource.orm"

+        disposableProviderFactory="true" adapterFactory="false" ecorePackage="eclipselink_orm.ecore#//v2_0">

+      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_0/OrderCorrectionType_2_0">

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_0/OrderCorrectionType_2_0/READ"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_0/OrderCorrectionType_2_0/READ_WRITE"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_0/OrderCorrectionType_2_0/EXCEPTION"/>

+      </genEnums>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlCollectionMapping_2_0">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlCollectionMapping_2_0/mapKeyConvert"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlElementCollection_2_0"/>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlEntity_2_0">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlEntity_2_0/cacheInterceptor"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlEntity_2_0/queryRedirectors"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlManyToMany_2_0"/>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlMapKeyAssociationOverrideContainer_2_0">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlMapKeyAssociationOverrideContainer_2_0/mapKeyAssociationOverrides"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlMappedSuperclass_2_0">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlMappedSuperclass_2_0/cacheInterceptor"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlOneToMany_2_0"/>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlOrderColumn_2_0">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlOrderColumn_2_0/correctionType"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/allQueries"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/readAll"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/readObject"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/report"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/update"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/insert"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/delete"/>

+      </genClasses>

+    </nestedGenPackages>

+    <nestedGenPackages prefix="EclipseLinkOrmV2_1" basePackage="org.eclipse.jpt.jpa.eclipselink.core.resource.orm"

+        disposableProviderFactory="true" adapterFactory="false" fileExtensions="eclipselinkormv2_1"

+        ecorePackage="eclipselink_orm.ecore#//v2_1">

+      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1">

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/ID_VALUE"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/CACHE_KEY"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/AUTO"/>

+      </genEnums>

+      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_1/BatchFetchType_2_1">

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/BatchFetchType_2_1/JOIN"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/BatchFetchType_2_1/EXISTS"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/BatchFetchType_2_1/IN"/>

+      </genEnums>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlBasic_2_1">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlBasic_2_1/returnInsert"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlBasic_2_1/returnUpdate"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlBatchFetch_2_1">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlBatchFetch_2_1/size"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlBatchFetch_2_1/batchFetchType"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlElementCollection_2_1"/>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlEntity_2_1">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlEntity_2_1/classExtractor"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlEntityMappings_2_1"/>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlFetchAttribute_2_1">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlFetchAttribute_2_1/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1/name"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1/load"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1/attributes"/>

+      </genClasses>

+      <genClasses ecoreClass="eclipselink_orm.ecore#//v2_1/XmlFetchGroupContainer_2_1">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlFetchGroupContainer_2_1/fetchGroups"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlManyToMany_2_1"/>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlManyToOne_2_1"/>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1/sqlResultSetMappings"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1/queryRedirectors"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlOneToMany_2_1"/>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlOneToOne_2_1"/>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlPersistenceUnitDefaults_2_1"/>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlPrimaryKey_2_1">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlPrimaryKey_2_1/cacheKeyType"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlReturnInsert_2_1">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlReturnInsert_2_1/returnOnly"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlTypeMapping_2_1">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlTypeMapping_2_1/parentClass"/>

+      </genClasses>

+    </nestedGenPackages>

+    <nestedGenPackages prefix="EclipseLinkOrmV2_2" basePackage="org.eclipse.jpt.jpa.eclipselink.core.resource.orm"

+        disposableProviderFactory="true" adapterFactory="false" fileExtensions="EclipseLinkOrmV2_2"

+        ecorePackage="eclipselink_orm.ecore#//v2_2">

+      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_2/CacheIsolationType">

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_2/CacheIsolationType/SHARED"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_2/CacheIsolationType/PROTECTED"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_2/CacheIsolationType/ISOLATED"/>

+      </genEnums>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlAdditionalCriteria_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlAdditionalCriteria_2_2/criteria"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlBasic_2_2">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlBasic_2_2/index"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlBasicCollection_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlBasicCollection_2_2/cascadeOnDelete"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlBasicMap_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlBasicMap_2_2/cascadeOnDelete"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlCache_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlCache_2_2/isolation"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlCollectionTable_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlCollectionTable_2_2/creationSuffix"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlElementCollection_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlElementCollection_2_2/cascadeOnDelete"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlElementCollection_2_2/noncacheable"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlEmbeddable_2_2"/>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlEntity_2_2">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntity_2_2/additionalCriteria"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlEntity_2_2/cascadeOnDelete"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntity_2_2/index"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/partitioning"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/replicationPartitioning"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/roundRobinPartitioning"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/pinnedPartitioning"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/rangePartitioning"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/valuePartitioning"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/hashPartitioning"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlEntityMappings_2_2/unionPartitioning"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlHashPartitioning_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlHashPartitioning_2_2/name"/>

+      </genClasses>

+      <genClasses ecoreClass="eclipselink_orm.ecore#//v2_2/XmlId_2_2">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlId_2_2/index"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlIndex_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlIndex_2_2/name"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlIndex_2_2/schema"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlIndex_2_2/catalog"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlIndex_2_2/table"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlIndex_2_2/unique"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlIndex_2_2/columnNames"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlJoinTable_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlJoinTable_2_2/creationSuffix"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlManyToMany_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlManyToMany_2_2/cascadeOnDelete"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlManyToMany_2_2/nonCacheable"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlManyToOne_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlManyToOne_2_2/nonCacheable"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlMappedSuperclass_2_2">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlMappedSuperclass_2_2/additionalCriteria"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlOneToOne_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlOneToOne_2_2/cascadeOnDelete"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlOneToOne_2_2/nonCacheable"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlOneToMany_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlOneToMany_2_2/cascadeOnDelete"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlOneToMany_2_2/noncacheable"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlPartitioning_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlPartitioning_2_2/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/partitioning"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/replicationPartitioning"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/roundRobinPartitioning"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/pinnedPartitioning"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/rangePartitioning"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/valuePartitioning"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/hashPartitioning"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/unionPartitioning"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlPartitioningGroup_2_2/partitioned"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlPinnedPartitioning_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlPinnedPartitioning_2_2/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlRangePartitioning_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlRangePartitioning_2_2/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlReplicationPartitioning_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlReplicationPartitioning_2_2/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlRoundRobinPartitioning_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlRoundRobinPartitioning_2_2/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlSecondaryTable_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlSecondaryTable_2_2/creationSuffix"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlTable_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlTable_2_2/creationSuffix"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlTableGenerator_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlTableGenerator_2_2/creationSuffix"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlUnionPartitioning_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlUnionPartitioning_2_2/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlValuePartitioning_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlValuePartitioning_2_2/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlVariableOneToOne_2_2">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_2/XmlVariableOneToOne_2_2/nonCacheable"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_2/XmlVersion_2_2">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_2/XmlVersion_2_2/index"/>

+      </genClasses>

+    </nestedGenPackages>

+    <nestedGenPackages prefix="EclipseLinkOrmV2_3" basePackage="org.eclipse.jpt.jpa.eclipselink.core.resource.orm"

+        disposableProviderFactory="true" adapterFactory="false" fileExtensions="EclipselinkOrmV2_3"

+        ecorePackage="eclipselink_orm.ecore#//v2_3">

+      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_3/MultitenantType">

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_3/MultitenantType/SINGLE_TABLE"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_3/MultitenantType/TABLE_PER_TENANT"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_3/MultitenantType/VPD"/>

+      </genEnums>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlArray_2_3">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlArray_2_3/databaseType"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlArray_2_3/targetClass"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlAttributes_2_3">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlAttributes_2_3/structures"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlAttributes_2_3/arrays"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlElementCollection_2_3">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlElementCollection_2_3/compositeMember"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlEmbeddable_2_3">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEmbeddable_2_3/plsqlRecords"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEmbeddable_2_3/plsqlTables"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEmbeddable_2_3/struct"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlEntity_2_3">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntity_2_3/namedStoredFunctionQueries"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntity_2_3/namedPlsqlStoredFunctionQueries"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntity_2_3/namedPlsqlStoredProcedureQueries"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntity_2_3/plsqlRecords"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntity_2_3/plsqlTables"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntity_2_3/struct"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/tenantDiscriminatorColumns"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/namedStoredFunctionQueries"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/namedPlsqlStoredFunctionQueries"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/namedPlsqlStoredProcedureQueries"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/plsqlRecords"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/plsqlTables"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlMappedSuperclass_2_3">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlMappedSuperclass_2_3/namedStoredFunctionQueries"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlMappedSuperclass_2_3/namedPlsqlStoredFunctionQueries"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlMappedSuperclass_2_3/namedPlsqlStoredProcedureQueries"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlMappedSuperclass_2_3/plsqlRecords"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlMappedSuperclass_2_3/plsqlTables"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlMultitenant_2_3">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlMultitenant_2_3/type"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlMultitenant_2_3/tenantDiscriminatorColumns"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlNamedStoredFunctionQuery_2_3">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlNamedStoredFunctionQuery_2_3/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlPersistenceUnitDefaults_2_3">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlPersistenceUnitDefaults_2_3/tenantDiscriminatorColumns"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlPlsqlRecord_2_3">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlPlsqlRecord_2_3/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlPlsqlTable_2_3">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlPlsqlTable_2_3/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlStruct_2_3">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlStruct_2_3/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlTenantDiscriminatorColumn_2_3">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlTenantDiscriminatorColumn_2_3/contextProperty"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlTenantDiscriminatorColumn_2_3/table"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_3/XmlTenantDiscriminatorColumn_2_3/primaryKey"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlStructure_2_3"/>

+    </nestedGenPackages>

+    <nestedGenPackages prefix="EclipseLinkOrmV2_4" basePackage="org.eclipse.jpt.jpa.eclipselink.core.resource.orm"

+        disposableProviderFactory="true" adapterFactory="false" fileExtensions="EclipselinkOrmV2_4"

+        ecorePackage="eclipselink_orm.ecore#//v2_4">

+      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_4/DatabaseChangeNotificationType">

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/DatabaseChangeNotificationType/NONE"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/DatabaseChangeNotificationType/INVALIDATION"/>

+      </genEnums>

+      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_4/TenantTableDiscriminatorType">

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/TenantTableDiscriminatorType/SCHEMA"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/TenantTableDiscriminatorType/SUFFIX"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/TenantTableDiscriminatorType/PREFIX"/>

+      </genEnums>

+      <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_4/DataFormatType">

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/DataFormatType/XML"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/DataFormatType/INDEXED"/>

+        <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_4/DataFormatType/MAPPED"/>

+      </genEnums>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlBasic_2_4">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlBasic_2_4/field"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlBasic_2_4/cacheIndex"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlCache_2_4">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlCache_2_4/databaseChangeNotificationType"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlCacheIndex_2_4">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlCacheIndex_2_4/columnNames"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlGeneratorContainer2_4">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlGeneratorContainer2_4/uuidGenerator"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlElementCollection_2_4">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlElementCollection_2_4/field"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlElementCollection_2_4/deleteAll"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlEmbeddable_2_4">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlEmbeddable_2_4/noSql"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlEmbedded_2_4">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlEmbedded_2_4/field"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlEntity_2_4">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlEntity_2_4/cacheIndex"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlEntity_2_4/noSql"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlEntityMappings_2_4">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlEntityMappings_2_4/uuidGenerators"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlField_2_4">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlField_2_4/name"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlId_2_4">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlId_2_4/field"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlId_2_4/cacheIndex"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlJoinField_2_4">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlJoinField_2_4/name"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlJoinField_2_4/referencedFieldName"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlManyToMany_2_4">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlManyToMany_2_4/joinFields"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlManyToOne_2_4">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlManyToOne_2_4/joinFields"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlMappedSuperclass_2_4">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlMappedSuperclass_2_4/cacheIndex"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlMultitenant_2_4">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlMultitenant_2_4/includeCriteria"/>

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlMultitenant_2_4/tenantTableDiscriminator"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlNoSql_2_4">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlNoSql_2_4/dataType"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlNoSql_2_4/dataFormat"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlOneToMany_2_4">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlOneToMany_2_4/joinFields"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlOneToMany_2_4/deleteAll"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlOneToOne_2_4">

+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_4/XmlOneToOne_2_4/joinFields"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlTenantTableDiscriminator_2_4">

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlTenantTableDiscriminator_2_4/contextProperty"/>

+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_4/XmlTenantTableDiscriminator_2_4/type"/>

+      </genClasses>

+      <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_4/XmlUuidGenerator_2_4"/>

+    </nestedGenPackages>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore
index 720922cc7e..c19f507b3d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore
@@ -1,890 +1,888 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="orm"
-    nsURI="jpt.eclipselink.orm.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm">
-  <eClassifiers xsi:type="ecore:EClass" name="XmlAccessMethods">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="getMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="setMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlAccessMethodsHolder" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="accessMethods" eType="#//XmlAccessMethods"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlAdditionalCriteria" eSuperTypes="#//v2_2/XmlAdditionalCriteria_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlArray" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping #//v2_3/XmlArray_2_3 #//XmlConvertibleMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlAttributeMapping" abstract="true"
-      interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlAttributeMapping #//XmlAccessMethodsHolder #//XmlPropertyContainer">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Attributes" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//Attributes #//v2_3/XmlAttributes_2_3">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="basicCollections" upperBound="-1"
-        eType="#//XmlBasicCollection" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="basicMaps" upperBound="-1"
-        eType="#//XmlBasicMap" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="transformations" upperBound="-1"
-        eType="#//XmlTransformation" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variableOneToOnes" upperBound="-1"
-        eType="#//XmlVariableOneToOne" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasic" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlBasic #//v1_1/XmlBasic_1_1 #//v2_1/XmlBasic_2_1 #//v2_2/XmlBasic_2_2 #//v2_4/XmlBasic_2_4 #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping #//XmlConverterContainer"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasicCollection" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping #//v2_2/XmlBasicCollection_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasicMap" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping #//v2_2/XmlBasicMap_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBatchFetch" eSuperTypes="#//v2_1/XmlBatchFetch_2_1"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBatchFetchHolder" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="batchFetch" eType="#//XmlBatchFetch"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCache" eSuperTypes="#//v2_2/XmlCache_2_2 #//v2_4/XmlCache_2_4">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="expiry" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="size" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="shared" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//CacheType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alwaysRefresh" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="refreshOnlyIfNewer" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="disableHits" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="coordinationType" eType="#//CacheCoordinationType"
-        defaultValueLiteral=""/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="expiryTimeOfDay" eType="#//XmlTimeOfDay"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCacheHolder" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cache" eType="#//XmlCache"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="existenceChecking" eType="#//ExistenceType"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCacheIndex" eSuperTypes="#//v2_4/XmlCacheIndex_2_4"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlChangeTracking">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//XmlChangeTrackingType"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlChangeTrackingHolder" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="changeTracking" eType="#//XmlChangeTracking"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCloneCopyPolicy">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="method" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workingCopyMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCollectionTable" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlCollectionTable #//v2_2/XmlCollectionTable_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlConversionValue">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataValue" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectValue" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlConverter" eSuperTypes="#//XmlNamedConverter">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlConverterContainer" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="converters" upperBound="-1"
-        eType="#//XmlConverter" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="typeConverters" upperBound="-1"
-        eType="#//XmlTypeConverter" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="objectTypeConverters" upperBound="-1"
-        eType="#//XmlObjectTypeConverter" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="structConverters" upperBound="-1"
-        eType="#//XmlStructConverter" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlConvertibleMapping" abstract="true"
-      interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlConvertibleMapping">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="convert" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCopyPolicy">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="class" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCustomizer">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="customizerClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCustomizerHolder" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="customizer" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlClassReference"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlElementCollection #//v2_0/XmlElementCollection_2_0 #//v2_1/XmlElementCollection_2_1 #//v2_2/XmlElementCollection_2_2 #//v2_3/XmlElementCollection_2_3 #//v2_4/XmlElementCollection_2_4"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlEmbeddable #//XmlTypeMapping #//v2_2/XmlEmbeddable_2_2 #//v2_3/XmlEmbeddable_2_3 #//v2_4/XmlEmbeddable_2_4 #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlConverterContainer #//XmlPropertyContainer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="copyPolicy" eType="#//XmlCopyPolicy"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="instantiationCopyPolicy"
-        eType="#//XmlInstantiationCopyPolicy" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cloneCopyPolicy" eType="#//XmlCloneCopyPolicy"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlEmbedded #//v2_4/XmlEmbedded_2_4 #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedId" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlEmbeddedId #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEntity" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlEntity #//XmlTypeMapping #//v1_1/XmlEntity_1_1 #//v2_0/XmlEntity_2_0 #//v2_1/XmlEntity_2_1 #//v2_2/XmlEntity_2_2 #//v2_3/XmlEntity_2_3 #//v2_4/XmlEntity_2_4 #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConverterContainer #//XmlQueryContainer #//XmlPropertyContainer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="optimisticLocking" eType="#//XmlOptimisticLocking"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="copyPolicy" eType="#//XmlCopyPolicy"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="instantiationCopyPolicy"
-        eType="#//XmlInstantiationCopyPolicy" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cloneCopyPolicy" eType="#//XmlCloneCopyPolicy"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlEntityMappings #//v2_1/XmlEntityMappings_2_1 #//v2_2/XmlEntityMappings_2_2 #//v2_3/XmlEntityMappings_2_3 #//v2_4/XmlEntityMappings_2_4 #//XmlConverterContainer #//XmlQueryContainer"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlFetchAttribute" eSuperTypes="#//v2_1/XmlFetchAttribute_2_1"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlFetchGroup" eSuperTypes="#//v2_1/XmlFetchGroup_2_1"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlField" eSuperTypes="#//v2_4/XmlField_2_4"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlHashPartitioning" eSuperTypes="#//v2_2/XmlHashPartitioning_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlId" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlId #//v2_2/XmlId_2_2 #//v2_4/XmlId_2_4 #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping #//XmlConverterContainer"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlIndex" eSuperTypes="#//v2_2/XmlIndex_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlInstantiationCopyPolicy"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlJoinFetch" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="joinFetch" eType="#//XmlJoinFetchType"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlJoinField" eSuperTypes="#//v2_4/XmlJoinField_2_4"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlJoinTable" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlJoinTable #//v2_2/XmlJoinTable_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlManyToMany #//v2_0/XmlManyToMany_2_0 #//v2_1/XmlManyToMany_2_1 #//v2_2/XmlManyToMany_2_2 #//v2_4/XmlManyToMany_2_4 #//XmlAttributeMapping #//XmlJoinFetch"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlManyToOne #//v2_1/XmlManyToOne_2_1 #//v2_2/XmlManyToOne_2_2 #//v2_4/XmlManyToOne_2_4 #//XmlAttributeMapping #//XmlJoinFetch"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlMappedSuperclass #//XmlTypeMapping #//v1_1/XmlMappedSuperclass_1_1 #//v2_0/XmlMappedSuperclass_2_0 #//v2_1/XmlMappedSuperclass_2_1 #//v2_2/XmlMappedSuperclass_2_2 #//v2_3/XmlMappedSuperclass_2_3 #//v2_4/XmlMappedSuperclass_2_4 #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConverterContainer #//XmlPropertyContainer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="optimisticLocking" eType="#//XmlOptimisticLocking"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="copyPolicy" eType="#//XmlCopyPolicy"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="instantiationCopyPolicy"
-        eType="#//XmlInstantiationCopyPolicy" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cloneCopyPolicy" eType="#//XmlCloneCopyPolicy"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlMultitenant" eSuperTypes="#//v2_3/XmlMultitenant_2_3 #//v2_4/XmlMultitenant_2_4"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlMultitenantHolder" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="multitenant" eType="#//XmlMultitenant"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlMutable" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mutable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedConverter">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedPlsqlStoredFunctionQuery" eSuperTypes="#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedPlsqlStoredProcedureQuery" eSuperTypes="#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedStoredFunctionQuery" eSuperTypes="#//v2_3/XmlNamedStoredFunctionQuery_2_3"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedStoredProcedureQuery">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resultClass" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resultSetMapping" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="procedureName" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="returnsResultSet" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="hints" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlQueryHint"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
-        eType="#//XmlStoredProcedureParameter" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlNoSql" eSuperTypes="#//v2_4/XmlNoSql_2_4"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlObjectTypeConverter" eSuperTypes="#//XmlNamedConverter">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="conversionValues" upperBound="-1"
-        eType="#//XmlConversionValue" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultObjectValue" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlOneToMany #//v2_0/XmlOneToMany_2_0 #//v2_1/XmlOneToMany_2_1 #//v2_2/XmlOneToMany_2_2 #//v2_4/XmlOneToMany_2_4 #//XmlAttributeMapping #//XmlPrivateOwned #//XmlJoinFetch"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlOneToOne #//v2_1/XmlOneToOne_2_1 #//v2_2/XmlOneToOne_2_2 #//v2_4/XmlOneToOne_2_4 #//XmlAttributeMapping #//XmlPrivateOwned #//XmlJoinFetch"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOptimisticLocking">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//XmlOptimisticLockingType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascade" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="selectedColumns" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlColumn"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOrderColumn" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlOrderColumn #//v2_0/XmlOrderColumn_2_0"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPartitioning" eSuperTypes="#//v2_2/XmlPartitioning_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlPersistenceUnitDefaults #//v2_1/XmlPersistenceUnitDefaults_2_1 #//v2_3/XmlPersistenceUnitDefaults_2_3"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitMetadata" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlPersistenceUnitMetadata">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPinnedPartitioning" eSuperTypes="#//v2_2/XmlPinnedPartitioning_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPlsqlRecord" eSuperTypes="#//v2_3/XmlPlsqlRecord_2_3"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPlsqlTable" eSuperTypes="#//v2_3/XmlPlsqlTable_2_3"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPrimaryKey" eSuperTypes="#//v1_1/XmlPrimaryKey_1_1 #//v2_1/XmlPrimaryKey_2_1"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPrivateOwned" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="privateOwned" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlProperty">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPropertyContainer" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlQueryContainer" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredProcedureQueries"
-        upperBound="-1" eType="#//XmlNamedStoredProcedureQuery" containment="true"
-        resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlQueryRedirectors" eSuperTypes="#//v2_0/XmlQueryRedirectors_2_0"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlRangePartitioning" eSuperTypes="#//v2_2/XmlRangePartitioning_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlReadOnly" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="readOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlReplicationPartitioning" eSuperTypes="#//v2_2/XmlReplicationPartitioning_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlReturnInsert" eSuperTypes="#//v2_1/XmlReturnInsert_2_1"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlRoundRobinPartitioning" eSuperTypes="#//v2_2/XmlRoundRobinPartitioning_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlSecondaryTable" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlSecondaryTable #//v2_2/XmlSecondaryTable_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlStoredProcedureParameter">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" eType="#//XmlDirection"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="queryParameter" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jdbcType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jdbcTypeName" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlStruct" eSuperTypes="#//v2_3/XmlStruct_2_3"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlStructConverter" eSuperTypes="#//XmlNamedConverter">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="converter" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlStructure" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping #//v2_3/XmlStructure_2_3"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTable" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlTable #//v2_2/XmlTable_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTableGenerator" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlTableGenerator #//v2_2/XmlTableGenerator_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTenantDiscriminatorColumn" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlBaseDiscriminatorColumn #//v2_3/XmlTenantDiscriminatorColumn_2_3"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTenantTableDiscriminator" eSuperTypes="#//v2_4/XmlTenantTableDiscriminator_2_4"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTimeOfDay">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hour" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minute" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="second" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="millisecond" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTransformation" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTransient" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlTransient #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTypeConverter" eSuperTypes="#//XmlNamedConverter">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTypeMapping" abstract="true" interface="true"
-      eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlTypeMapping #//v2_1/XmlTypeMapping_2_1"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlUnionPartitioning" eSuperTypes="#//v2_2/XmlUnionPartitioning_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlUuidGenerator" eSuperTypes="#//v2_4/XmlUuidGenerator_2_4"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlValuePartitioning" eSuperTypes="#//v2_2/XmlValuePartitioning_2_2"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlVariableOneToOne" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping #//v2_2/XmlVariableOneToOne_2_2">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlVersion" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlVersion #//v2_2/XmlVersion_2_2 #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping #//XmlConverterContainer"/>
-  <eClassifiers xsi:type="ecore:EEnum" name="CacheCoordinationType">
-    <eLiterals name="SEND_OBJECT_CHANGES"/>
-    <eLiterals name="INVALIDATE_CHANGED_OBJECTS" value="1"/>
-    <eLiterals name="SEND_NEW_OBJECTS_WITH_CHANGES" value="2"/>
-    <eLiterals name="NONE" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="CacheType">
-    <eLiterals name="FULL"/>
-    <eLiterals name="WEAK" value="1"/>
-    <eLiterals name="SOFT" value="2"/>
-    <eLiterals name="SOFT_WEAK" value="3"/>
-    <eLiterals name="HARD_WEAK" value="4"/>
-    <eLiterals name="CACHE" value="5"/>
-    <eLiterals name="NONE" value="6"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="XmlChangeTrackingType">
-    <eLiterals name="ATTRIBUTE" literal="ATTRIBUTE"/>
-    <eLiterals name="OBJECT" value="1"/>
-    <eLiterals name="DEFERRED" value="2"/>
-    <eLiterals name="AUTO" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="XmlDirection">
-    <eLiterals name="IN"/>
-    <eLiterals name="OUT" value="1" literal="OUT"/>
-    <eLiterals name="IN_OUT" value="2" literal="IN_OUT"/>
-    <eLiterals name="OUT_CURSOR" value="3" literal="OUT_CURSOR"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="ExistenceType">
-    <eLiterals name="CHECK_CACHE"/>
-    <eLiterals name="CHECK_DATABASE" value="1"/>
-    <eLiterals name="ASSUME_EXISTENCE" value="2"/>
-    <eLiterals name="ASSUME_NON_EXISTENCE" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="XmlJoinFetchType">
-    <eLiterals name="INNER"/>
-    <eLiterals name="OUTER" value="1" literal="OUTER"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="XmlOptimisticLockingType">
-    <eLiterals name="ALL_COLUMNS"/>
-    <eLiterals name="CHANGED_COLUMNS" value="1" literal="CHANGED_COLUMNS"/>
-    <eLiterals name="SELECTED_COLUMNS" value="2" literal="SELECTED_COLUMNS"/>
-    <eLiterals name="VERSION_COLUMN" value="3" literal="VERSION_COLUMN"/>
-  </eClassifiers>
-  <eSubpackages name="v1_1" nsURI="jpt.eclipselink.orm.v1_1.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1">
-    <eClassifiers xsi:type="ecore:EClass" name="XmlBasic_1_1" abstract="true" interface="true"
-        eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlGeneratorContainer">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="generatedValue" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlGeneratedValue"
-          containment="true" resolveProxies="false"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEntity_1_1" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKey" eType="#//XmlPrimaryKey"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_1_1" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKey" eType="#//XmlPrimaryKey"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlPrimaryKey_1_1" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="validation" eType="#//v1_1/IdValidationType_1_1"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="columns" upperBound="-1"
-          eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlColumn"
-          containment="true" resolveProxies="false"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="IdValidationType_1_1">
-      <eLiterals name="NULL"/>
-      <eLiterals name="ZERO" value="2"/>
-      <eLiterals name="NONE" value="2"/>
-    </eClassifiers>
-  </eSubpackages>
-  <eSubpackages name="v2_0" nsURI="jpt.eclipselink.orm.v2_0.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0">
-    <eClassifiers xsi:type="ecore:EClass" name="XmlCollectionMapping_2_0" abstract="true"
-        interface="true" eSuperTypes="#//v2_0/XmlMapKeyAssociationOverrideContainer_2_0 #//XmlConverterContainer">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="mapKeyConvert" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_0" abstract="true"
-        interface="true" eSuperTypes="#//XmlAttributeMapping #//XmlConvertibleMapping #//v2_0/XmlCollectionMapping_2_0"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_0" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="cacheInterceptor" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlClassReference"
-          containment="true" resolveProxies="false"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="queryRedirectors" eType="#//XmlQueryRedirectors"
-          containment="true" resolveProxies="false"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany_2_0" abstract="true"
-        interface="true" eSuperTypes="#//v2_0/XmlCollectionMapping_2_0"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlMapKeyAssociationOverrideContainer_2_0"
-        abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyAssociationOverrides"
-          upperBound="-1" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlAssociationOverride"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_2_0" abstract="true"
-        interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//v2_0/XmlCacheable_2_0">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="cacheInterceptor" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlClassReference"
-          containment="true" resolveProxies="false"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany_2_0" abstract="true"
-        interface="true" eSuperTypes="#//v2_0/XmlCollectionMapping_2_0"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlOrderColumn_2_0" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="correctionType" eType="#//v2_0/OrderCorrectionType_2_0"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlQueryRedirectors_2_0" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="allQueries" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="readAll" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="readObject" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="report" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="update" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="insert" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="delete" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="OrderCorrectionType_2_0">
-      <eLiterals name="READ"/>
-      <eLiterals name="READ_WRITE" value="1"/>
-      <eLiterals name="EXCEPTION" value="2"/>
-    </eClassifiers>
-  </eSubpackages>
-  <eSubpackages name="v2_1" nsURI="jpt.eclipselink.orm.v2_1.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1">
-    <eClassifiers xsi:type="ecore:EClass" name="XmlBasic_2_1" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="returnInsert" eType="#//XmlReturnInsert"
-          containment="true" resolveProxies="false"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="returnUpdate" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlBatchFetch_2_1" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="size" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="batchFetchType" eType="#//v2_1/BatchFetchType_2_1"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_1" abstract="true"
-        interface="true" eSuperTypes="#//XmlJoinFetch #//XmlBatchFetchHolder"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_1" abstract="true" interface="true"
-        eSuperTypes="#//v2_1/XmlTypeMapping_2_1 #//v2_1/XmlFetchGroupContainer_2_1">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="classExtractor" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlClassReference"
-          containment="true" resolveProxies="false"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings_2_1" abstract="true"
-        interface="true" eSuperTypes="#//XmlAccessMethodsHolder"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlFetchAttribute_2_1" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlFetchGroup_2_1" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="load" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
-          eType="#//XmlFetchAttribute" containment="true" resolveProxies="false"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlFetchGroupContainer_2_1" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="fetchGroups" upperBound="-1"
-          eType="#//XmlFetchGroup" containment="true" resolveProxies="false"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany_2_1" abstract="true"
-        interface="true" eSuperTypes="#//XmlBatchFetchHolder"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne_2_1" abstract="true"
-        interface="true" eSuperTypes="#//XmlBatchFetchHolder"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_2_1" abstract="true"
-        interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlAssociationOverrideContainer ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlAttributeOverrideContainer #//v2_1/XmlFetchGroupContainer_2_1 ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlGeneratorContainer ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlQueryContainer #//XmlQueryContainer #//v2_1/XmlTypeMapping_2_1">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="sqlResultSetMappings"
-          upperBound="-1" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//SqlResultSetMapping"
-          containment="true" resolveProxies="false"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="queryRedirectors" eType="#//XmlQueryRedirectors"
-          containment="true" resolveProxies="false"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany_2_1" abstract="true"
-        interface="true" eSuperTypes="#//XmlBatchFetchHolder"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne_2_1" abstract="true" interface="true"
-        eSuperTypes="#//XmlBatchFetchHolder"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults_2_1" abstract="true"
-        interface="true" eSuperTypes="#//XmlAccessMethodsHolder"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlPrimaryKey_2_1" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="cacheKeyType" eType="#//v2_1/CacheKeyType_2_1"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlReturnInsert_2_1" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="returnOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlTypeMapping_2_1" abstract="true"
-        interface="true" eSuperTypes="#//XmlAccessMethodsHolder">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentClass" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="CacheKeyType_2_1">
-      <eLiterals name="ID_VALUE" literal="ID_VALUE"/>
-      <eLiterals name="CACHE_KEY" value="1"/>
-      <eLiterals name="AUTO" value="2"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="BatchFetchType_2_1">
-      <eLiterals name="JOIN"/>
-      <eLiterals name="EXISTS" value="1"/>
-      <eLiterals name="IN" value="2"/>
-    </eClassifiers>
-  </eSubpackages>
-  <eSubpackages name="v2_2" nsURI="jpt.eclipselink.orm.v2_2.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2">
-    <eClassifiers xsi:type="ecore:EClass" name="XmlAdditionalCriteria_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="criteria" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlBasic_2_2" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//v2_2/XmlIndex_2_2"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlBasicCollection_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeOnDelete" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlBasicMap_2_2" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeOnDelete" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlCache_2_2" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="isolation" eType="#//v2_2/CacheIsolationType"
-          defaultValueLiteral=""/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlCollectionTable_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationSuffix" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_2" abstract="true"
-        interface="true" eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeOnDelete" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="noncacheable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable_2_2" abstract="true"
-        interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlAttributeOverrideContainer ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlAssociationOverrideContainer"/>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_2" abstract="true" interface="true"
-        eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="additionalCriteria" eType="#//v2_2/XmlAdditionalCriteria_2_2"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeOnDelete" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//v2_2/XmlIndex_2_2"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="partitioning" upperBound="-1"
-          eType="#//v2_2/XmlPartitioning_2_2" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="replicationPartitioning"
-          upperBound="-1" eType="#//v2_2/XmlReplicationPartitioning_2_2" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="roundRobinPartitioning"
-          upperBound="-1" eType="#//v2_2/XmlRoundRobinPartitioning_2_2" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="pinnedPartitioning" upperBound="-1"
-          eType="#//v2_2/XmlPinnedPartitioning_2_2" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="rangePartitioning" upperBound="-1"
-          eType="#//v2_2/XmlRangePartitioning_2_2" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="valuePartitioning" upperBound="-1"
-          eType="#//v2_2/XmlValuePartitioning_2_2" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="hashPartitioning" upperBound="-1"
-          eType="#//v2_2/XmlHashPartitioning_2_2" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="unionPartitioning" upperBound="-1"
-          eType="#//v2_2/XmlUnionPartitioning_2_2" containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlHashPartitioning_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlId_2_2" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//v2_2/XmlIndex_2_2"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlIndex_2_2" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="schema" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="catalog" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="table" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="unique" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="columnNames" unique="false"
-          upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlJoinTable_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationSuffix" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany_2_2" abstract="true"
-        interface="true" eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeOnDelete" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="nonCacheable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne_2_2" abstract="true"
-        interface="true" eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="nonCacheable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_2_2" abstract="true"
-        interface="true" eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="additionalCriteria" eType="#//v2_2/XmlAdditionalCriteria_2_2"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne_2_2" abstract="true" interface="true"
-        eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeOnDelete" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="nonCacheable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany_2_2" abstract="true"
-        interface="true" eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeOnDelete" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="noncacheable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlPartitioning_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlPartitioningGroup_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="partitioning" eType="#//v2_2/XmlPartitioning_2_2"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="replicationPartitioning"
-          eType="#//v2_2/XmlReplicationPartitioning_2_2" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="roundRobinPartitioning"
-          eType="#//v2_2/XmlRoundRobinPartitioning_2_2" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="pinnedPartitioning" eType="#//v2_2/XmlPinnedPartitioning_2_2"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="rangePartitioning" eType="#//v2_2/XmlRangePartitioning_2_2"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="valuePartitioning" eType="#//v2_2/XmlValuePartitioning_2_2"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="hashPartitioning" eType="#//v2_2/XmlHashPartitioning_2_2"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="unionPartitioning" eType="#//v2_2/XmlUnionPartitioning_2_2"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="partitioned" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlPinnedPartitioning_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlRangePartitioning_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlReplicationPartitioning_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlRoundRobinPartitioning_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlSecondaryTable_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationSuffix" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlTable_2_2" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationSuffix" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlTableGenerator_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationSuffix" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlUnionPartitioning_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlValuePartitioning_2_2" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlVariableOneToOne_2_2" abstract="true"
-        interface="true" eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="nonCacheable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlVersion_2_2" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//v2_2/XmlIndex_2_2"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="CacheIsolationType">
-      <eLiterals name="SHARED"/>
-      <eLiterals name="PROTECTED" value="1" literal="PROTECTED"/>
-      <eLiterals name="ISOLATED" value="2"/>
-    </eClassifiers>
-  </eSubpackages>
-  <eSubpackages name="v2_3" nsURI="jpt.eclipselink.orm.v2_3.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3">
-    <eClassifiers xsi:type="ecore:EClass" name="XmlArray_2_3" abstract="true" interface="true"
-        eSuperTypes="#//XmlConverterContainer ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlConvertibleMapping ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//ColumnMapping">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="databaseType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetClass" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlAttributes_2_3" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="structures" upperBound="-1"
-          eType="#//v2_3/XmlStructure_2_3" containment="true" resolveProxies="false"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="arrays" upperBound="-1"
-          eType="#//v2_3/XmlArray_2_3" containment="true" resolveProxies="false"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_3" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="compositeMember" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable_2_3" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlRecords" upperBound="-1"
-          eType="#//v2_3/XmlPlsqlRecord_2_3" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlTables" upperBound="-1"
-          eType="#//XmlPlsqlTable" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="struct" eType="#//v2_3/XmlStruct_2_3"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_3" abstract="true" interface="true"
-        eSuperTypes="#//XmlMultitenantHolder">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredFunctionQueries"
-          upperBound="-1" eType="#//v2_3/XmlNamedStoredFunctionQuery_2_3" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredFunctionQueries"
-          upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredProcedureQueries"
-          upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlRecords" upperBound="-1"
-          eType="#//v2_3/XmlPlsqlRecord_2_3" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlTables" upperBound="-1"
-          eType="#//XmlPlsqlTable" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="struct" eType="#//v2_3/XmlStruct_2_3"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings_2_3" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminatorColumns"
-          upperBound="-1" eType="#//v2_3/XmlTenantDiscriminatorColumn_2_3" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredFunctionQueries"
-          upperBound="-1" eType="#//v2_3/XmlNamedStoredFunctionQuery_2_3" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredFunctionQueries"
-          upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredProcedureQueries"
-          upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlRecords" upperBound="-1"
-          eType="#//v2_3/XmlPlsqlRecord_2_3" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlTables" upperBound="-1"
-          eType="#//XmlPlsqlTable" containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_2_3" abstract="true"
-        interface="true" eSuperTypes="#//XmlMultitenantHolder">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredFunctionQueries"
-          upperBound="-1" eType="#//v2_3/XmlNamedStoredFunctionQuery_2_3" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredFunctionQueries"
-          upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredProcedureQueries"
-          upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlRecords" upperBound="-1"
-          eType="#//v2_3/XmlPlsqlRecord_2_3" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlTables" upperBound="-1"
-          eType="#//XmlPlsqlTable" containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlMultitenant_2_3" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//v2_3/MultitenantType"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminatorColumns"
-          upperBound="-1" eType="#//v2_3/XmlTenantDiscriminatorColumn_2_3" containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlNamedPlsqlStoredFunctionQuery_2_3"
-        abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlNamedPlsqlStoredProcedureQuery_2_3"
-        abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlNamedStoredFunctionQuery_2_3" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults_2_3" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminatorColumns"
-          upperBound="-1" eType="#//v2_3/XmlTenantDiscriminatorColumn_2_3" containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlPlsqlRecord_2_3" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlPlsqlTable_2_3" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlStruct_2_3" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlTenantDiscriminatorColumn_2_3"
-        abstract="true" interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlBaseDiscriminatorColumn">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="contextProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="table" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="primaryKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlStructure_2_3" abstract="true"
-        interface="true"/>
-    <eClassifiers xsi:type="ecore:EEnum" name="MultitenantType">
-      <eLiterals name="SINGLE_TABLE"/>
-      <eLiterals name="TABLE_PER_TENANT" value="1" literal="TABLE_PER_TENANT"/>
-      <eLiterals name="VPD" value="2"/>
-    </eClassifiers>
-  </eSubpackages>
-  <eSubpackages name="v2_4" nsURI="jpt.eclipselink.orm.v2_4.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4">
-    <eClassifiers xsi:type="ecore:EClass" name="XmlBasic_2_4" abstract="true" interface="true"
-        eSuperTypes="#//v2_4/XmlGeneratorContainer2_4">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//v2_4/XmlField_2_4"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//v2_4/XmlCacheIndex_2_4"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlCache_2_4" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="databaseChangeNotificationType"
-          eType="#//v2_4/DatabaseChangeNotificationType" defaultValueLiteral=""/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlCacheIndex_2_4" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="columnNames" unique="false"
-          upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlGeneratorContainer2_4" abstract="true"
-        interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlGeneratorContainer">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="uuidGenerator" eType="#//v2_4/XmlUuidGenerator_2_4"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_4" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//v2_4/XmlField_2_4"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="deleteAll" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable_2_4" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="noSql" eType="#//v2_4/XmlNoSql_2_4"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded_2_4" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//v2_4/XmlField_2_4"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_4" abstract="true" interface="true"
-        eSuperTypes="#//v2_4/XmlGeneratorContainer2_4">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//v2_4/XmlCacheIndex_2_4"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="noSql" eType="#//v2_4/XmlNoSql_2_4"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings_2_4" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="uuidGenerators" upperBound="-1"
-          eType="#//v2_4/XmlUuidGenerator_2_4" containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlField_2_4" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlId_2_4" abstract="true" interface="true"
-        eSuperTypes="#//v2_4/XmlGeneratorContainer2_4">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//v2_4/XmlField_2_4"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//v2_4/XmlCacheIndex_2_4"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlJoinField_2_4" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="referencedFieldName"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany_2_4" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="joinFields" upperBound="-1"
-          eType="#//v2_4/XmlJoinField_2_4" containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne_2_4" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="joinFields" upperBound="-1"
-          eType="#//v2_4/XmlJoinField_2_4" containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_2_4" abstract="true"
-        interface="true" eSuperTypes="#//v2_4/XmlGeneratorContainer2_4">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//v2_4/XmlCacheIndex_2_4"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlMultitenant_2_4" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="includeCriteria" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="tenantTableDiscriminator"
-          eType="#//v2_4/XmlTenantTableDiscriminator_2_4" containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlNoSql_2_4" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataFormat" eType="#//v2_4/DataFormatType"
-          defaultValueLiteral=""/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany_2_4" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="joinFields" upperBound="-1"
-          eType="#//v2_4/XmlJoinField_2_4" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="deleteAll" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne_2_4" abstract="true" interface="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="joinFields" upperBound="-1"
-          eType="#//v2_4/XmlJoinField_2_4" containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlTenantTableDiscriminator_2_4" abstract="true"
-        interface="true">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="contextProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//v2_4/TenantTableDiscriminatorType"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="XmlUuidGenerator_2_4" abstract="true"
-        interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlGenerator"/>
-    <eClassifiers xsi:type="ecore:EEnum" name="DatabaseChangeNotificationType">
-      <eLiterals name="NONE"/>
-      <eLiterals name="INVALIDATION" value="1" literal="INVALIDATION"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="TenantTableDiscriminatorType">
-      <eLiterals name="SCHEMA"/>
-      <eLiterals name="SUFFIX" value="1" literal="SUFFIX"/>
-      <eLiterals name="PREFIX" value="2"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="DataFormatType">
-      <eLiterals name="XML"/>
-      <eLiterals name="INDEXED" value="1" literal="INDEXED"/>
-      <eLiterals name="MAPPED" value="2"/>
-    </eClassifiers>
-  </eSubpackages>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="orm" nsURI="jpt.eclipselink.orm.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm">

+  <eClassifiers xsi:type="ecore:EClass" name="XmlAccessMethods">

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

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

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="accessMethods" eType="#//XmlAccessMethods"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlAdditionalCriteria" eSuperTypes="#//v2_2/XmlAdditionalCriteria_2_2"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlArray" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping #//v2_3/XmlArray_2_3 #//XmlConvertibleMapping"/>

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

+      interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlAttributeMapping #//XmlAccessMethodsHolder #//XmlPropertyContainer">

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Attributes" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//Attributes #//v2_3/XmlAttributes_2_3">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="basicCollections" upperBound="-1"

+        eType="#//XmlBasicCollection" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="basicMaps" upperBound="-1"

+        eType="#//XmlBasicMap" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="transformations" upperBound="-1"

+        eType="#//XmlTransformation" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="variableOneToOnes" upperBound="-1"

+        eType="#//XmlVariableOneToOne" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlBasic" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlBasic #//v1_1/XmlBasic_1_1 #//v2_1/XmlBasic_2_1 #//v2_2/XmlBasic_2_2 #//v2_4/XmlBasic_2_4 #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping #//XmlConverterContainer"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlBasicCollection" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping #//v2_2/XmlBasicCollection_2_2"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlBasicMap" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping #//v2_2/XmlBasicMap_2_2"/>

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

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="batchFetch" eType="#//XmlBatchFetch"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlCache" eSuperTypes="#//v2_2/XmlCache_2_2 #//v2_4/XmlCache_2_4">

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

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

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//CacheType"/>

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

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

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="coordinationType" eType="#//CacheCoordinationType"

+        defaultValueLiteral=""/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="expiryTimeOfDay" eType="#//XmlTimeOfDay"

+        containment="true"/>

+  </eClassifiers>

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="cache" eType="#//XmlCache"

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="existenceChecking" eType="#//ExistenceType"

+        defaultValueLiteral=""/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlCacheIndex" eSuperTypes="#//v2_4/XmlCacheIndex_2_4"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlChangeTracking">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//XmlChangeTrackingType"/>

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="changeTracking" eType="#//XmlChangeTracking"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlCloneCopyPolicy">

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

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlCollectionTable" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlCollectionTable #//v2_2/XmlCollectionTable_2_2"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlConversionValue">

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

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

+  </eClassifiers>

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

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

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="converters" upperBound="-1"

+        eType="#//XmlConverter" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="typeConverters" upperBound="-1"

+        eType="#//XmlTypeConverter" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="objectTypeConverters" upperBound="-1"

+        eType="#//XmlObjectTypeConverter" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="structConverters" upperBound="-1"

+        eType="#//XmlStructConverter" containment="true" resolveProxies="false"/>

+  </eClassifiers>

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

+      interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlConvertibleMapping">

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlCopyPolicy">

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlCustomizer">

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

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="customizer" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlClassReference"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlElementCollection #//v2_0/XmlElementCollection_2_0 #//v2_1/XmlElementCollection_2_1 #//v2_2/XmlElementCollection_2_2 #//v2_3/XmlElementCollection_2_3 #//v2_4/XmlElementCollection_2_4"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlEmbeddable #//XmlTypeMapping #//v2_2/XmlEmbeddable_2_2 #//v2_3/XmlEmbeddable_2_3 #//v2_4/XmlEmbeddable_2_4 #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlConverterContainer #//XmlPropertyContainer">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="copyPolicy" eType="#//XmlCopyPolicy"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="instantiationCopyPolicy"

+        eType="#//XmlInstantiationCopyPolicy" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="cloneCopyPolicy" eType="#//XmlCloneCopyPolicy"

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlEmbedded #//v2_4/XmlEmbedded_2_4 #//XmlAttributeMapping"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedId" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlEmbeddedId #//XmlAttributeMapping"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlEntity" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlEntity #//XmlTypeMapping #//v1_1/XmlEntity_1_1 #//v2_0/XmlEntity_2_0 #//v2_1/XmlEntity_2_1 #//v2_2/XmlEntity_2_2 #//v2_3/XmlEntity_2_3 #//v2_4/XmlEntity_2_4 #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConverterContainer #//XmlQueryContainer #//XmlPropertyContainer">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="optimisticLocking" eType="#//XmlOptimisticLocking"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="copyPolicy" eType="#//XmlCopyPolicy"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="instantiationCopyPolicy"

+        eType="#//XmlInstantiationCopyPolicy" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="cloneCopyPolicy" eType="#//XmlCloneCopyPolicy"

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlEntityMappings #//v2_1/XmlEntityMappings_2_1 #//v2_2/XmlEntityMappings_2_2 #//v2_3/XmlEntityMappings_2_3 #//v2_4/XmlEntityMappings_2_4 #//XmlConverterContainer #//XmlQueryContainer"/>

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

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

+  <eClassifiers xsi:type="ecore:EClass" name="XmlField" eSuperTypes="#//v2_4/XmlField_2_4"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlHashPartitioning" eSuperTypes="#//v2_2/XmlHashPartitioning_2_2"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlId" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlId #//v2_2/XmlId_2_2 #//v2_4/XmlId_2_4 #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping #//XmlConverterContainer"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlIndex" eSuperTypes="#//v2_2/XmlIndex_2_2"/>

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

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="joinFetch" eType="#//XmlJoinFetchType"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlJoinField" eSuperTypes="#//v2_4/XmlJoinField_2_4"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlJoinTable" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlJoinTable #//v2_2/XmlJoinTable_2_2"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlManyToMany #//v2_0/XmlManyToMany_2_0 #//v2_1/XmlManyToMany_2_1 #//v2_2/XmlManyToMany_2_2 #//v2_4/XmlManyToMany_2_4 #//XmlAttributeMapping #//XmlJoinFetch"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlManyToOne #//v2_1/XmlManyToOne_2_1 #//v2_2/XmlManyToOne_2_2 #//v2_4/XmlManyToOne_2_4 #//XmlAttributeMapping #//XmlJoinFetch"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlMappedSuperclass #//XmlTypeMapping #//v1_1/XmlMappedSuperclass_1_1 #//v2_0/XmlMappedSuperclass_2_0 #//v2_1/XmlMappedSuperclass_2_1 #//v2_2/XmlMappedSuperclass_2_2 #//v2_3/XmlMappedSuperclass_2_3 #//v2_4/XmlMappedSuperclass_2_4 #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConverterContainer #//XmlPropertyContainer">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="optimisticLocking" eType="#//XmlOptimisticLocking"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="copyPolicy" eType="#//XmlCopyPolicy"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="instantiationCopyPolicy"

+        eType="#//XmlInstantiationCopyPolicy" containment="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="cloneCopyPolicy" eType="#//XmlCloneCopyPolicy"

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlMultitenant" eSuperTypes="#//v2_3/XmlMultitenant_2_3 #//v2_4/XmlMultitenant_2_4"/>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="multitenant" eType="#//XmlMultitenant"

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

+  </eClassifiers>

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

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedConverter">

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedPlsqlStoredFunctionQuery" eSuperTypes="#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedPlsqlStoredProcedureQuery" eSuperTypes="#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedStoredFunctionQuery" eSuperTypes="#//v2_3/XmlNamedStoredFunctionQuery_2_3"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedStoredProcedureQuery">

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

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

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

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

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="hints" upperBound="-1"

+        eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlQueryHint"

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"

+        eType="#//XmlStoredProcedureParameter" containment="true" resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlNoSql" eSuperTypes="#//v2_4/XmlNoSql_2_4"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlObjectTypeConverter" eSuperTypes="#//XmlNamedConverter">

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

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="conversionValues" upperBound="-1"

+        eType="#//XmlConversionValue" containment="true" resolveProxies="false"/>

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlOneToMany #//v2_0/XmlOneToMany_2_0 #//v2_1/XmlOneToMany_2_1 #//v2_2/XmlOneToMany_2_2 #//v2_4/XmlOneToMany_2_4 #//XmlAttributeMapping #//XmlPrivateOwned #//XmlJoinFetch"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlOneToOne #//v2_1/XmlOneToOne_2_1 #//v2_2/XmlOneToOne_2_2 #//v2_4/XmlOneToOne_2_4 #//XmlAttributeMapping #//XmlPrivateOwned #//XmlJoinFetch"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlOptimisticLocking">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//XmlOptimisticLockingType"/>

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="selectedColumns" upperBound="-1"

+        eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlColumn"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlOrderColumn" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlOrderColumn #//v2_0/XmlOrderColumn_2_0"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlPartitioning" eSuperTypes="#//v2_2/XmlPartitioning_2_2"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlPersistenceUnitDefaults #//v2_1/XmlPersistenceUnitDefaults_2_1 #//v2_3/XmlPersistenceUnitDefaults_2_3"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitMetadata" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlPersistenceUnitMetadata">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings"

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlPinnedPartitioning" eSuperTypes="#//v2_2/XmlPinnedPartitioning_2_2"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlPlsqlRecord" eSuperTypes="#//v2_3/XmlPlsqlRecord_2_3"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlPlsqlTable" eSuperTypes="#//v2_3/XmlPlsqlTable_2_3"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlPrimaryKey" eSuperTypes="#//v1_1/XmlPrimaryKey_1_1 #//v2_1/XmlPrimaryKey_2_1"/>

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

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlProperty">

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

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

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

+  </eClassifiers>

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

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"

+        eType="#//XmlProperty" containment="true" resolveProxies="false"/>

+  </eClassifiers>

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredProcedureQueries"

+        upperBound="-1" eType="#//XmlNamedStoredProcedureQuery" containment="true"

+        resolveProxies="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlQueryRedirectors" eSuperTypes="#//v2_0/XmlQueryRedirectors_2_0"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlRangePartitioning" eSuperTypes="#//v2_2/XmlRangePartitioning_2_2"/>

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

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlReplicationPartitioning" eSuperTypes="#//v2_2/XmlReplicationPartitioning_2_2"/>

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

+  <eClassifiers xsi:type="ecore:EClass" name="XmlRoundRobinPartitioning" eSuperTypes="#//v2_2/XmlRoundRobinPartitioning_2_2"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlSecondaryTable" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlSecondaryTable #//v2_2/XmlSecondaryTable_2_2"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlStoredProcedureParameter">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" eType="#//XmlDirection"/>

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

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

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

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

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlStruct" eSuperTypes="#//v2_3/XmlStruct_2_3"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlStructConverter" eSuperTypes="#//XmlNamedConverter">

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlStructure" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping #//v2_3/XmlStructure_2_3"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlTable" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlTable #//v2_2/XmlTable_2_2"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlTableGenerator" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlTableGenerator #//v2_2/XmlTableGenerator_2_2"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlTenantDiscriminatorColumn" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlBaseDiscriminatorColumn #//v2_3/XmlTenantDiscriminatorColumn_2_3"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlTenantTableDiscriminator" eSuperTypes="#//v2_4/XmlTenantTableDiscriminator_2_4"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlTimeOfDay">

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

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

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

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlTransformation" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlTransient" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlTransient #//XmlAttributeMapping"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlTypeConverter" eSuperTypes="#//XmlNamedConverter">

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

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

+  </eClassifiers>

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

+      eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlTypeMapping #//v2_1/XmlTypeMapping_2_1"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlUnionPartitioning" eSuperTypes="#//v2_2/XmlUnionPartitioning_2_2"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlUuidGenerator" eSuperTypes="#//v2_4/XmlUuidGenerator_2_4"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlValuePartitioning" eSuperTypes="#//v2_2/XmlValuePartitioning_2_2"/>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlVariableOneToOne" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping #//v2_2/XmlVariableOneToOne_2_2">

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="XmlVersion" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlVersion #//v2_2/XmlVersion_2_2 #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping #//XmlConverterContainer"/>

+  <eClassifiers xsi:type="ecore:EEnum" name="CacheCoordinationType">

+    <eLiterals name="SEND_OBJECT_CHANGES"/>

+    <eLiterals name="INVALIDATE_CHANGED_OBJECTS" value="1"/>

+    <eLiterals name="SEND_NEW_OBJECTS_WITH_CHANGES" value="2"/>

+    <eLiterals name="NONE" value="3"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="CacheType">

+    <eLiterals name="FULL"/>

+    <eLiterals name="WEAK" value="1"/>

+    <eLiterals name="SOFT" value="2"/>

+    <eLiterals name="SOFT_WEAK" value="3"/>

+    <eLiterals name="HARD_WEAK" value="4"/>

+    <eLiterals name="CACHE" value="5"/>

+    <eLiterals name="NONE" value="6"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="XmlChangeTrackingType">

+    <eLiterals name="ATTRIBUTE" literal="ATTRIBUTE"/>

+    <eLiterals name="OBJECT" value="1"/>

+    <eLiterals name="DEFERRED" value="2"/>

+    <eLiterals name="AUTO" value="3"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="XmlDirection">

+    <eLiterals name="IN"/>

+    <eLiterals name="OUT" value="1" literal="OUT"/>

+    <eLiterals name="IN_OUT" value="2" literal="IN_OUT"/>

+    <eLiterals name="OUT_CURSOR" value="3" literal="OUT_CURSOR"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="ExistenceType">

+    <eLiterals name="CHECK_CACHE"/>

+    <eLiterals name="CHECK_DATABASE" value="1"/>

+    <eLiterals name="ASSUME_EXISTENCE" value="2"/>

+    <eLiterals name="ASSUME_NON_EXISTENCE" value="3"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="XmlJoinFetchType">

+    <eLiterals name="INNER"/>

+    <eLiterals name="OUTER" value="1" literal="OUTER"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="XmlOptimisticLockingType">

+    <eLiterals name="ALL_COLUMNS"/>

+    <eLiterals name="CHANGED_COLUMNS" value="1" literal="CHANGED_COLUMNS"/>

+    <eLiterals name="SELECTED_COLUMNS" value="2" literal="SELECTED_COLUMNS"/>

+    <eLiterals name="VERSION_COLUMN" value="3" literal="VERSION_COLUMN"/>

+  </eClassifiers>

+  <eSubpackages name="v1_1" nsURI="jpt.eclipselink.orm.v1_1.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1">

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

+        eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlGeneratorContainer">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="generatedValue" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlGeneratedValue"

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

+    </eClassifiers>

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKey" eType="#//XmlPrimaryKey"

+          containment="true"/>

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKey" eType="#//XmlPrimaryKey"

+          containment="true"/>

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="validation" eType="#//v1_1/IdValidationType_1_1"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="columns" upperBound="-1"

+          eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlColumn"

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

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EEnum" name="IdValidationType_1_1">

+      <eLiterals name="NULL"/>

+      <eLiterals name="ZERO" value="2"/>

+      <eLiterals name="NONE" value="2"/>

+    </eClassifiers>

+  </eSubpackages>

+  <eSubpackages name="v2_0" nsURI="jpt.eclipselink.orm.v2_0.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0">

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

+        interface="true" eSuperTypes="#//v2_0/XmlMapKeyAssociationOverrideContainer_2_0 #//XmlConverterContainer">

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

+    </eClassifiers>

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

+        interface="true" eSuperTypes="#//XmlAttributeMapping #//XmlConvertibleMapping #//v2_0/XmlCollectionMapping_2_0"/>

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="cacheInterceptor" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlClassReference"

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="queryRedirectors" eType="#//XmlQueryRedirectors"

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

+    </eClassifiers>

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

+        interface="true" eSuperTypes="#//v2_0/XmlCollectionMapping_2_0"/>

+    <eClassifiers xsi:type="ecore:EClass" name="XmlMapKeyAssociationOverrideContainer_2_0"

+        abstract="true" interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyAssociationOverrides"

+          upperBound="-1" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlAssociationOverride"

+          containment="true"/>

+    </eClassifiers>

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

+        interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//v2_0/XmlCacheable_2_0">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="cacheInterceptor" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlClassReference"

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

+    </eClassifiers>

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

+        interface="true" eSuperTypes="#//v2_0/XmlCollectionMapping_2_0"/>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="correctionType" eType="#//v2_0/OrderCorrectionType_2_0"/>

+    </eClassifiers>

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

+        interface="true">

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

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

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

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

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

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

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

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EEnum" name="OrderCorrectionType_2_0">

+      <eLiterals name="READ"/>

+      <eLiterals name="READ_WRITE" value="1"/>

+      <eLiterals name="EXCEPTION" value="2"/>

+    </eClassifiers>

+  </eSubpackages>

+  <eSubpackages name="v2_1" nsURI="jpt.eclipselink.orm.v2_1.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1">

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="returnInsert" eType="#//XmlReturnInsert"

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

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

+    </eClassifiers>

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

+        interface="true">

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

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

+    </eClassifiers>

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

+        interface="true" eSuperTypes="#//XmlJoinFetch #//XmlBatchFetchHolder"/>

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

+        eSuperTypes="#//v2_1/XmlTypeMapping_2_1 #//v2_1/XmlFetchGroupContainer_2_1">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="classExtractor" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlClassReference"

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

+    </eClassifiers>

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

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

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true">

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

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"

+          eType="#//XmlFetchAttribute" containment="true" resolveProxies="false"/>

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="fetchGroups" upperBound="-1"

+          eType="#//XmlFetchGroup" containment="true" resolveProxies="false"/>

+    </eClassifiers>

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

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

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

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

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

+        interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlAssociationOverrideContainer ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlAttributeOverrideContainer #//v2_1/XmlFetchGroupContainer_2_1 ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlGeneratorContainer ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlQueryContainer #//XmlQueryContainer #//v2_1/XmlTypeMapping_2_1">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="sqlResultSetMappings"

+          upperBound="-1" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//SqlResultSetMapping"

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="queryRedirectors" eType="#//XmlQueryRedirectors"

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

+    </eClassifiers>

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

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

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

+        eSuperTypes="#//XmlBatchFetchHolder"/>

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

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

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

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

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

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EEnum" name="CacheKeyType_2_1">

+      <eLiterals name="ID_VALUE" literal="ID_VALUE"/>

+      <eLiterals name="CACHE_KEY" value="1"/>

+      <eLiterals name="AUTO" value="2"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EEnum" name="BatchFetchType_2_1">

+      <eLiterals name="JOIN"/>

+      <eLiterals name="EXISTS" value="1"/>

+      <eLiterals name="IN" value="2"/>

+    </eClassifiers>

+  </eSubpackages>

+  <eSubpackages name="v2_2" nsURI="jpt.eclipselink.orm.v2_2.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2">

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

+        interface="true">

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

+    </eClassifiers>

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//v2_2/XmlIndex_2_2"

+          containment="true"/>

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

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

+    </eClassifiers>

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

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="isolation" eType="#//v2_2/CacheIsolationType"

+          defaultValueLiteral=""/>

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true" eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">

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

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

+    </eClassifiers>

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

+        interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlAttributeOverrideContainer ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlAssociationOverrideContainer"/>

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

+        eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="additionalCriteria" eType="#//v2_2/XmlAdditionalCriteria_2_2"

+          containment="true"/>

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//v2_2/XmlIndex_2_2"

+          containment="true"/>

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="partitioning" upperBound="-1"

+          eType="#//v2_2/XmlPartitioning_2_2" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="replicationPartitioning"

+          upperBound="-1" eType="#//v2_2/XmlReplicationPartitioning_2_2" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="roundRobinPartitioning"

+          upperBound="-1" eType="#//v2_2/XmlRoundRobinPartitioning_2_2" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="pinnedPartitioning" upperBound="-1"

+          eType="#//v2_2/XmlPinnedPartitioning_2_2" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="rangePartitioning" upperBound="-1"

+          eType="#//v2_2/XmlRangePartitioning_2_2" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="valuePartitioning" upperBound="-1"

+          eType="#//v2_2/XmlValuePartitioning_2_2" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="hashPartitioning" upperBound="-1"

+          eType="#//v2_2/XmlHashPartitioning_2_2" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="unionPartitioning" upperBound="-1"

+          eType="#//v2_2/XmlUnionPartitioning_2_2" containment="true"/>

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//v2_2/XmlIndex_2_2"

+          containment="true"/>

+    </eClassifiers>

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

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

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

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

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

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

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="columnNames" unique="false"

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true" eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">

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

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

+    </eClassifiers>

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

+        interface="true" eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">

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

+    </eClassifiers>

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

+        interface="true" eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="additionalCriteria" eType="#//v2_2/XmlAdditionalCriteria_2_2"

+          containment="true"/>

+    </eClassifiers>

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

+        eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">

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

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

+    </eClassifiers>

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

+        interface="true" eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">

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

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="partitioning" eType="#//v2_2/XmlPartitioning_2_2"

+          containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="replicationPartitioning"

+          eType="#//v2_2/XmlReplicationPartitioning_2_2" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="roundRobinPartitioning"

+          eType="#//v2_2/XmlRoundRobinPartitioning_2_2" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="pinnedPartitioning" eType="#//v2_2/XmlPinnedPartitioning_2_2"

+          containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="rangePartitioning" eType="#//v2_2/XmlRangePartitioning_2_2"

+          containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="valuePartitioning" eType="#//v2_2/XmlValuePartitioning_2_2"

+          containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="hashPartitioning" eType="#//v2_2/XmlHashPartitioning_2_2"

+          containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="unionPartitioning" eType="#//v2_2/XmlUnionPartitioning_2_2"

+          containment="true"/>

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true" eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">

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

+    </eClassifiers>

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//v2_2/XmlIndex_2_2"

+          containment="true"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EEnum" name="CacheIsolationType">

+      <eLiterals name="SHARED"/>

+      <eLiterals name="PROTECTED" value="1" literal="PROTECTED"/>

+      <eLiterals name="ISOLATED" value="2"/>

+    </eClassifiers>

+  </eSubpackages>

+  <eSubpackages name="v2_3" nsURI="jpt.eclipselink.orm.v2_3.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3">

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

+        eSuperTypes="#//XmlConverterContainer ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlConvertibleMapping ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//ColumnMapping">

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

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

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="structures" upperBound="-1"

+          eType="#//v2_3/XmlStructure_2_3" containment="true" resolveProxies="false"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="arrays" upperBound="-1"

+          eType="#//v2_3/XmlArray_2_3" containment="true" resolveProxies="false"/>

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlRecords" upperBound="-1"

+          eType="#//v2_3/XmlPlsqlRecord_2_3" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlTables" upperBound="-1"

+          eType="#//XmlPlsqlTable" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="struct" eType="#//v2_3/XmlStruct_2_3"

+          containment="true"/>

+    </eClassifiers>

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

+        eSuperTypes="#//XmlMultitenantHolder">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredFunctionQueries"

+          upperBound="-1" eType="#//v2_3/XmlNamedStoredFunctionQuery_2_3" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredFunctionQueries"

+          upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredProcedureQueries"

+          upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlRecords" upperBound="-1"

+          eType="#//v2_3/XmlPlsqlRecord_2_3" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlTables" upperBound="-1"

+          eType="#//XmlPlsqlTable" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="struct" eType="#//v2_3/XmlStruct_2_3"

+          containment="true"/>

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminatorColumns"

+          upperBound="-1" eType="#//v2_3/XmlTenantDiscriminatorColumn_2_3" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredFunctionQueries"

+          upperBound="-1" eType="#//v2_3/XmlNamedStoredFunctionQuery_2_3" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredFunctionQueries"

+          upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredProcedureQueries"

+          upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlRecords" upperBound="-1"

+          eType="#//v2_3/XmlPlsqlRecord_2_3" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlTables" upperBound="-1"

+          eType="#//XmlPlsqlTable" containment="true"/>

+    </eClassifiers>

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

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredFunctionQueries"

+          upperBound="-1" eType="#//v2_3/XmlNamedStoredFunctionQuery_2_3" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredFunctionQueries"

+          upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredProcedureQueries"

+          upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlRecords" upperBound="-1"

+          eType="#//v2_3/XmlPlsqlRecord_2_3" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="plsqlTables" upperBound="-1"

+          eType="#//XmlPlsqlTable" containment="true"/>

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//v2_3/MultitenantType"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminatorColumns"

+          upperBound="-1" eType="#//v2_3/XmlTenantDiscriminatorColumn_2_3" containment="true"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="XmlNamedPlsqlStoredFunctionQuery_2_3"

+        abstract="true" interface="true">

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

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="XmlNamedPlsqlStoredProcedureQuery_2_3"

+        abstract="true" interface="true">

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminatorColumns"

+          upperBound="-1" eType="#//v2_3/XmlTenantDiscriminatorColumn_2_3" containment="true"/>

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

+        interface="true">

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

+    </eClassifiers>

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

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

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="XmlTenantDiscriminatorColumn_2_3"

+        abstract="true" interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlBaseDiscriminatorColumn">

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

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

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="primaryKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>

+    </eClassifiers>

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

+        interface="true"/>

+    <eClassifiers xsi:type="ecore:EEnum" name="MultitenantType">

+      <eLiterals name="SINGLE_TABLE"/>

+      <eLiterals name="TABLE_PER_TENANT" value="1" literal="TABLE_PER_TENANT"/>

+      <eLiterals name="VPD" value="2"/>

+    </eClassifiers>

+  </eSubpackages>

+  <eSubpackages name="v2_4" nsURI="jpt.eclipselink.orm.v2_4.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4">

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

+        eSuperTypes="#//v2_4/XmlGeneratorContainer2_4">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//v2_4/XmlField_2_4"

+          containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//v2_4/XmlCacheIndex_2_4"

+          containment="true"/>

+    </eClassifiers>

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

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="databaseChangeNotificationType"

+          eType="#//v2_4/DatabaseChangeNotificationType" defaultValueLiteral=""/>

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="columnNames" unique="false"

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

+    </eClassifiers>

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

+        interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlGeneratorContainer">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="uuidGenerator" eType="#//v2_4/XmlUuidGenerator_2_4"

+          containment="true"/>

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//v2_4/XmlField_2_4"

+          containment="true"/>

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

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="noSql" eType="#//v2_4/XmlNoSql_2_4"

+          containment="true"/>

+    </eClassifiers>

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//v2_4/XmlField_2_4"

+          containment="true"/>

+    </eClassifiers>

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

+        eSuperTypes="#//v2_4/XmlGeneratorContainer2_4">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//v2_4/XmlCacheIndex_2_4"

+          containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="noSql" eType="#//v2_4/XmlNoSql_2_4"

+          containment="true"/>

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="uuidGenerators" upperBound="-1"

+          eType="#//v2_4/XmlUuidGenerator_2_4" containment="true"/>

+    </eClassifiers>

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

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

+    </eClassifiers>

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

+        eSuperTypes="#//v2_4/XmlGeneratorContainer2_4">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//v2_4/XmlField_2_4"

+          containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//v2_4/XmlCacheIndex_2_4"

+          containment="true"/>

+    </eClassifiers>

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

+        interface="true">

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

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="referencedFieldName"

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

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="joinFields" upperBound="-1"

+          eType="#//v2_4/XmlJoinField_2_4" containment="true"/>

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="joinFields" upperBound="-1"

+          eType="#//v2_4/XmlJoinField_2_4" containment="true"/>

+    </eClassifiers>

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

+        interface="true" eSuperTypes="#//v2_4/XmlGeneratorContainer2_4">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//v2_4/XmlCacheIndex_2_4"

+          containment="true"/>

+    </eClassifiers>

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

+        interface="true">

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="tenantTableDiscriminator"

+          eType="#//v2_4/XmlTenantTableDiscriminator_2_4" containment="true"/>

+    </eClassifiers>

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

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

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataFormat" eType="#//v2_4/DataFormatType"

+          defaultValueLiteral=""/>

+    </eClassifiers>

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

+        interface="true">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="joinFields" upperBound="-1"

+          eType="#//v2_4/XmlJoinField_2_4" containment="true"/>

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

+    </eClassifiers>

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="joinFields" upperBound="-1"

+          eType="#//v2_4/XmlJoinField_2_4" containment="true"/>

+    </eClassifiers>

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

+        interface="true">

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

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//v2_4/TenantTableDiscriminatorType"/>

+    </eClassifiers>

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

+        interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlGenerator"/>

+    <eClassifiers xsi:type="ecore:EEnum" name="DatabaseChangeNotificationType">

+      <eLiterals name="NONE"/>

+      <eLiterals name="INVALIDATION" value="1" literal="INVALIDATION"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EEnum" name="TenantTableDiscriminatorType">

+      <eLiterals name="SCHEMA"/>

+      <eLiterals name="SUFFIX" value="1" literal="SUFFIX"/>

+      <eLiterals name="PREFIX" value="2"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EEnum" name="DataFormatType">

+      <eLiterals name="XML"/>

+      <eLiterals name="INDEXED" value="1" literal="INDEXED"/>

+      <eLiterals name="MAPPED" value="2"/>

+    </eClassifiers>

+  </eSubpackages>

+</ecore:EPackage>

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/EclipseLinkJpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/EclipseLinkJpaProject.java
index dff541d1e2..120ffcd84d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/EclipseLinkJpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/EclipseLinkJpaProject.java
@@ -9,8 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core;
 
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 
 /**
  * EclipseLink JPA project.
@@ -33,6 +33,6 @@ public interface EclipseLinkJpaProject
 	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings#DEFAULT_RUNTIME_PATH
 	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings#CONTENT_TYPE
 	 */
-	JpaXmlResource getDefaultEclipseLinkOrmXmlResource();
+	JptXmlResource getDefaultEclipseLinkOrmXmlResource();
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java
index 4d16305210..34b0b6dbf2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java
@@ -9,9 +9,9 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.internal;
 
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.internal.AbstractJpaProject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkJpaProject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings;
 
@@ -26,8 +26,8 @@ public class EclipseLinkJpaProjectImpl
 		super(config);
 	}
 	
-	public JpaXmlResource getDefaultEclipseLinkOrmXmlResource() {
-		return (JpaXmlResource) this.getResourceModel(
+	public JptXmlResource getDefaultEclipseLinkOrmXmlResource() {
+		return (JptXmlResource) this.getResourceModel(
 				XmlEntityMappings.DEFAULT_RUNTIME_PATH,
 				XmlEntityMappings.CONTENT_TYPE);
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java
index 8887127999..6bf4460f68 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java
@@ -11,9 +11,9 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.JpaResourceModelProvider;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.orm.EclipseLinkOrmXmlResourceProvider;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings;
 
@@ -47,7 +47,7 @@ public class EclipseLinkOrmResourceModelProvider
 		return XmlEntityMappings.CONTENT_TYPE;
 	}
 	
-	public JpaXmlResource buildResourceModel(JpaProject jpaProject, IFile file) {
+	public JptXmlResource buildResourceModel(JpaProject jpaProject, IFile file) {
 		return EclipseLinkOrmXmlResourceProvider.getXmlResourceProvider(file).getXmlResource();
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3Definition.java
index 5387a40af9..fde3a65afb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3Definition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3Definition.java
@@ -10,12 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlArray;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMappingDefinition.java
index d3bafb7689..7cae60377e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMappingDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMappingDefinition.java
@@ -10,12 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMappingDefinition.java
index de6f3372cc..986bc91334 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMappingDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMappingDefinition.java
@@ -10,12 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitMetadata.java
index c80019d987..e702234488 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitMetadata.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitMetadata.java
@@ -9,9 +9,9 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
 
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
 import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.AbstractOrmPersistenceUnitMetadata;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkPersistenceUnitDefaults;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3Definition.java
index 1bb4feb601..67a3ad6fca 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3Definition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3Definition.java
@@ -10,12 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructure;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMappingDefinition.java
index 09433a4f5f..6ff34224e4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMappingDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMappingDefinition.java
@@ -10,12 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransformation;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMappingDefinition.java
index 47b4d86172..a1043c7100 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMappingDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMappingDefinition.java
@@ -10,12 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.jpa.core.resource.xml.EmfTools;
 import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/AbstractEclipseLinkDDLGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/AbstractEclipseLinkDDLGenerator.java
index 22922d19ea..f69a89568c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/AbstractEclipseLinkDDLGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/AbstractEclipseLinkDDLGenerator.java
@@ -31,10 +31,10 @@ import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
 import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
 import org.eclipse.jpt.common.core.internal.gen.AbstractJptGenerator;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.JpaPlatform;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXmlEnumValue;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.db.ConnectionProfile;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Connection;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Customization;
@@ -324,13 +324,13 @@ public abstract class AbstractEclipseLinkDDLGenerator extends AbstractJptGenerat
 	}
 	
 	private IPath getMetaInfPath() {
-		JpaXmlResource persistenceXmlResource = this.jpaProject.getPersistenceXmlResource();
+		JptXmlResource persistenceXmlResource = this.jpaProject.getPersistenceXmlResource();
 		IPath persistenceXmlPath = persistenceXmlResource.getFile().getLocation();
 		return persistenceXmlPath.removeLastSegments(2);
 	}
 	
 	private boolean metaInfIsNotOnClasspath() {
-		JpaXmlResource persistenceXmlResource = this.jpaProject.getPersistenceXmlResource();
+		JptXmlResource persistenceXmlResource = this.jpaProject.getPersistenceXmlResource();
 		return ! this.jpaProject.getJavaProject().isOnClasspath(persistenceXmlResource.getFile());
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java
index 4ea778af34..45a1712ea2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java
@@ -10,8 +10,8 @@
 package org.eclipse.jpt.jpa.eclipselink.core.internal.operations;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.jpt.common.core.resource.xml.JpaXmlResourceProvider;
 import org.eclipse.jpt.jpa.core.internal.operations.OrmFileCreationOperation;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResourceProvider;
 import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.orm.EclipseLinkOrmXmlResourceProvider;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java
index d2d9511e38..10e19b307e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java
@@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.orm;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.jpt.common.core.internal.resource.xml.AbstractJptXmlResourceProvider;
 import org.eclipse.jpt.jpa.core.internal.operations.OrmFileCreationDataModelProperties;
-import org.eclipse.jpt.jpa.core.internal.resource.xml.AbstractJpaXmlResourceProvider;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitDefaults;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitMetadata;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
@@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
 public class EclipseLinkOrmXmlResourceProvider
-	extends AbstractJpaXmlResourceProvider
+	extends AbstractJptXmlResourceProvider
 	implements OrmFileCreationDataModelProperties
 {
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/Attributes.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/Attributes.java
index 94e3902367..9bdba300c6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/Attributes.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/Attributes.java
@@ -20,10 +20,6 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
 import org.eclipse.jpt.common.utility.internal.CollectionTools;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
@@ -31,6 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLink2_0;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
index 9b70592b72..d32e56acfc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
@@ -18,7 +18,6 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
@@ -8302,7 +8301,6 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 
 		// Initialize simple dependencies
 		OrmPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
 		XMLTypePackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java
index ce0b3e6aed..8f4a8e4797 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.wst.common.internal.emf.resource.Renderer;
 import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
 import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
@@ -46,6 +46,6 @@ public class EclipseLinkOrmXmlResourceFactory extends TranslatorResourceFactory
 	 */
 	@Override
 	protected TranslatorResource createResource(URI uri, Renderer renderer) {
-		return new JpaXmlResource(uri, renderer, XmlEntityMappings.CONTENT_TYPE, XmlEntityMappings.getRootTranslator());
+		return new JptXmlResource(uri, renderer, XmlEntityMappings.CONTENT_TYPE, XmlEntityMappings.getRootTranslator());
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethods.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethods.java
index afbd13c1f4..b182071e80 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethods.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethods.java
@@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -41,10 +41,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethods()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlAccessMethods extends AbstractJpaEObject implements JpaEObject
+public class XmlAccessMethods extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getGetMethod() <em>Get Method</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethodsHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethodsHolder.java
index 6e33a0f918..f9a0f86ad2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethodsHolder.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethodsHolder.java
@@ -10,7 +10,7 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -26,10 +26,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlAccessMethodsHolder extends JpaEObject
+public interface XmlAccessMethodsHolder extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAdditionalCriteria.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAdditionalCriteria.java
index 15d23edb6f..271ba4bad0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAdditionalCriteria.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAdditionalCriteria.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlAdditionalCriteria_2_2;
@@ -36,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlAdditionalCriteria extends AbstractJpaEObject implements XmlAdditionalCriteria_2_2
+public class XmlAdditionalCriteria extends EBaseObjectImpl implements XmlAdditionalCriteria_2_2
 {
 	/**
 	 * The default value of the '{@link #getCriteria() <em>Criteria</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetch.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetch.java
index a7301e857d..ff340763ed 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetch.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetch.java
@@ -10,15 +10,11 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
@@ -44,7 +40,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlBatchFetch extends AbstractJpaEObject implements XmlBatchFetch_2_1
+public class XmlBatchFetch extends EBaseObjectImpl implements XmlBatchFetch_2_1
 {
 	/**
 	 * The default value of the '{@link #getSize() <em>Size</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetchHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetchHolder.java
index a1b6747965..5b85c75e01 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetchHolder.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetchHolder.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,10 +34,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlBatchFetchHolder extends JpaEObject
+public interface XmlBatchFetchHolder extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Batch Fetch</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCache.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCache.java
index 3577450bd2..ad410d4553 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCache.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCache.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.CacheIsolationType;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
@@ -63,7 +63,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlCache extends AbstractJpaEObject implements XmlCache_2_2, XmlCache_2_4
+public class XmlCache extends EBaseObjectImpl implements XmlCache_2_2, XmlCache_2_4
 {
 	/**
 	 * changed this to null and removed the generated flag so emf won't generate over it
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheHolder.java
index f0a5c0de09..540fd14e25 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheHolder.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheHolder.java
@@ -10,7 +10,7 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -38,10 +38,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlCacheHolder extends JpaEObject
+public interface XmlCacheHolder extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Cache</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheIndex.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheIndex.java
index aa252f224c..48484bade5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheIndex.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheIndex.java
@@ -11,17 +11,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import java.util.Collection;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.util.EDataTypeEList;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCacheIndex_2_4;
@@ -37,7 +32,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlCacheIndex extends AbstractJpaEObject implements XmlCacheIndex_2_4
+public class XmlCacheIndex extends EBaseObjectImpl implements XmlCacheIndex_2_4
 {
 	/**
 	 * The cached value of the '{@link #getColumnNames() <em>Column Names</em>}' attribute list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTracking.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTracking.java
index e82bb7751e..5efa7df2bc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTracking.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTracking.java
@@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -44,10 +44,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTracking()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlChangeTracking extends AbstractJpaEObject implements JpaEObject
+public class XmlChangeTracking extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * changed this to null and removed the generated flag so emf won't generate over it
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTrackingHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTrackingHolder.java
index 3144406326..53c62a6e36 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTrackingHolder.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTrackingHolder.java
@@ -10,7 +10,7 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,10 +37,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingHolder()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlChangeTrackingHolder extends JpaEObject
+public interface XmlChangeTrackingHolder extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Change Tracking</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCloneCopyPolicy.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCloneCopyPolicy.java
index 772affa448..63a7eacc37 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCloneCopyPolicy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCloneCopyPolicy.java
@@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -44,10 +44,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCloneCopyPolicy()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlCloneCopyPolicy extends AbstractJpaEObject implements JpaEObject
+public class XmlCloneCopyPolicy extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getMethod() <em>Method</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCollectionTable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCollectionTable.java
index ec331f1139..cd7b4d6aab 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCollectionTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCollectionTable.java
@@ -10,12 +10,9 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConversionValue.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConversionValue.java
index d746c9261e..28d7535bd6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConversionValue.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConversionValue.java
@@ -15,9 +15,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -46,10 +46,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlConversionValue extends AbstractJpaEObject implements JpaEObject
+public class XmlConversionValue extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getDataValue() <em>Data Value</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverterContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverterContainer.java
index 17fa83b728..52643b9daf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverterContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverterContainer.java
@@ -11,7 +11,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -41,10 +41,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterContainer()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlConverterContainer extends JpaEObject
+public interface XmlConverterContainer extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Converters</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCopyPolicy.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCopyPolicy.java
index 9b21b431a1..aa05d6bb09 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCopyPolicy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCopyPolicy.java
@@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -43,10 +43,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCopyPolicy()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlCopyPolicy extends AbstractJpaEObject implements JpaEObject
+public class XmlCopyPolicy extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizer.java
index 89c35476dd..d842b4d633 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizer.java
@@ -10,13 +10,10 @@
 package org.eclipse.jpt.jpa.eclipselink.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.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 
 /**
  * <!-- begin-user-doc -->
@@ -41,10 +38,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizer()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlCustomizer extends AbstractJpaEObject implements JpaEObject
+public class XmlCustomizer extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getCustomizerClassName() <em>Customizer Class Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizerHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizerHolder.java
index 65349782cb..2cf21f0117 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizerHolder.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizerHolder.java
@@ -10,8 +10,8 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -38,10 +38,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlCustomizerHolder extends JpaEObject
+public interface XmlCustomizerHolder extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Customizer</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java
index 7c1634c716..3db0beade3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java
@@ -20,13 +20,13 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.utility.TextRange;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbedded_2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
-import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java
index a2f8b6000f..cc3bbe914c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java
@@ -52,6 +52,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPart
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3;
@@ -66,7 +67,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchAttribute.java
index 0a3bde590a..fe964a2c0e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchAttribute.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1;
@@ -32,7 +32,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlFetchAttribute extends AbstractJpaEObject implements XmlFetchAttribute_2_1
+public class XmlFetchAttribute extends EBaseObjectImpl implements XmlFetchAttribute_2_1
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchGroup.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchGroup.java
index 292ffda1c6..d95739c98e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchGroup.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchGroup.java
@@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1;
@@ -39,7 +39,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlFetchGroup extends AbstractJpaEObject implements XmlFetchGroup_2_1
+public class XmlFetchGroup extends EBaseObjectImpl implements XmlFetchGroup_2_1
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlField.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlField.java
index 1d4dc2d5c4..cc9ed7f17f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlField.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlField.java
@@ -10,16 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlField extends AbstractJpaEObject implements XmlField_2_4
+public class XmlField extends EBaseObjectImpl implements XmlField_2_4
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlHashPartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlHashPartitioning.java
index 0a4f63c6ae..a3b5f4b7fc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlHashPartitioning.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlHashPartitioning.java
@@ -10,16 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlHashPartitioning extends AbstractJpaEObject implements XmlHashPartitioning_2_2
+public class XmlHashPartitioning extends EBaseObjectImpl implements XmlHashPartitioning_2_2
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlIndex.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlIndex.java
index 35a950e5b4..8bd9c1cbd4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlIndex.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlIndex.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EDataTypeEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.BooleanTranslator;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2;
@@ -40,7 +40,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlIndex extends AbstractJpaEObject implements XmlIndex_2_2
+public class XmlIndex extends EBaseObjectImpl implements XmlIndex_2_2
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlInstantiationCopyPolicy.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlInstantiationCopyPolicy.java
index 6b87d945a7..5a1597012e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlInstantiationCopyPolicy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlInstantiationCopyPolicy.java
@@ -13,8 +13,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -35,10 +35,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlInstantiationCopyPolicy()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlInstantiationCopyPolicy extends AbstractJpaEObject implements JpaEObject
+public class XmlInstantiationCopyPolicy extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinFetch.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinFetch.java
index ff86a6f6a6..9135955dd6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinFetch.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinFetch.java
@@ -10,8 +10,8 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -38,10 +38,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlJoinFetch extends JpaEObject
+public interface XmlJoinFetch extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Join Fetch</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinField.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinField.java
index 92cb8d0b17..c1904bf79c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinField.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinField.java
@@ -10,15 +10,11 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4;
@@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlJoinField extends AbstractJpaEObject implements XmlJoinField_2_4
+public class XmlJoinField extends EBaseObjectImpl implements XmlJoinField_2_4
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinTable.java
index dae31a93cf..2130b58880 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinTable.java
@@ -10,12 +10,9 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java
index 85691e246a..721b00a218 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java
@@ -20,6 +20,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.jpt.common.core.internal.utility.translators.EmptyTagBooleanTranslator;
+import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
@@ -40,9 +43,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToOne_2_4;
-import org.eclipse.jpt.common.core.internal.utility.translators.EmptyTagBooleanTranslator;
-import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java
index 38145dc5ac..7428a0a52e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java
@@ -62,6 +62,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPart
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3;
@@ -74,7 +75,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCacheIndex_2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java
index 570a636fcd..d5d3206ee7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java
@@ -20,11 +20,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4;
@@ -43,7 +43,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlMultitenant extends AbstractJpaEObject implements XmlMultitenant_2_3, XmlMultitenant_2_4
+public class XmlMultitenant extends EBaseObjectImpl implements XmlMultitenant_2_3, XmlMultitenant_2_4
 {
 	/**
 	 * changed this to null and removed the generated flag so emf won't generate over it
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenantHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenantHolder.java
index 02bcea382f..6ee8fbd001 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenantHolder.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenantHolder.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMultitenantHolder()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlMultitenantHolder extends JpaEObject
+public interface XmlMultitenantHolder extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Multitenant</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMutable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMutable.java
index 8d79dbdb82..59bbc606c6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMutable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMutable.java
@@ -10,8 +10,8 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -38,10 +38,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMutable()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlMutable extends JpaEObject
+public interface XmlMutable extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Mutable</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedConverter.java
index 04602b05dc..7dfa55f740 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedConverter.java
@@ -13,10 +13,10 @@ package org.eclipse.jpt.jpa.eclipselink.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.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -44,10 +44,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlNamedConverter extends AbstractJpaEObject implements JpaEObject
+public class XmlNamedConverter extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredFunctionQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredFunctionQuery.java
index d408d33c2a..964ad620ba 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredFunctionQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredFunctionQuery.java
@@ -11,12 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.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.emf.ecore.EStructuralFeature;
-
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3;
@@ -32,7 +30,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlNamedPlsqlStoredFunctionQuery extends AbstractJpaEObject implements XmlNamedPlsqlStoredFunctionQuery_2_3
+public class XmlNamedPlsqlStoredFunctionQuery extends EBaseObjectImpl implements XmlNamedPlsqlStoredFunctionQuery_2_3
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredProcedureQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredProcedureQuery.java
index 50af5ce82d..557b97030e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredProcedureQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredProcedureQuery.java
@@ -11,12 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.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.emf.ecore.EStructuralFeature;
-
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3;
@@ -32,7 +30,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlNamedPlsqlStoredProcedureQuery extends AbstractJpaEObject implements XmlNamedPlsqlStoredProcedureQuery_2_3
+public class XmlNamedPlsqlStoredProcedureQuery extends EBaseObjectImpl implements XmlNamedPlsqlStoredProcedureQuery_2_3
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredFunctionQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredFunctionQuery.java
index 771ec817ce..23c00d1da0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredFunctionQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredFunctionQuery.java
@@ -11,12 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.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.emf.ecore.EStructuralFeature;
-
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3;
@@ -32,7 +30,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlNamedStoredFunctionQuery extends AbstractJpaEObject implements XmlNamedStoredFunctionQuery_2_3
+public class XmlNamedStoredFunctionQuery extends EBaseObjectImpl implements XmlNamedStoredFunctionQuery_2_3
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredProcedureQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredProcedureQuery.java
index 12be339a21..17b66966d9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredProcedureQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredProcedureQuery.java
@@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 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.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlQueryHint;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -57,10 +57,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlNamedStoredProcedureQuery extends AbstractJpaEObject implements JpaEObject
+public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java
index 16eb311484..1e87b64d5b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java
@@ -10,15 +10,11 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DataFormatType;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package;
@@ -35,7 +31,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlNoSql extends AbstractJpaEObject implements XmlNoSql_2_4
+public class XmlNoSql extends EBaseObjectImpl implements XmlNoSql_2_4
 {
 	/**
 	 * The default value of the '{@link #getDataType() <em>Data Type</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java
index 2729911d8c..b94f1fe3bc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java
@@ -20,6 +20,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.jpt.common.core.internal.utility.translators.EmptyTagBooleanTranslator;
+import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.jpa.core.resource.orm.CascadeType;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
@@ -41,9 +44,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToOne_2_4;
-import org.eclipse.jpt.common.core.internal.utility.translators.EmptyTagBooleanTranslator;
-import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOptimisticLocking.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOptimisticLocking.java
index 2a10792549..a881f3c721 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOptimisticLocking.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOptimisticLocking.java
@@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 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.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -53,10 +53,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLocking()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlOptimisticLocking extends AbstractJpaEObject implements JpaEObject
+public class XmlOptimisticLocking extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * changed this to null and removed the generated flag so emf won't generate over it
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPartitioning.java
index 314ca5d908..be862dc95e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPartitioning.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPartitioning.java
@@ -10,16 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlPartitioning extends AbstractJpaEObject implements XmlPartitioning_2_2
+public class XmlPartitioning extends EBaseObjectImpl implements XmlPartitioning_2_2
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java
index 9dedcb8ce9..6e63a219d4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java
@@ -12,14 +12,11 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 import java.util.Collection;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPinnedPartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPinnedPartitioning.java
index 49d3b010cf..b34b9182cb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPinnedPartitioning.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPinnedPartitioning.java
@@ -10,16 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlPinnedPartitioning extends AbstractJpaEObject implements XmlPinnedPartitioning_2_2
+public class XmlPinnedPartitioning extends EBaseObjectImpl implements XmlPinnedPartitioning_2_2
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlRecord.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlRecord.java
index 0e11f9a16e..28674465bd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlRecord.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlRecord.java
@@ -11,12 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.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.emf.ecore.EStructuralFeature;
-
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3;
@@ -32,7 +30,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlPlsqlRecord extends AbstractJpaEObject implements XmlPlsqlRecord_2_3
+public class XmlPlsqlRecord extends EBaseObjectImpl implements XmlPlsqlRecord_2_3
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlTable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlTable.java
index 9933871f4d..172b8fbef1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlTable.java
@@ -11,12 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.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.emf.ecore.EStructuralFeature;
-
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlTable_2_3;
@@ -32,7 +30,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlPlsqlTable extends AbstractJpaEObject implements XmlPlsqlTable_2_3
+public class XmlPlsqlTable extends EBaseObjectImpl implements XmlPlsqlTable_2_3
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrimaryKey.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrimaryKey.java
index 6344aa61f3..86f48d051a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrimaryKey.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrimaryKey.java
@@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLink1_1;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1;
@@ -44,7 +44,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1_1, XmlPrimaryKey_2_1
+public class XmlPrimaryKey extends EBaseObjectImpl implements XmlPrimaryKey_1_1, XmlPrimaryKey_2_1
 {
 	/**
 	 * changed this to null and removed the generated flag so emf won't generate over it
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrivateOwned.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrivateOwned.java
index 98d1914012..0b2f753406 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrivateOwned.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrivateOwned.java
@@ -10,8 +10,8 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -38,10 +38,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrivateOwned()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlPrivateOwned extends JpaEObject
+public interface XmlPrivateOwned extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Private Owned</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlProperty.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlProperty.java
index 7b064d3e1b..e609273886 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlProperty.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlProperty.java
@@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -35,10 +35,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlProperty()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlProperty extends AbstractJpaEObject implements JpaEObject
+public class XmlProperty extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPropertyContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPropertyContainer.java
index 3eba00d2c0..d2c419a670 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPropertyContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPropertyContainer.java
@@ -11,7 +11,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlPropertyContainer extends JpaEObject
+public interface XmlPropertyContainer extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryContainer.java
index 4afab0cb94..57b9cc346c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryContainer.java
@@ -11,7 +11,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlQueryContainer extends JpaEObject
+public interface XmlQueryContainer extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryRedirectors.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryRedirectors.java
index a2b1e96876..169a0b4a97 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryRedirectors.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryRedirectors.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLink2_0;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0;
@@ -36,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlQueryRedirectors extends AbstractJpaEObject implements XmlQueryRedirectors_2_0
+public class XmlQueryRedirectors extends EBaseObjectImpl implements XmlQueryRedirectors_2_0
 {
 	/**
 	 * The default value of the '{@link #getAllQueries() <em>All Queries</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRangePartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRangePartitioning.java
index b168ad07ef..49377aef3c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRangePartitioning.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRangePartitioning.java
@@ -10,16 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlRangePartitioning extends AbstractJpaEObject implements XmlRangePartitioning_2_2
+public class XmlRangePartitioning extends EBaseObjectImpl implements XmlRangePartitioning_2_2
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReadOnly.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReadOnly.java
index b4f928abf0..899e07a833 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReadOnly.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReadOnly.java
@@ -10,8 +10,8 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -38,10 +38,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReadOnly()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlReadOnly extends JpaEObject
+public interface XmlReadOnly extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Read Only</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReplicationPartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReplicationPartitioning.java
index 14607841ff..0331fb455e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReplicationPartitioning.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReplicationPartitioning.java
@@ -10,16 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlReplicationPartitioning extends AbstractJpaEObject implements XmlReplicationPartitioning_2_2
+public class XmlReplicationPartitioning extends EBaseObjectImpl implements XmlReplicationPartitioning_2_2
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReturnInsert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReturnInsert.java
index 0762f0007a..5ad7b59c8c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReturnInsert.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReturnInsert.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1;
@@ -32,7 +32,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlReturnInsert extends AbstractJpaEObject implements XmlReturnInsert_2_1
+public class XmlReturnInsert extends EBaseObjectImpl implements XmlReturnInsert_2_1
 {
 	/**
 	 * The default value of the '{@link #getReturnOnly() <em>Return Only</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRoundRobinPartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRoundRobinPartitioning.java
index d67d354ab8..d3cf18d9a8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRoundRobinPartitioning.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRoundRobinPartitioning.java
@@ -10,16 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlRoundRobinPartitioning extends AbstractJpaEObject implements XmlRoundRobinPartitioning_2_2
+public class XmlRoundRobinPartitioning extends EBaseObjectImpl implements XmlRoundRobinPartitioning_2_2
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlSecondaryTable.java
index 502d043f47..3677138a76 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlSecondaryTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlSecondaryTable.java
@@ -10,12 +10,9 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStoredProcedureParameter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStoredProcedureParameter.java
index 4c219d0fc0..e7860def11 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStoredProcedureParameter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStoredProcedureParameter.java
@@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -48,10 +48,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlStoredProcedureParameter extends AbstractJpaEObject implements JpaEObject
+public class XmlStoredProcedureParameter extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * changed this to null and removed the generated flag so emf won't generate over it
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStruct.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStruct.java
index 498236b916..d9d26f679a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStruct.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStruct.java
@@ -11,12 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.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.emf.ecore.EStructuralFeature;
-
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3;
@@ -32,7 +30,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlStruct extends AbstractJpaEObject implements XmlStruct_2_3
+public class XmlStruct extends EBaseObjectImpl implements XmlStruct_2_3
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTable.java
index 33d9d07657..7edd8aecdb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTable.java
@@ -10,12 +10,9 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTableGenerator.java
index a314c639bb..115797dea8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTableGenerator.java
@@ -10,12 +10,9 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java
index abf699f18e..61428f87b5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java
@@ -10,15 +10,11 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.TenantTableDiscriminatorType;
@@ -41,7 +37,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlTenantTableDiscriminator extends AbstractJpaEObject implements XmlTenantTableDiscriminator_2_4
+public class XmlTenantTableDiscriminator extends EBaseObjectImpl implements XmlTenantTableDiscriminator_2_4
 {
 	/**
 	 * The default value of the '{@link #getContextProperty() <em>Context Property</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTimeOfDay.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTimeOfDay.java
index ea0c735488..c3cacc62bc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTimeOfDay.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTimeOfDay.java
@@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -47,10 +47,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTimeOfDay()
  * @model kind="class"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public class XmlTimeOfDay extends AbstractJpaEObject implements JpaEObject
+public class XmlTimeOfDay extends EBaseObjectImpl implements EBaseObject
 {
 	/**
 	 * The default value of the '{@link #getHour() <em>Hour</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUnionPartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUnionPartitioning.java
index 67b5c220b6..a6849ef0de 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUnionPartitioning.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUnionPartitioning.java
@@ -10,16 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlUnionPartitioning extends AbstractJpaEObject implements XmlUnionPartitioning_2_2
+public class XmlUnionPartitioning extends EBaseObjectImpl implements XmlUnionPartitioning_2_2
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUuidGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUuidGenerator.java
index 9cd432c2e9..e42a40df86 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUuidGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUuidGenerator.java
@@ -10,18 +10,14 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
@@ -41,7 +37,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlUuidGenerator extends AbstractJpaEObject implements XmlUuidGenerator_2_4
+public class XmlUuidGenerator extends EBaseObjectImpl implements XmlUuidGenerator_2_4
 {
 	/**
 	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlValuePartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlValuePartitioning.java
index e1782a71b4..9c94cfe0ab 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlValuePartitioning.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlValuePartitioning.java
@@ -10,16 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.JPA;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * @model kind="class"
  * @generated
  */
-public class XmlValuePartitioning extends AbstractJpaEObject implements XmlValuePartitioning_2_2
+public class XmlValuePartitioning extends EBaseObjectImpl implements XmlValuePartitioning_2_2
 {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java
index 42e5d8554d..2936907052 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java
@@ -18,7 +18,6 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
@@ -309,7 +308,6 @@ public class EclipseLinkOrmV1_1Package extends EPackageImpl
 
 		// Initialize simple dependencies
 		OrmPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
 		EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) instanceof EclipseLinkOrmPackage ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) : EclipseLinkOrmPackage.eINSTANCE);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlEntity_1_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlEntity_1_1.java
index 69bdd82004..b51c17d0d9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlEntity_1_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlEntity_1_1.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey;
 
 /**
@@ -28,10 +28,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlEntity_1_1()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlEntity_1_1 extends JpaEObject
+public interface XmlEntity_1_1 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Primary Key</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlMappedSuperclass_1_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlMappedSuperclass_1_1.java
index 7451f79963..424061e65e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlMappedSuperclass_1_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlMappedSuperclass_1_1.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey;
 
 /**
@@ -28,10 +28,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlMappedSuperclass_1_1()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlMappedSuperclass_1_1 extends JpaEObject
+public interface XmlMappedSuperclass_1_1 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Primary Key</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlPrimaryKey_1_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlPrimaryKey_1_1.java
index 8388ed1714..23c33b4f92 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlPrimaryKey_1_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlPrimaryKey_1_1.java
@@ -12,8 +12,8 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,10 +30,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlPrimaryKey_1_1()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlPrimaryKey_1_1 extends JpaEObject
+public interface XmlPrimaryKey_1_1 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Validation</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java
index a6c55ca98b..aee52d62c8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java
@@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
-import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
@@ -792,7 +791,6 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
 
 		// Initialize simple dependencies
 		OrmPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
 		XMLTypePackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlCacheInterceptor_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlCacheInterceptor_2_0.java
index 1c09a599ea..37b6a47e1f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlCacheInterceptor_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlCacheInterceptor_2_0.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCacheInterceptor_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlCacheInterceptor_2_0 extends JpaEObject
+public interface XmlCacheInterceptor_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java
index 142a7d844f..e19fa71c41 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java
@@ -9,8 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors;
 
 /**
@@ -34,10 +34,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlEntity_2_0 extends JpaEObject
+public interface XmlEntity_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Cache Interceptor</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java
index 5e56cca4f4..3b159b788b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java
@@ -11,8 +11,8 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,10 +34,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlMapKeyAssociationOverrideContainer_2_0 extends JpaEObject
+public interface XmlMapKeyAssociationOverrideContainer_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlOrderColumn_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlOrderColumn_2_0.java
index f7c5c71ed6..8e9198e48f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlOrderColumn_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlOrderColumn_2_0.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlOrderColumn_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlOrderColumn_2_0 extends JpaEObject
+public interface XmlOrderColumn_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Correction Type</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlQueryRedirectors_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlQueryRedirectors_2_0.java
index 38fa1162ce..04b3ba09e1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlQueryRedirectors_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlQueryRedirectors_2_0.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,10 +37,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlQueryRedirectors_2_0 extends JpaEObject
+public interface XmlQueryRedirectors_2_0 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>All Queries</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/BatchFetchType_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/BatchFetchType_2_1.java
index 6dda927b61..e78b22cf6c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/BatchFetchType_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/BatchFetchType_2_1.java
@@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java
index fa04a9fa08..6fda69f9a7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
@@ -935,7 +934,6 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
 
 		// Initialize simple dependencies
 		OrmPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
 		XMLTypePackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java
index 86e4709861..4237dbce41 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReturnInsert;
 
 /**
@@ -38,10 +38,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReturnInsert;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBasic_2_1()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlBasic_2_1 extends JpaEObject
+public interface XmlBasic_2_1 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Return Insert</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBatchFetch_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBatchFetch_2_1.java
index 24e9b3379c..473c2b3db2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBatchFetch_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBatchFetch_2_1.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,10 +35,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBatchFetch_2_1()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlBatchFetch_2_1 extends JpaEObject
+public interface XmlBatchFetch_2_1 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Size</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchAttribute_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchAttribute_2_1.java
index 82ccb4cde7..47b38a6cf6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchAttribute_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchAttribute_2_1.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchAttribute_2_1()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlFetchAttribute_2_1 extends JpaEObject
+public interface XmlFetchAttribute_2_1 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroupContainer_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroupContainer_2_1.java
index b3e8bf93cb..95c064b15d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroupContainer_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroupContainer_2_1.java
@@ -12,7 +12,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup;
 
 /**
@@ -29,10 +29,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroupContainer_2_1()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlFetchGroupContainer_2_1 extends JpaEObject
+public interface XmlFetchGroupContainer_2_1 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Fetch Groups</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java
index ce3e4dc0b1..087c94e5bb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java
@@ -12,7 +12,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchAttribute;
 
 /**
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchAttribute;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroup_2_1()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlFetchGroup_2_1 extends JpaEObject
+public interface XmlFetchGroup_2_1 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlPrimaryKey_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlPrimaryKey_2_1.java
index 0127f3b912..bb22ca63d9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlPrimaryKey_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlPrimaryKey_2_1.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPrimaryKey_2_1()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlPrimaryKey_2_1 extends JpaEObject
+public interface XmlPrimaryKey_2_1 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Cache Key Type</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlReturnInsert_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlReturnInsert_2_1.java
index f8fa5eb769..0f9bab794e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlReturnInsert_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlReturnInsert_2_1.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlReturnInsert_2_1()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlReturnInsert_2_1 extends JpaEObject
+public interface XmlReturnInsert_2_1 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Return Only</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/CacheIsolationType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/CacheIsolationType.java
index 74ad68e591..f5bd112b31 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/CacheIsolationType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/CacheIsolationType.java
@@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java
index e5d5def471..a4f3406524 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
@@ -2158,7 +2157,6 @@ public class EclipseLinkOrmV2_2Package extends EPackageImpl
 
 		// Initialize simple dependencies
 		OrmPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
 		XMLTypePackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlAdditionalCriteria_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlAdditionalCriteria_2_2.java
index 3b131f3abc..de597db897 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlAdditionalCriteria_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlAdditionalCriteria_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlAdditionalCriteria_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlAdditionalCriteria_2_2 extends JpaEObject
+public interface XmlAdditionalCriteria_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Criteria</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicCollection_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicCollection_2_2.java
index af8f99d010..20feb48696 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicCollection_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicCollection_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasicCollection_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlBasicCollection_2_2 extends JpaEObject
+public interface XmlBasicCollection_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicMap_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicMap_2_2.java
index 1fccc92fe3..73a06d367a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicMap_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicMap_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasicMap_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlBasicMap_2_2 extends JpaEObject
+public interface XmlBasicMap_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasic_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasic_2_2.java
index 6eb2e28aca..feace3b390 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasic_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasic_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasic_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlBasic_2_2 extends JpaEObject
+public interface XmlBasic_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Index</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCache_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCache_2_2.java
index a51a7c9920..28d4920f16 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCache_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCache_2_2.java
@@ -9,7 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlCache_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlCache_2_2 extends JpaEObject
+public interface XmlCache_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Isolation</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCollectionTable_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCollectionTable_2_2.java
index 87dab02df6..eab08a3c20 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCollectionTable_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCollectionTable_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlCollectionTable_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlCollectionTable_2_2 extends JpaEObject
+public interface XmlCollectionTable_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntityMappings_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntityMappings_2_2.java
index cb303b5216..045a1f641e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntityMappings_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntityMappings_2_2.java
@@ -10,8 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -40,10 +39,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntityMappings_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlEntityMappings_2_2 extends JpaEObject
+public interface XmlEntityMappings_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Partitioning</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlHashPartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlHashPartitioning_2_2.java
index b5535220e4..cd47030e39 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlHashPartitioning_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlHashPartitioning_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlHashPartitioning_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlHashPartitioning_2_2 extends JpaEObject
+public interface XmlHashPartitioning_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlId_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlId_2_2.java
index c0e2b70fc3..a050ed4f88 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlId_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlId_2_2.java
@@ -6,7 +6,7 @@
  */
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -22,10 +22,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlId_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlId_2_2 extends JpaEObject
+public interface XmlId_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Index</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlIndex_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlIndex_2_2.java
index 98d259385b..e5655267cd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlIndex_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlIndex_2_2.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,10 +37,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlIndex_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlIndex_2_2 extends JpaEObject
+public interface XmlIndex_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlJoinTable_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlJoinTable_2_2.java
index 33db965771..ebbe99588d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlJoinTable_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlJoinTable_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlJoinTable_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlJoinTable_2_2 extends JpaEObject
+public interface XmlJoinTable_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioningGroup_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioningGroup_2_2.java
index 30dbd3998c..7ea0d3b99d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioningGroup_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioningGroup_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -39,10 +39,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlPartitioningGroup_2_2 extends JpaEObject
+public interface XmlPartitioningGroup_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Partitioning</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioning_2_2.java
index c11826e163..6d19a4c8c8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioning_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioning_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioning_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlPartitioning_2_2 extends JpaEObject
+public interface XmlPartitioning_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPinnedPartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPinnedPartitioning_2_2.java
index 4ff0d03d03..c0fccc9307 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPinnedPartitioning_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPinnedPartitioning_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPinnedPartitioning_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlPinnedPartitioning_2_2 extends JpaEObject
+public interface XmlPinnedPartitioning_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRangePartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRangePartitioning_2_2.java
index 526a939fe6..f49202986f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRangePartitioning_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRangePartitioning_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlRangePartitioning_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlRangePartitioning_2_2 extends JpaEObject
+public interface XmlRangePartitioning_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlReplicationPartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlReplicationPartitioning_2_2.java
index 536dd2597c..f370f84296 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlReplicationPartitioning_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlReplicationPartitioning_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlReplicationPartitioning_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlReplicationPartitioning_2_2 extends JpaEObject
+public interface XmlReplicationPartitioning_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRoundRobinPartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRoundRobinPartitioning_2_2.java
index 7a2bb0f9d5..b05a6c08cc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRoundRobinPartitioning_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRoundRobinPartitioning_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlRoundRobinPartitioning_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlRoundRobinPartitioning_2_2 extends JpaEObject
+public interface XmlRoundRobinPartitioning_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlSecondaryTable_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlSecondaryTable_2_2.java
index 860e82acf4..55c987bdcf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlSecondaryTable_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlSecondaryTable_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlSecondaryTable_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlSecondaryTable_2_2 extends JpaEObject
+public interface XmlSecondaryTable_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTableGenerator_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTableGenerator_2_2.java
index 6fde551d1d..f46b30bc5c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTableGenerator_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTableGenerator_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlTableGenerator_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlTableGenerator_2_2 extends JpaEObject
+public interface XmlTableGenerator_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTable_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTable_2_2.java
index 4a620143e3..b7dcac9582 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTable_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTable_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlTable_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlTable_2_2 extends JpaEObject
+public interface XmlTable_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlUnionPartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlUnionPartitioning_2_2.java
index 23926069ff..a691c7e9a6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlUnionPartitioning_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlUnionPartitioning_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlUnionPartitioning_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlUnionPartitioning_2_2 extends JpaEObject
+public interface XmlUnionPartitioning_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlValuePartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlValuePartitioning_2_2.java
index 6871869bb0..706f813f40 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlValuePartitioning_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlValuePartitioning_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlValuePartitioning_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlValuePartitioning_2_2 extends JpaEObject
+public interface XmlValuePartitioning_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVersion_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVersion_2_2.java
index 6b92520779..405c5cd841 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVersion_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVersion_2_2.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlVersion_2_2()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlVersion_2_2 extends JpaEObject
+public interface XmlVersion_2_2 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Index</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Factory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Factory.java
index a9cb1f678f..2196e070c1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Factory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Factory.java
@@ -13,9 +13,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java
index 48ac7bba13..a881ca63c1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
@@ -1042,7 +1041,6 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
 
 		// Initialize simple dependencies
 		OrmPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
 		XMLTypePackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/MultitenantType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/MultitenantType.java
index c963c264f2..cfcf92e38e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/MultitenantType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/MultitenantType.java
@@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlAttributes_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlAttributes_2_3.java
index 91905162a2..0f09d7526c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlAttributes_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlAttributes_2_3.java
@@ -10,8 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlAttributes_2_3()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlAttributes_2_3 extends JpaEObject
+public interface XmlAttributes_2_3 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Structures</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlElementCollection_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlElementCollection_2_3.java
index f098a869f3..1be52a1428 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlElementCollection_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlElementCollection_2_3.java
@@ -6,7 +6,7 @@
  */
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -22,10 +22,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlElementCollection_2_3()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlElementCollection_2_3 extends JpaEObject
+public interface XmlElementCollection_2_3 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Composite Member</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEmbeddable_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEmbeddable_2_3.java
index 51e4eb93a9..3e38e7b41a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEmbeddable_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEmbeddable_2_3.java
@@ -10,9 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable;
 
 /**
@@ -31,10 +29,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEmbeddable_2_3()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlEmbeddable_2_3 extends JpaEObject
+public interface XmlEmbeddable_2_3 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java
index 9c1ddf28bd..68c1a8694e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java
@@ -10,8 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable;
 
 /**
@@ -33,10 +32,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntityMappings_2_3()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlEntityMappings_2_3 extends JpaEObject
+public interface XmlEntityMappings_2_3 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMultitenant_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMultitenant_2_3.java
index 907e1e1000..ca297b7065 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMultitenant_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMultitenant_2_3.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMultitenant_2_3()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlMultitenant_2_3 extends JpaEObject
+public interface XmlMultitenant_2_3 extends EBaseObject
 {
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3.java
index 6cd2cf408d..96b6083049 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3.java
@@ -9,7 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedPlsqlStoredFunctionQuery_2_3()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlNamedPlsqlStoredFunctionQuery_2_3 extends JpaEObject
+public interface XmlNamedPlsqlStoredFunctionQuery_2_3 extends EBaseObject
 {
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3.java
index f4ffe08590..c32a8622f2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3.java
@@ -9,7 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedPlsqlStoredProcedureQuery_2_3()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlNamedPlsqlStoredProcedureQuery_2_3 extends JpaEObject
+public interface XmlNamedPlsqlStoredProcedureQuery_2_3 extends EBaseObject
 {
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedStoredFunctionQuery_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedStoredFunctionQuery_2_3.java
index 6d5b9b62d0..cf016f7a05 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedStoredFunctionQuery_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedStoredFunctionQuery_2_3.java
@@ -9,7 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedStoredFunctionQuery_2_3()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlNamedStoredFunctionQuery_2_3 extends JpaEObject
+public interface XmlNamedStoredFunctionQuery_2_3 extends EBaseObject
 {
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java
index e63726e7f6..a133f3e816 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java
@@ -10,8 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +26,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPersistenceUnitDefaults_2_3()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlPersistenceUnitDefaults_2_3 extends JpaEObject
+public interface XmlPersistenceUnitDefaults_2_3 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlRecord_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlRecord_2_3.java
index 19892e1459..c05aa9b9e6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlRecord_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlRecord_2_3.java
@@ -9,7 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPlsqlRecord_2_3()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlPlsqlRecord_2_3 extends JpaEObject
+public interface XmlPlsqlRecord_2_3 extends EBaseObject
 {
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlTable_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlTable_2_3.java
index 254d000c31..12860f6ce7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlTable_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlTable_2_3.java
@@ -9,7 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPlsqlTable_2_3()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlPlsqlTable_2_3 extends JpaEObject
+public interface XmlPlsqlTable_2_3 extends EBaseObject
 {
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStruct_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStruct_2_3.java
index 9cd71de2f8..30eb4757bd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStruct_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStruct_2_3.java
@@ -9,7 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlStruct_2_3()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlStruct_2_3 extends JpaEObject
+public interface XmlStruct_2_3 extends EBaseObject
 {
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStructure_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStructure_2_3.java
index 8447e700b9..1399fa4294 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStructure_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStructure_2_3.java
@@ -9,7 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -19,9 +19,9 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlStructure_2_3()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlStructure_2_3 extends JpaEObject
+public interface XmlStructure_2_3 extends EBaseObject
 {
 } // XmlStructure_2_3
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DataFormatType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DataFormatType.java
index 2a588af4a0..a59c903805 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DataFormatType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DataFormatType.java
@@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DatabaseChangeNotificationType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DatabaseChangeNotificationType.java
index d293742434..a6ef71bc7e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DatabaseChangeNotificationType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DatabaseChangeNotificationType.java
@@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Factory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Factory.java
index 97c342d0dc..0d0692a68b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Factory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Factory.java
@@ -13,9 +13,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java
index 84fe15f016..72c07a6d03 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java
@@ -13,26 +13,15 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
 import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
-
-import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage;
-
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
-
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package;
-
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
-
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
-
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
-
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
 
 /**
@@ -1154,7 +1143,6 @@ public class EclipseLinkOrmV2_4Package extends EPackageImpl
 
 		// Initialize simple dependencies
 		OrmPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
 		XMLTypePackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/TenantTableDiscriminatorType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/TenantTableDiscriminatorType.java
index 704a165765..ec69ebbac1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/TenantTableDiscriminatorType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/TenantTableDiscriminatorType.java
@@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCacheIndex_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCacheIndex_2_4.java
index 86a129458b..f0cd90708f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCacheIndex_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCacheIndex_2_4.java
@@ -10,8 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +26,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlCacheIndex_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlCacheIndex_2_4 extends JpaEObject
+public interface XmlCacheIndex_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Column Names</b></em>' attribute list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCache_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCache_2_4.java
index 745c03b914..898398f334 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCache_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCache_2_4.java
@@ -9,7 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlCache_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlCache_2_4 extends JpaEObject
+public interface XmlCache_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Database Change Notification Type</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java
index a80f849b96..31ea975470 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java
@@ -9,7 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -26,10 +26,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlElementCollection_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlElementCollection_2_4 extends JpaEObject
+public interface XmlElementCollection_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Field</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java
index 52f46f96a8..a3b47b4d49 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEmbeddable_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlEmbeddable_2_4 extends JpaEObject
+public interface XmlEmbeddable_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>No Sql</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java
index 766c11e42f..6013ce4e48 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEmbedded_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlEmbedded_2_4 extends JpaEObject
+public interface XmlEmbedded_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Field</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntityMappings_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntityMappings_2_4.java
index 43f0ed2425..9c16a12166 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntityMappings_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntityMappings_2_4.java
@@ -10,8 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEntityMappings_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlEntityMappings_2_4 extends JpaEObject
+public interface XmlEntityMappings_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Uuid Generators</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlField_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlField_2_4.java
index 2b1bf3ec73..62a25fe915 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlField_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlField_2_4.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlField_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlField_2_4 extends JpaEObject
+public interface XmlField_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlJoinField_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlJoinField_2_4.java
index 20aab2a4a6..3cbff96f89 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlJoinField_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlJoinField_2_4.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -32,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlJoinField_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlJoinField_2_4 extends JpaEObject
+public interface XmlJoinField_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java
index 8eee22ccda..ef14af273f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java
@@ -10,8 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlManyToMany_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlManyToMany_2_4 extends JpaEObject
+public interface XmlManyToMany_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Join Fields</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java
index 8cdc7e6342..0a9a5a5332 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java
@@ -10,8 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlManyToOne_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlManyToOne_2_4 extends JpaEObject
+public interface XmlManyToOne_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Join Fields</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java
index 81609e2c33..d75c4eb93f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java
@@ -9,8 +9,8 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMultitenant_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlMultitenant_2_4 extends JpaEObject
+public interface XmlMultitenant_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Include Criteria</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlNoSql_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlNoSql_2_4.java
index 9e4134afa3..05c8cb79ba 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlNoSql_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlNoSql_2_4.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -32,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlNoSql_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlNoSql_2_4 extends JpaEObject
+public interface XmlNoSql_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Data Type</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java
index 98f3c64c13..190b9ddcd0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlOneToMany_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlOneToMany_2_4 extends JpaEObject
+public interface XmlOneToMany_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Join Fields</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java
index a494caf623..dc2a7d91e8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java
@@ -10,8 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlOneToOne_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlOneToOne_2_4 extends JpaEObject
+public interface XmlOneToOne_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Join Fields</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlTenantTableDiscriminator_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlTenantTableDiscriminator_2_4.java
index 0612c99807..864672709e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlTenantTableDiscriminator_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlTenantTableDiscriminator_2_4.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
 
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -32,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
  *
  * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlTenantTableDiscriminator_2_4()
  * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
+ * @extends EBaseObject
  * @generated
  */
-public interface XmlTenantTableDiscriminator_2_4 extends JpaEObject
+public interface XmlTenantTableDiscriminator_2_4 extends EBaseObject
 {
 	/**
 	 * Returns the value of the '<em><b>Context Property</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/entity/data/model/DynamicEntityDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/entity/data/model/DynamicEntityDataModelProvider.java
index bd36d9bfa7..371135ab24 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/entity/data/model/DynamicEntityDataModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/entity/data/model/DynamicEntityDataModelProvider.java
@@ -29,6 +29,7 @@ import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.Signature;
 import org.eclipse.jpt.common.core.JptResourceType;
 import org.eclipse.jpt.common.core.internal.utility.ProjectTools;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.utility.internal.CollectionTools;
 import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
@@ -40,7 +41,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlDefinition;
 import org.eclipse.jpt.jpa.core.context.persistence.Persistence;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXml;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.entity.data.operation.NewDynamicEntityClassOperation;
@@ -214,7 +214,7 @@ public class DynamicEntityDataModelProvider extends NewJavaClassDataModelProvide
 	private IStatus validateXmlName(String xmlName) {
 		IProject project = this.getTargetProject();
 		if (project != null) {
-			JpaXmlResource ormXmlResource = StringTools.stringIsEmpty(xmlName) ? null : getOrmXmlResource(xmlName);
+			JptXmlResource ormXmlResource = StringTools.stringIsEmpty(xmlName) ? null : getOrmXmlResource(xmlName);
 			if (ormXmlResource == null) {
 				return JptJpaEclipseLinkUiPlugin.instance().buildErrorStatus(EclipseLinkUiMessages.DynamicEntityClassWizardPage_invalidXMLName);
 			}
@@ -225,7 +225,7 @@ public class DynamicEntityDataModelProvider extends NewJavaClassDataModelProvide
 		return Status.OK_STATUS;
 	}
 
-	protected JpaXmlResource getOrmXmlResource(String xmlName) {
+	protected JptXmlResource getOrmXmlResource(String xmlName) {
 		return getJpaProject()== null ? null : getJpaProject().getMappingFileXmlResource(new Path(xmlName));
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/entity/data/operation/NewDynamicEntityClassOperation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/entity/data/operation/NewDynamicEntityClassOperation.java
index 6b14c3a95f..c418928423 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/entity/data/operation/NewDynamicEntityClassOperation.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/entity/data/operation/NewDynamicEntityClassOperation.java
@@ -15,11 +15,11 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.utility.command.Command;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.Entity;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkAccessType;
 import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkEntityMappings;
 import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmPersistentType;
@@ -70,7 +70,7 @@ public class NewDynamicEntityClassOperation extends NewEntityClassOperation {
 		}
 
 		public void execute() {
-			JpaXmlResource xmlResource = this.getOrmXmlResource();
+			JptXmlResource xmlResource = this.getOrmXmlResource();
 			EclipseLinkEntityMappings entityMappings = (EclipseLinkEntityMappings) this.getJpaProject().
 					getJpaFile(xmlResource.getFile()).getRootStructureNodes().iterator().next();
 			EclipseLinkOrmPersistentType persistentType = (EclipseLinkOrmPersistentType) entityMappings.
@@ -132,7 +132,7 @@ public class NewDynamicEntityClassOperation extends NewEntityClassOperation {
 			// do nothing
 		}
 
-		protected JpaXmlResource getOrmXmlResource() {
+		protected JptXmlResource getOrmXmlResource() {
 			return this.model.isMappingXMLDefault() ?
 					this.getJpaProject().getDefaultOrmXmlResource() :
 						this.getJpaProject().getMappingFileXmlResource(new Path(this.model.getMappingXMLName()));
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/DynamicEntityClassWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/DynamicEntityClassWizardPage.java
index 5eeacbfb40..287093fba2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/DynamicEntityClassWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/DynamicEntityClassWizardPage.java
@@ -42,11 +42,11 @@ import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jpt.common.core.internal.utility.ProjectTools;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.utility.internal.CollectionTools;
 import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLink2_1JpaPlatformFactory;
 import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformFactory.EclipseLinkJpaPlatformVersion;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings;
@@ -399,7 +399,7 @@ public class DynamicEntityClassWizardPage extends DataModelWizardPage{
 		dialog.setInput(project);
 			
 		String ormFileName = this.ormXmlNameText.getText();
-		JpaXmlResource resource = jpaProject.getMappingFileXmlResource(new Path(ormFileName));
+		JptXmlResource resource = jpaProject.getMappingFileXmlResource(new Path(ormFileName));
 		IFile initialSelection = (resource != null) ? resource.getFile() : null;
 
 		if (initialSelection != null) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/DynamicEntityFieldTableSection.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/DynamicEntityFieldTableSection.java
index 899234f3a6..c042b76f01 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/DynamicEntityFieldTableSection.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/DynamicEntityFieldTableSection.java
@@ -31,10 +31,10 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jpt.common.core.JptResourceType;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.utility.internal.Tools;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.MappingKeys;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.dialogs.AddVirtualAttributeDialog;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.entity.data.model.DynamicEntityField;
@@ -514,7 +514,7 @@ public class DynamicEntityFieldTableSection extends Composite {
 			return this.getOrmXmlResource(xmlName).getResourceType();
 		}
 
-		protected JpaXmlResource getOrmXmlResource(String xmlName) {
+		protected JptXmlResource getOrmXmlResource(String xmlName) {
 			return this.jpaProject == null ? null : this.jpaProject.getMappingFileXmlResource(new Path(xmlName));
 		}
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkDynamicEntityWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkDynamicEntityWizard.java
index 473122c714..e5451c3797 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkDynamicEntityWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkDynamicEntityWizard.java
@@ -17,10 +17,10 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.ui.internal.util.SWTUtil;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.context.JpaContextNode;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.entity.data.model.DynamicEntityDataModelProvider;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.plugin.JptJpaEclipseLinkUiPlugin;
@@ -97,7 +97,7 @@ public class EclipseLinkDynamicEntityWizard extends DataModelWizard implements I
         	IProject project = (IProject) this.getDataModel().getProperty(INewJavaClassDataModelProperties.PROJECT);
         	JpaProject jpaProject = (JpaProject)(project).getAdapter(JpaProject.class);
         	String xmlRuntimePath = this.getDataModel().getStringProperty(IEntityDataModelProperties.XML_NAME).trim();
-        	JpaXmlResource xmlResource = jpaProject.getMappingFileXmlResource(new Path(xmlRuntimePath));
+        	JptXmlResource xmlResource = jpaProject.getMappingFileXmlResource(new Path(xmlRuntimePath));
             openEditor(xmlResource);
         } catch (Exception cantOpen) {
         	JptJpaEclipseLinkUiPlugin.instance().logError(cantOpen);
@@ -107,7 +107,7 @@ public class EclipseLinkDynamicEntityWizard extends DataModelWizard implements I
 	/*
 	 * Open the EclipseLink mapping file where the dynamic entity is created
 	 */
-	protected void openEditor(final JpaXmlResource xmlResource) {
+	protected void openEditor(final JptXmlResource xmlResource) {
 		SWTUtil.asyncExec(new Runnable() {
 			public void run() {
 				IFile file = xmlResource.getFile();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/DynamicDefaultTableGenerationWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/DynamicDefaultTableGenerationWizardPage.java
index f6080a292e..32c5da5654 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/DynamicDefaultTableGenerationWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/DynamicDefaultTableGenerationWizardPage.java
@@ -15,8 +15,8 @@ import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.window.Window;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.SelectEclipseLinkMappingFileDialog;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
@@ -137,7 +137,7 @@ public class DynamicDefaultTableGenerationWizardPage extends
 		dialog.addFilter(filter);
 			
 		String ormFileName = this.xmlMappingFileText.getText();
-		JpaXmlResource resource = jpaProject.getMappingFileXmlResource(new Path(ormFileName));
+		JptXmlResource resource = jpaProject.getMappingFileXmlResource(new Path(ormFileName));
 		IFile initialSelection = (resource != null) ? resource.getFile() : null;
 		dialog.setInput(this.jpaProject.getProject());
 
@@ -166,7 +166,7 @@ public class DynamicDefaultTableGenerationWizardPage extends
 	
 //	private void validate() {
 //		String errorMessage = null;
-//		JpaXmlResource ormXmlResource = getOrmXmlResource();
+//		JptXmlResource ormXmlResource = getOrmXmlResource();
 //		if (ormXmlResource == null) {
 //			errorMessage = JptUiMessages.JpaMakePersistentWizardPage_mappingFileDoesNotExistError;
 //		}
@@ -174,7 +174,7 @@ public class DynamicDefaultTableGenerationWizardPage extends
 //		setPageComplete(errorMessage == null);
 //	}
 	
-	protected JpaXmlResource getOrmXmlResource() {
+	protected JptXmlResource getOrmXmlResource() {
 		return this.jpaProject.getMappingFileXmlResource(new Path(this.xmlMappingFileText.getText()));
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/GenerateDynamicEntitiesFromSchemaWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/GenerateDynamicEntitiesFromSchemaWizard.java
index caf9063af8..dfd9c72d20 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/GenerateDynamicEntitiesFromSchemaWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/GenerateDynamicEntitiesFromSchemaWizard.java
@@ -23,9 +23,9 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jpt.common.core.resource.ProjectResourceLocator;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.ui.internal.util.SWTUtil;
 import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.db.ConnectionProfile;
 import org.eclipse.jpt.jpa.db.Schema;
 import org.eclipse.jpt.jpa.eclipselink.core.platform.EclipseLinkPlatform;
@@ -96,7 +96,7 @@ public class GenerateDynamicEntitiesFromSchemaWizard extends GenerateEntitiesFro
 		
 		//open file after generation
 		String xmlMappingFileLocation = getCustomizer().getXmlMappingFile();
-		JpaXmlResource jpaXmlResource = this.jpaProject.getMappingFileXmlResource(new Path(xmlMappingFileLocation));
+		JptXmlResource jpaXmlResource = this.jpaProject.getMappingFileXmlResource(new Path(xmlMappingFileLocation));
 		IFile mappingFile;
 		if(jpaXmlResource!=null){
 			mappingFile = jpaXmlResource.getFile();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/PackageGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/PackageGenerator.java
index 11e4ebe3ef..b5e7355a6f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/PackageGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/PackageGenerator.java
@@ -41,12 +41,12 @@ import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jpt.common.core.resource.ProjectResourceLocator;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.utility.internal.CollectionTools;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef;
 import org.eclipse.jpt.jpa.core.context.persistence.Persistence;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.gen.internal.plugin.JptJpaGenPlugin;
 import org.eclipse.jpt.jpa.gen.internal.util.CompilationUnitModifier;
 import org.eclipse.jpt.jpa.gen.internal.util.FileUtil;
@@ -146,7 +146,7 @@ public class PackageGenerator {
 	}
 	
 	private void updatePersistenceXml(final List<String> genClasses) {
-		JpaXmlResource resource = this.jpaProject.getPersistenceXmlResource();
+		JptXmlResource resource = this.jpaProject.getPersistenceXmlResource();
 		if (resource == null) {
 			//the resource would only be null if the persistence.xml file had an invalid content type,
 			//do not attempt to update
@@ -224,7 +224,7 @@ public class PackageGenerator {
 	}
 	
 	private void updatePersistenceXmlForMappingFile(final String mappingFile) {
-		JpaXmlResource resource = this.jpaProject.getPersistenceXmlResource();
+		JptXmlResource resource = this.jpaProject.getPersistenceXmlResource();
 		if (resource == null) {
 			//the resource would only be null if the persistence.xml file had an invalid content type,
 			//do not attempt to update
@@ -393,7 +393,7 @@ public class PackageGenerator {
 
 		try {		
 			String xmlMappingFileLocation = this.customizer.getXmlMappingFile();
-			JpaXmlResource xmlResource = this.jpaProject.getMappingFileXmlResource(new Path(xmlMappingFileLocation));
+			JptXmlResource xmlResource = this.jpaProject.getMappingFileXmlResource(new Path(xmlMappingFileLocation));
 			IFile xmlFile;
 			if (xmlResource != null) {
 				xmlFile = xmlResource.getFile();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml b/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml
index 3fb1cf1437..dc9c462b00 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml
@@ -367,7 +367,7 @@
 						<adapt type="org.eclipse.jpt.jpa.core.context.XmlFile">
 							<test property="org.eclipse.jpt.jpa.core.isNotLatestSupportedVersion"/>
 						</adapt>
-						<adapt type="org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource">
+						<adapt type="org.eclipse.jpt.common.core.resource.xml.JptXmlResource">
 							<test property="org.eclipse.jpt.jpa.core.isNotLatestSupportedVersion"/>
 						</adapt>
 					</or>
@@ -524,7 +524,7 @@
 						variable="selection">
 						<iterate ifEmpty="false">
 							<or>
-								<adapt type="org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource"/>
+								<adapt type="org.eclipse.jpt.common.core.resource.xml.JptXmlResource"/>
 								<adapt type="org.eclipse.core.resources.IProject">
 									<test
 										property="org.eclipse.wst.common.project.facet.core.projectFacet"
@@ -572,7 +572,7 @@
 					<with
 						variable="selection">
 						<iterate ifEmpty="false">
-							<adapt type="org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource">
+							<adapt type="org.eclipse.jpt.common.core.resource.xml.JptXmlResource">
 								<test property="org.eclipse.jpt.jpa.core.isNotLatestSupportedVersion"/>
 							</adapt>
 						</iterate>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/actions/SynchronizeClassesAction.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/actions/SynchronizeClassesAction.java
index 0c37d57f34..8006d8907f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/actions/SynchronizeClassesAction.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/actions/SynchronizeClassesAction.java
@@ -24,6 +24,7 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.ui.internal.utility.SynchronousUiCommandExecutor;
 import org.eclipse.jpt.common.utility.command.Command;
 import org.eclipse.jpt.common.utility.internal.StringTools;
@@ -32,7 +33,6 @@ import org.eclipse.jpt.jpa.core.JpaProjectManager;
 import org.eclipse.jpt.jpa.core.context.persistence.Persistence;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXml;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 import org.eclipse.ui.IObjectActionDelegate;
@@ -154,7 +154,7 @@ public class SynchronizeClassesAction
 				return;
 			}
 
-			JpaXmlResource resource = jpaProject.getPersistenceXmlResource();
+			JptXmlResource resource = jpaProject.getPersistenceXmlResource();
 			if (resource == null) {
 				// the resource can be null if the persistence.xml file has an invalid content type
 				return;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/commands/UpgradeXmlFileVersionHandler.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/commands/UpgradeXmlFileVersionHandler.java
index 75c2d39a7d..214eca6483 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/commands/UpgradeXmlFileVersionHandler.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/commands/UpgradeXmlFileVersionHandler.java
@@ -16,10 +16,10 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
+import org.eclipse.jpt.common.core.resource.xml.ERootObject;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.context.XmlFile;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaRootEObject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 /**
@@ -39,7 +39,7 @@ public class UpgradeXmlFileVersionHandler
 	}
 
 	protected void upgradeXmlFileVersion(Object selectedObject) {
-		JpaXmlResource xmlResource = PlatformTools.getAdapter(selectedObject, JpaXmlResource.class);
+		JptXmlResource xmlResource = PlatformTools.getAdapter(selectedObject, JptXmlResource.class);
 		if (xmlResource == null) {
 			XmlFile xmlFile = PlatformTools.getAdapter(selectedObject, XmlFile.class);
 			if (xmlFile != null) {
@@ -50,7 +50,7 @@ public class UpgradeXmlFileVersionHandler
 			return;
 		}
 
-		JpaRootEObject root = xmlResource.getRootObject();
+		ERootObject root = xmlResource.getRootObject();
 		IContentType contentType = xmlResource.getContentType();
 		JpaProject jpaProject = this.getJpaProject(xmlResource.getFile().getProject());
 		String newVersion = jpaProject.getJpaPlatform().getMostRecentSupportedResourceType(contentType).getVersion();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java
index d833d6b9a3..adef0b4cbe 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java
@@ -44,6 +44,7 @@ import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.jpt.common.core.JptResourceType;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.ui.internal.utility.SynchronousUiCommandExecutor;
 import org.eclipse.jpt.common.ui.internal.utility.swt.SWTTools;
 import org.eclipse.jpt.common.utility.command.Command;
@@ -73,7 +74,6 @@ import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistence
 import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmXmlDefinition;
 import org.eclipse.jpt.jpa.core.resource.ResourceMappingFile;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.ui.JpaPlatformUi;
 import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
@@ -255,7 +255,7 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 		SWTTools.bind(this.mappingFileModel, mappingFileText);
 		this.mappingFileModel.addPropertyChangeListener(PropertyValueModel.VALUE, new PropertyChangeListener() {
 			public void propertyChanged(PropertyChangeEvent event) {
-				JpaXmlResource ormXmlResource = getOrmXmlResource();
+				JptXmlResource ormXmlResource = getOrmXmlResource();
 				if (ormXmlResource == null) {
 					jptResourceType = GenericOrmXmlDefinition.instance().getResourceType(); //just default to 1.0 orm resource type
 				}
@@ -301,7 +301,7 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 		dialog.setMessage(EntityWizardMsg.CHOOSE_MAPPING_XML_MESSAGE);
 		dialog.addFilter(filter);
 			
-		JpaXmlResource resource = this.jpaProject.getMappingFileXmlResource(new Path(getMappingFileLocation()));
+		JptXmlResource resource = this.jpaProject.getMappingFileXmlResource(new Path(getMappingFileLocation()));
 		IFile initialSelection = (resource != null) ? resource.getFile() : null;
 		dialog.setInput(this.jpaProject.getProject());
 
@@ -444,7 +444,7 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 			errorMessage = JptUiMessages.JpaMakePersistentWizardPage_selectedTypesPersistentError;
 		}
 		else if (this.isAddToOrmMappingFile()) {
-			JpaXmlResource ormXmlResource = getOrmXmlResource();
+			JptXmlResource ormXmlResource = getOrmXmlResource();
 			if (ormXmlResource == null) {
 				errorMessage = JptUiMessages.JpaMakePersistentWizardPage_mappingFileDoesNotExistError;
 			}
@@ -515,7 +515,7 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 		}
 	}
 
-	protected JpaXmlResource getOrmXmlResource() {
+	protected JptXmlResource getOrmXmlResource() {
 		return this.getJpaProject().getMappingFileXmlResource(new Path(this.getMappingFileLocation()));
 	}
 	
@@ -635,10 +635,10 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 		implements IRunnableWithProgress
 	{
 		private final JpaProject jpaProject;
-		private final JpaXmlResource ormXmlResource;
+		private final JptXmlResource ormXmlResource;
 		private final AbstractPersistenceUnit.MappedType[] selectedTypes;
 
-		AddToOrmXmlRunnable(JpaProject jpaProject, JpaXmlResource ormXmlResource, AbstractPersistenceUnit.MappedType[] selectedTypes) {
+		AddToOrmXmlRunnable(JpaProject jpaProject, JptXmlResource ormXmlResource, AbstractPersistenceUnit.MappedType[] selectedTypes) {
 			super();
 			this.jpaProject = jpaProject;
 			this.ormXmlResource = ormXmlResource;
@@ -676,10 +676,10 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 		implements IWorkspaceRunnable
 	{
 		private final JpaProject jpaProject;
-		private final JpaXmlResource ormXmlResource;
+		private final JptXmlResource ormXmlResource;
 		private final AbstractPersistenceUnit.MappedType[] selectedTypes;
 
-		AddToOrmXmlWorkspaceRunnable(JpaProject jpaProject, JpaXmlResource ormXmlResource, AbstractPersistenceUnit.MappedType[] selectedTypes) {
+		AddToOrmXmlWorkspaceRunnable(JpaProject jpaProject, JptXmlResource ormXmlResource, AbstractPersistenceUnit.MappedType[] selectedTypes) {
 			super();
 			this.jpaProject = jpaProject;
 			this.ormXmlResource = ormXmlResource;
@@ -825,7 +825,7 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 				throw new RuntimeException(ex);
 			}
 			if (this.listInPersistenceXml) {
-				JpaXmlResource persistenceXmlResource = this.jpaProject.getPersistenceXmlResource();
+				JptXmlResource persistenceXmlResource = this.jpaProject.getPersistenceXmlResource();
 				if (persistenceXmlResource != null) {
 					persistenceXmlResource.save();
 				}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/conversion/java/JavaMetadataConversionWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/conversion/java/JavaMetadataConversionWizardPage.java
index f7de81c380..22f6360ff1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/conversion/java/JavaMetadataConversionWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/conversion/java/JavaMetadataConversionWizardPage.java
@@ -33,6 +33,7 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.jpt.common.core.internal.utility.WorkspaceRunnableAdapter;
 import org.eclipse.jpt.common.core.resource.ProjectResourceLocator;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.ui.internal.util.SWTUtil;
 import org.eclipse.jpt.common.ui.internal.utility.SynchronousUiCommandExecutor;
 import org.eclipse.jpt.common.ui.internal.utility.swt.SWTTools;
@@ -54,7 +55,6 @@ import org.eclipse.jpt.jpa.core.context.persistence.Persistence;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXml;
 import org.eclipse.jpt.jpa.core.resource.ResourceMappingFile;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.jface.XmlMappingFileViewerFilter;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
@@ -270,7 +270,7 @@ public abstract class JavaMetadataConversionWizardPage
 	}
 
 	protected String buildErrorMessage() {
-		JpaXmlResource ormXmlResource = this.getOrmXmlResource();
+		JptXmlResource ormXmlResource = this.getOrmXmlResource();
 		if (ormXmlResource == null) {
 			return JptUiMessages.JavaMetadataConversion_mappingFileDoesNotExist;
 		}
@@ -292,7 +292,7 @@ public abstract class JavaMetadataConversionWizardPage
 		return this.getEntityMappings(this.getOrmXmlResource());
 	}
 
-	protected EntityMappings getEntityMappings(JpaXmlResource ormXmlResource) {
+	protected EntityMappings getEntityMappings(JptXmlResource ormXmlResource) {
 		return (ormXmlResource == null) ? null : this.getEntityMappings_(ormXmlResource);
 	}
 
@@ -300,12 +300,12 @@ public abstract class JavaMetadataConversionWizardPage
 	 * Pre-condition: the specified <code>orm.xml</code> resource is
 	 * not <code>null</code>.
 	 */
-	protected EntityMappings getEntityMappings_(JpaXmlResource ormXmlResource) {
+	protected EntityMappings getEntityMappings_(JptXmlResource ormXmlResource) {
 		Iterator<JpaStructureNode> nodes = this.jpaProject.getJpaFile(ormXmlResource.getFile()).getRootStructureNodes().iterator();
 		return nodes.hasNext() ? (EntityMappings) nodes.next() : null;
 	}
 
-	protected JpaXmlResource getOrmXmlResource() {
+	protected JptXmlResource getOrmXmlResource() {
 		IPath mappingFilePath = this.getMappingFilePath();
 		return (mappingFilePath == null) ? null : this.jpaProject.getMappingFileXmlResource(mappingFilePath);
 	}
@@ -375,7 +375,7 @@ public abstract class JavaMetadataConversionWizardPage
 		dialog.addFilter(this.buildSelectMappingFileDialogViewerFilter());
 		dialog.setInput(project);
 
-		JpaXmlResource resource = this.getOrmXmlResource();
+		JptXmlResource resource = this.getOrmXmlResource();
 		IFile file = (resource == null) ? null : resource.getFile();
 		if (file != null) {
 			dialog.setInitialSelection(file);
@@ -526,7 +526,7 @@ public abstract class JavaMetadataConversionWizardPage
 			this.openEditorOnMappingFile();
 		}
 
-		protected JpaXmlResource getOrmXmlResource() {
+		protected JptXmlResource getOrmXmlResource() {
 			return this.entityMappings.getParent().getXmlResource();
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/EntityClassWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/EntityClassWizardPage.java
index 6b0e319422..d5573f1409 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/EntityClassWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/EntityClassWizardPage.java
@@ -28,12 +28,12 @@ import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jpt.common.core.internal.utility.JDTTools;
 import org.eclipse.jpt.common.core.internal.utility.ProjectTools;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.utility.internal.ArrayTools;
 import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.resource.ResourceMappingFile;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.jpt.jpa.ui.internal.jface.XmlMappingFileViewerFilter;
 import org.eclipse.jpt.jpa.ui.internal.wizards.SelectMappingFileDialog;
@@ -349,7 +349,7 @@ public class EntityClassWizardPage
 		dialog.addFilter(filter);
 			
 		String ormFileName = this.ormXmlName.getText();
-		JpaXmlResource resource = jpaProject.getMappingFileXmlResource(new Path(ormFileName));
+		JptXmlResource resource = jpaProject.getMappingFileXmlResource(new Path(ormFileName));
 		IFile initialSelection = (resource != null) ? resource.getFile() : null;
 		dialog.setInput(project);
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java
index b9193aa13b..4fd8dc47b0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java
@@ -30,9 +30,9 @@ import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.Signature;
 import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
 import org.eclipse.jpt.common.core.internal.utility.ProjectTools;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 import org.eclipse.jpt.jpa.ui.internal.wizards.entity.EntityWizardMsg;
 import org.eclipse.jpt.jpa.ui.internal.wizards.entity.data.operation.NewEntityClassOperation;
@@ -272,7 +272,7 @@ public class EntityDataModelProvider extends NewJavaClassDataModelProvider imple
 			String projectName = this.model.getStringProperty(PROJECT_NAME);
 			IProject project = ProjectUtilities.getProject(projectName);
 			if (project != null) {
-				JpaXmlResource ormXmlResource = StringTools.stringIsEmpty(xmlName) ? null : getOrmXmlResource(xmlName);
+				JptXmlResource ormXmlResource = StringTools.stringIsEmpty(xmlName) ? null : getOrmXmlResource(xmlName);
 				if (ormXmlResource == null) {
 					return JptJpaUiPlugin.instance().buildErrorStatus(EntityWizardMsg.INVALID_XML_NAME);
 				}
@@ -284,7 +284,7 @@ public class EntityDataModelProvider extends NewJavaClassDataModelProvider imple
 		return Status.OK_STATUS;
 	}
 
-	protected JpaXmlResource getOrmXmlResource(String xmlName) {
+	protected JptXmlResource getOrmXmlResource(String xmlName) {
 		return getTargetJpaProject()== null ? null : getTargetJpaProject().getMappingFileXmlResource(new Path(xmlName));
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java
index fc8d99ac1f..827bbec59a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java
@@ -44,6 +44,7 @@ import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
 import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.ui.internal.utility.SynchronousUiCommandExecutor;
 import org.eclipse.jpt.common.utility.command.Command;
 import org.eclipse.jpt.jpa.core.JpaPreferences;
@@ -63,7 +64,6 @@ import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlJavaClassRef;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 import org.eclipse.jpt.jpa.ui.internal.wizards.entity.AnnotatedEntityTemplate;
 import org.eclipse.jpt.jpa.ui.internal.wizards.entity.EntityTemplate;
@@ -447,7 +447,7 @@ public class NewEntityClassOperation extends AbstractDataModelOperation {
 		}
 
 		public void execute() {
-			JpaXmlResource xmlResource = this.getOrmXmlResource();
+			JptXmlResource xmlResource = this.getOrmXmlResource();
 			EntityMappings entityMappings = (EntityMappings) this.getJpaProject().getJpaFile(xmlResource.getFile()).getRootStructureNodes().iterator().next();
 			OrmPersistentType persistentType = entityMappings.addPersistentType(this.typeMappingKey, this.model.getQualifiedJavaClassName());
 
@@ -476,7 +476,7 @@ public class NewEntityClassOperation extends AbstractDataModelOperation {
 			}
 		}
 
-		protected JpaXmlResource getOrmXmlResource() {
+		protected JptXmlResource getOrmXmlResource() {
 			return this.model.isMappingXMLDefault() ?
 					this.getJpaProject().getDefaultOrmXmlResource() :
 					this.getJpaProject().getMappingFileXmlResource(new Path(this.model.getMappingXMLName()));
@@ -540,7 +540,7 @@ public class NewEntityClassOperation extends AbstractDataModelOperation {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				JpaProject jpaProject = (JpaProject) project.getAdapter(JpaProject.class);
-				JpaXmlResource resource = jpaProject.getPersistenceXmlResource();
+				JptXmlResource resource = jpaProject.getPersistenceXmlResource();
 				XmlPersistence xmlPersistence = (XmlPersistence) resource.getRootObject();
 				EList<XmlPersistenceUnit> persistenceUnits = xmlPersistence.getPersistenceUnits();
 				XmlPersistenceUnit persistenceUnit = persistenceUnits.get(0);// Multiply persistence unit support
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java
index ffd20dc18a..0c75571d98 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java
@@ -16,6 +16,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject;
 import org.eclipse.jpt.common.core.tests.internal.utility.jdt.AnnotationTestCase;
 import org.eclipse.jpt.jpa.core.JpaPreferences;
@@ -40,7 +41,6 @@ import org.eclipse.jpt.jpa.core.resource.persistence.XmlJavaClassRef;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject;
 import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
@@ -52,9 +52,9 @@ public abstract class ContextModelTestCase extends AnnotationTestCase
 {
 	protected static final String BASE_PROJECT_NAME = "ContextModelTestProject";
 	
-	protected JpaXmlResource persistenceXmlResource;
+	protected JptXmlResource persistenceXmlResource;
 	
-	protected JpaXmlResource ormXmlResource;
+	protected JptXmlResource ormXmlResource;
 	
 	
 	protected ContextModelTestCase(String name) {
@@ -140,11 +140,11 @@ public abstract class ContextModelTestCase extends AnnotationTestCase
 		waitJob.join();
 	}
 	
-	protected JpaXmlResource getPersistenceXmlResource() {
+	protected JptXmlResource getPersistenceXmlResource() {
 		return this.persistenceXmlResource;
 	}
 	
-	protected JpaXmlResource getOrmXmlResource() {
+	protected JptXmlResource getOrmXmlResource() {
 		return this.ormXmlResource;
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java
index 392cd9e014..dcfc136bc3 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.tests.internal.context;
 import java.util.Iterator;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
 import org.eclipse.jpt.jpa.core.JpaFile;
 import org.eclipse.jpt.jpa.core.JpaNode;
@@ -26,7 +27,6 @@ import org.eclipse.jpt.jpa.core.resource.java.JPA;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlMappingFileRef;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 
 @SuppressWarnings("nls")
 public class JpaFileTests
@@ -112,7 +112,7 @@ public class JpaFileTests
 		JpaFile ormXmlJpaFile = this.getJpaFile(file);
 		assertEquals(getEntityMappings(), ormXmlJpaFile.getRootStructureNodes().iterator().next());
 		
-		JpaXmlResource resource = (JpaXmlResource) ormXmlJpaFile.getResourceModel();
+		JptXmlResource resource = (JptXmlResource) ormXmlJpaFile.getResourceModel();
 		resource.getContents().remove(resource.getRootObject());
 		
 		assertFalse(ormXmlJpaFile.getRootStructureNodes().iterator().hasNext());
@@ -128,7 +128,7 @@ public class JpaFileTests
 		assertNotNull(getPersistenceUnit().getImpliedMappingFileRef());
 		assertEquals(getPersistenceUnit().getImpliedMappingFileRef().getMappingFile().getRoot(), ormXmlJpaFile.getRootStructureNodes().iterator().next());
 		
-		JpaXmlResource resource = (JpaXmlResource) ormXmlJpaFile.getResourceModel();
+		JptXmlResource resource = (JptXmlResource) ormXmlJpaFile.getResourceModel();
 		resource.getContents().remove(resource.getRootObject());
 		
 		assertFalse(ormXmlJpaFile.getRootStructureNodes().iterator().hasNext());
@@ -149,7 +149,7 @@ public class JpaFileTests
 		JpaFile persistenceXmlJpaFile = this.getJpaFile(file);
 		assertEquals(getRootContextNode().getPersistenceXml().getRoot(), persistenceXmlJpaFile.getRootStructureNodes().iterator().next());
 		
-		JpaXmlResource resource = (JpaXmlResource) persistenceXmlJpaFile.getResourceModel();
+		JptXmlResource resource = (JptXmlResource) persistenceXmlJpaFile.getResourceModel();
 		resource.getContents().remove(resource.getRootObject());
 		
 		assertFalse(persistenceXmlJpaFile.getRootStructureNodes().iterator().hasNext());
@@ -165,7 +165,7 @@ public class JpaFileTests
 		
 		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next());
 		
-		JpaXmlResource resource = (JpaXmlResource) persistenceXmlJpaFile.getResourceModel();
+		JptXmlResource resource = (JptXmlResource) persistenceXmlJpaFile.getResourceModel();
 		resource.getContents().remove(resource.getRootObject());
 		
 		assertFalse(javaJpaFile.getRootStructureNodes().iterator().hasNext());
@@ -181,7 +181,7 @@ public class JpaFileTests
 		
 		assertEquals(getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next());
 		
-		JpaXmlResource resource = (JpaXmlResource) persistenceXmlJpaFile.getResourceModel();
+		JptXmlResource resource = (JptXmlResource) persistenceXmlJpaFile.getResourceModel();
 		resource.getContents().remove(resource.getRootObject());
 		
 		assertFalse(javaJpaFile.getRootStructureNodes().iterator().hasNext());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaProjectTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaProjectTests.java
index 51bf4ffe5c..27a9e1a7ff 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaProjectTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaProjectTests.java
@@ -13,6 +13,7 @@ import junit.framework.TestCase;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.JpaWorkspace;
 import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatformFactory;
@@ -25,7 +26,6 @@ import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription;
 import org.eclipse.jpt.jpa.core.platform.JpaPlatformManager;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject;
 import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
@@ -82,7 +82,7 @@ public class JpaProjectTests
 	}
 	
 	public void testGetPersistenceXmlResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getPersistenceXmlResource();
+		JptXmlResource resource = this.getJpaProject().getPersistenceXmlResource();
 		assertNotNull(resource);
 		assertEquals(XmlPersistence.CONTENT_TYPE, resource.getContentType());
 		assertEquals("src/META-INF/persistence.xml", resource.getFile().getProjectRelativePath().toString());
@@ -109,7 +109,7 @@ public class JpaProjectTests
 	}
 	
 	public void testGetDefaultOrmXmlResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getDefaultOrmXmlResource();
+		JptXmlResource resource = this.getJpaProject().getDefaultOrmXmlResource();
 		assertNotNull(resource);
 		assertEquals(XmlEntityMappings.CONTENT_TYPE, resource.getContentType());
 		assertEquals("src/META-INF/orm.xml", resource.getFile().getProjectRelativePath().toString());
@@ -145,7 +145,7 @@ public class JpaProjectTests
 	}
 
 	public void testGetMappingFileResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getMappingFileXmlResource(XmlEntityMappings.DEFAULT_RUNTIME_PATH);
+		JptXmlResource resource = this.getJpaProject().getMappingFileXmlResource(XmlEntityMappings.DEFAULT_RUNTIME_PATH);
 		assertNotNull(resource);
 		assertEquals(XmlEntityMappings.CONTENT_TYPE, resource.getContentType());
 		assertEquals("src/META-INF/orm.xml", resource.getFile().getProjectRelativePath().toString());
@@ -164,7 +164,7 @@ public class JpaProjectTests
 	}
 	
 	public void testGetMappingFileResourceDifferentlyName() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getMappingFileXmlResource(new Path("META-INF/orm2.xml"));
+		JptXmlResource resource = this.getJpaProject().getMappingFileXmlResource(new Path("META-INF/orm2.xml"));
 		assertNull(resource);
 
 		//create the orm2.xml file
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java
index 9c73b83212..bc4db503c9 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java
@@ -9,12 +9,12 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.tests.internal.context.orm;
 
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.context.orm.OrmXml;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlMappingFileRef;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase;
 
 @SuppressWarnings("nls")
@@ -40,7 +40,7 @@ public class OrmXmlTests extends ContextModelTestCase
 	
 	public void testUpdateAddEntityMappings() throws Exception {
 		assertEquals(2, getJpaProject().getJpaFilesSize());
-		JpaXmlResource ormResource = getOrmXmlResource();
+		JptXmlResource ormResource = getOrmXmlResource();
 		ormResource.getContents().clear();
 		ormResource.save(null);
 		
@@ -58,7 +58,7 @@ public class OrmXmlTests extends ContextModelTestCase
 	}
 	
 	public void testUpdateRemoveEntityMappings() throws Exception {
-		JpaXmlResource ormResource = getOrmXmlResource();
+		JptXmlResource ormResource = getOrmXmlResource();
 		
 		assertNotNull(getOrmXml().getRoot());
 		
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTests.java
index 17efa5c01a..01298b3b86 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTests.java
@@ -14,6 +14,7 @@ import java.util.ListIterator;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.utility.internal.CollectionTools;
 import org.eclipse.jpt.common.utility.internal.Tools;
 import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
@@ -36,7 +37,6 @@ import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnitTransactionType;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlProperties;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlProperty;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
@@ -395,7 +395,7 @@ public class PersistenceUnitTests extends ContextModelTestCase
 		PersistenceUnit persistenceUnit = getPersistenceUnit();
 		
 		// test that there is one initially
-		JpaXmlResource ormResource = getOrmXmlResource();
+		JptXmlResource ormResource = getOrmXmlResource();
 		assertTrue(ormResource.fileExists());
 		assertNotNull(persistenceUnit.getImpliedMappingFileRef());
 		
@@ -411,7 +411,7 @@ public class PersistenceUnitTests extends ContextModelTestCase
 		PersistenceUnit persistenceUnit = getPersistenceUnit();
 		
 		// test that there is one initially
-		JpaXmlResource ormResource = getOrmXmlResource();
+		JptXmlResource ormResource = getOrmXmlResource();
 		assertTrue(ormResource.fileExists());
 		assertNotNull(persistenceUnit.getImpliedMappingFileRef());
 		
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java
index 6f7e9f8a2c..246c9cc374 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java
@@ -9,10 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.tests.internal.context.persistence;
 
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXml;
 import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase;
 
 @SuppressWarnings("nls")
@@ -28,7 +28,7 @@ public class PersistenceXmlTests extends ContextModelTestCase
 	
 	public void testUpdateAddPersistence() throws Exception {
 		assertEquals(2, getJpaProject().getJpaFilesSize());
-		JpaXmlResource prm = getPersistenceXmlResource();
+		JptXmlResource prm = getPersistenceXmlResource();
 		prm.getContents().clear();
 		prm.save(null);
 		
@@ -46,7 +46,7 @@ public class PersistenceXmlTests extends ContextModelTestCase
 	}
 	
 	public void testUpdateRemovePersistence() throws Exception {
-		JpaXmlResource prm = getPersistenceXmlResource();
+		JptXmlResource prm = getPersistenceXmlResource();
 		
 		assertNotNull(getPersistenceXml().getRoot());
 		
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/RootContextNodeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/RootContextNodeTests.java
index 82354ff11b..c3d00e3518 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/RootContextNodeTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/RootContextNodeTests.java
@@ -10,9 +10,9 @@
 package org.eclipse.jpt.jpa.core.tests.internal.context.persistence;
 
 import org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.context.JpaRootContextNode;
 import org.eclipse.jpt.jpa.core.internal.operations.PersistenceFileCreationDataModelProvider;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
@@ -41,7 +41,7 @@ public class RootContextNodeTests extends ContextModelTestCase
 	}
 	
 	public void testUpdateRemovePersistenceXml() throws Exception {
-		JpaXmlResource pr = getPersistenceXmlResource();
+		JptXmlResource pr = getPersistenceXmlResource();
 		JpaRootContextNode baseJpaContent = getJavaProject().getJpaProject().getRootContextNode();
 		
 		assertNotNull(baseJpaContent.getPersistenceXml());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLink1_1JpaProjectTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLink1_1JpaProjectTests.java
index 6d479d07d6..9f2b7aa79a 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLink1_1JpaProjectTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLink1_1JpaProjectTests.java
@@ -11,11 +11,11 @@ package org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context;
 
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.internal.operations.JpaFileCreationDataModelProperties;
 import org.eclipse.jpt.jpa.core.internal.operations.OrmFileCreationDataModelProvider;
 import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkJpaProject;
 import org.eclipse.jpt.jpa.eclipselink.core.internal.operations.EclipseLinkOrmFileCreationDataModelProvider;
@@ -44,7 +44,7 @@ public class EclipseLink1_1JpaProjectTests
 	}
 	
 	public void testGetDefaultOrmXmlResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getDefaultOrmXmlResource();
+		JptXmlResource resource = this.getJpaProject().getDefaultOrmXmlResource();
 		assertNotNull(resource);
 		assertEquals(XmlEntityMappings.CONTENT_TYPE, resource.getContentType());
 		assertEquals("src/META-INF/orm.xml", resource.getFile().getProjectRelativePath().toString());	
@@ -91,7 +91,7 @@ public class EclipseLink1_1JpaProjectTests
 	}
 	
 	public void testGetDefaultEclipseLinkOrmXmlResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getDefaultEclipseLinkOrmXmlResource();
+		JptXmlResource resource = this.getJpaProject().getDefaultEclipseLinkOrmXmlResource();
 		assertNull(resource);
 		
 		//add the eclipselink-orm.xml 1.1 file
@@ -145,7 +145,7 @@ public class EclipseLink1_1JpaProjectTests
 	}
 
 	public void testGetMappingFileResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getMappingFileXmlResource(org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings.DEFAULT_RUNTIME_PATH);
+		JptXmlResource resource = this.getJpaProject().getMappingFileXmlResource(org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings.DEFAULT_RUNTIME_PATH);
 		assertNull(resource);
 		
 		//add the eclipselink-orm.xml 1.1 file
@@ -162,7 +162,7 @@ public class EclipseLink1_1JpaProjectTests
 	}
 	
 	public void testGetDifferentlyNamedMappingFileResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getMappingFileXmlResource(new Path("META-INF/orm2.xml"));
+		JptXmlResource resource = this.getJpaProject().getMappingFileXmlResource(new Path("META-INF/orm2.xml"));
 		assertNull(resource);
 
 		//create the orm2.xml file
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLink1_2JpaProjectTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLink1_2JpaProjectTests.java
index 839c0c8272..19265ad577 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLink1_2JpaProjectTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLink1_2JpaProjectTests.java
@@ -11,11 +11,11 @@ package org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context;
 
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.internal.operations.JpaFileCreationDataModelProperties;
 import org.eclipse.jpt.jpa.core.internal.operations.OrmFileCreationDataModelProvider;
 import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkJpaProject;
 import org.eclipse.jpt.jpa.eclipselink.core.internal.operations.EclipseLinkOrmFileCreationDataModelProvider;
@@ -44,7 +44,7 @@ public class EclipseLink1_2JpaProjectTests
 	}
 	
 	public void testGetDefaultOrmXmlResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getDefaultOrmXmlResource();
+		JptXmlResource resource = this.getJpaProject().getDefaultOrmXmlResource();
 		assertNotNull(resource);
 		assertEquals(XmlEntityMappings.CONTENT_TYPE, resource.getContentType());
 		assertEquals("src/META-INF/orm.xml", resource.getFile().getProjectRelativePath().toString());	
@@ -91,7 +91,7 @@ public class EclipseLink1_2JpaProjectTests
 	}
 	
 	public void testGetDefaultEclipseLinkOrmXmlResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getDefaultEclipseLinkOrmXmlResource();
+		JptXmlResource resource = this.getJpaProject().getDefaultEclipseLinkOrmXmlResource();
 		assertNull(resource);
 		
 		//add the eclipselink-orm.xml 1.2 file
@@ -145,7 +145,7 @@ public class EclipseLink1_2JpaProjectTests
 	}
 
 	public void testGetMappingFileResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getMappingFileXmlResource(org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings.DEFAULT_RUNTIME_PATH);
+		JptXmlResource resource = this.getJpaProject().getMappingFileXmlResource(org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings.DEFAULT_RUNTIME_PATH);
 		assertNull(resource);
 		
 		//add the eclipselink-orm.xml 1.2 file
@@ -162,7 +162,7 @@ public class EclipseLink1_2JpaProjectTests
 	}
 	
 	public void testGetDifferentlyNamedMappingFileResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getMappingFileXmlResource(new Path("META-INF/orm2.xml"));
+		JptXmlResource resource = this.getJpaProject().getMappingFileXmlResource(new Path("META-INF/orm2.xml"));
 		assertNull(resource);
 
 		//create the orm2.xml file
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLinkContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLinkContextModelTestCase.java
index ceea67f3a2..87887f577b 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLinkContextModelTestCase.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLinkContextModelTestCase.java
@@ -10,10 +10,10 @@
 package org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context;
 
 import org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.internal.operations.JpaFileCreationDataModelProperties;
 import org.eclipse.jpt.jpa.core.internal.operations.OrmFileCreationDataModelProperties;
 import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject;
 import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkJpaProject;
@@ -33,7 +33,7 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 public abstract class EclipseLinkContextModelTestCase
 	extends ContextModelTestCase
 {
-	protected JpaXmlResource eclipseLinkOrmXmlResource;
+	protected JptXmlResource eclipseLinkOrmXmlResource;
 
 	protected EclipseLinkContextModelTestCase(String name) {
 		super(name);
@@ -116,7 +116,7 @@ public abstract class EclipseLinkContextModelTestCase
 	}
 
 	@Override
-	protected JpaXmlResource getOrmXmlResource() {
+	protected JptXmlResource getOrmXmlResource() {
 		return this.eclipseLinkOrmXmlResource;
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLinkJpaProjectTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLinkJpaProjectTests.java
index e39e03e13e..03aa57626c 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLinkJpaProjectTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/EclipseLinkJpaProjectTests.java
@@ -11,10 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context;
 
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.internal.operations.OrmFileCreationDataModelProvider;
 import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkJpaProject;
 import org.eclipse.jpt.jpa.eclipselink.core.internal.operations.EclipseLinkOrmFileCreationDataModelProvider;
@@ -47,7 +47,7 @@ public class EclipseLinkJpaProjectTests
 	}
 	
 	public void testGetDefaultOrmXmlResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getDefaultOrmXmlResource();
+		JptXmlResource resource = this.getJpaProject().getDefaultOrmXmlResource();
 		assertNotNull(resource);
 		assertEquals(XmlEntityMappings.CONTENT_TYPE, resource.getContentType());
 		assertEquals("src/META-INF/orm.xml", resource.getFile().getProjectRelativePath().toString());	
@@ -80,7 +80,7 @@ public class EclipseLinkJpaProjectTests
 	}
 	
 	public void testGetDefaultEclipseLinkOrmXmlResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getDefaultEclipseLinkOrmXmlResource();
+		JptXmlResource resource = this.getJpaProject().getDefaultEclipseLinkOrmXmlResource();
 		assertNull(resource);
 		
 		//add the eclipselink-orm.xml file
@@ -123,7 +123,7 @@ public class EclipseLinkJpaProjectTests
 	}
 	
 	public void testGetMappingFileResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getMappingFileXmlResource(org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings.DEFAULT_RUNTIME_PATH);
+		JptXmlResource resource = this.getJpaProject().getMappingFileXmlResource(org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings.DEFAULT_RUNTIME_PATH);
 		assertNull(resource);
 		
 		//add the eclipselink-orm.xml file
@@ -140,7 +140,7 @@ public class EclipseLinkJpaProjectTests
 	}
 	
 	public void testGetDifferentlyNamedMappingFileResource() throws Exception {
-		JpaXmlResource resource = this.getJpaProject().getMappingFileXmlResource(new Path("META-INF/orm2.xml"));
+		JptXmlResource resource = this.getJpaProject().getMappingFileXmlResource(new Path("META-INF/orm2.xml"));
 		assertNull(resource);
 
 		//create the orm2.xml file
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java
index ad420fbe49..7bfbc26acf 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java
@@ -13,6 +13,7 @@ import java.util.Iterator;
 import java.util.ListIterator;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.common.utility.internal.CollectionTools;
 import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
 import org.eclipse.jpt.jpa.core.MappingKeys;
@@ -25,7 +26,6 @@ import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlJavaClassRef;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.core.internal.operations.EclipseLinkOrmFileCreationDataModelProvider;
@@ -74,7 +74,7 @@ public class EclipseLinkPersistenceUnitTests
 		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		
 		// test that there is one initially
-		JpaXmlResource eclipseLinkOrmResource = getOrmXmlResource();
+		JptXmlResource eclipseLinkOrmResource = getOrmXmlResource();
 		assertTrue(eclipseLinkOrmResource.fileExists());
 		assertNotNull(persistenceUnit.getImpliedMappingFileRef());
 		assertNotNull(persistenceUnit.getImpliedEclipseLinkMappingFileRef());
@@ -92,7 +92,7 @@ public class EclipseLinkPersistenceUnitTests
 		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		
 		// test that there is one initially
-		JpaXmlResource eclipseLinkOrmResource = getOrmXmlResource();
+		JptXmlResource eclipseLinkOrmResource = getOrmXmlResource();
 		assertTrue(eclipseLinkOrmResource.fileExists());
 		assertNotNull(persistenceUnit.getImpliedMappingFileRef());
 		assertNotNull(persistenceUnit.getImpliedEclipseLinkMappingFileRef());
@@ -113,7 +113,7 @@ public class EclipseLinkPersistenceUnitTests
 		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		
 		// test that there is one initially
-		JpaXmlResource eclipseLinkOrmResource = getOrmXmlResource();
+		JptXmlResource eclipseLinkOrmResource = getOrmXmlResource();
 		assertTrue(eclipseLinkOrmResource.fileExists());
 		assertNotNull(persistenceUnit.getImpliedMappingFileRef());
 		assertNotNull(persistenceUnit.getImpliedEclipseLinkMappingFileRef());
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java
index aaed31974c..bfbb6bef4b 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java
@@ -77,6 +77,7 @@ import org.eclipse.jdt.ui.actions.OrganizeImportsAction;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
+import org.eclipse.jpt.common.core.resource.xml.JptXmlResource;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
 import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
@@ -87,7 +88,6 @@ import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlJavaClassRef;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence;
 import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.facade.EclipseFacade;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages;
@@ -390,7 +390,7 @@ public class JPAEditorUtil {
     
     
 	public static void createRegisterEntityInXMLJob(final JpaProject jpaProject, final String classFQN) {
-		final JpaXmlResource resource = jpaProject.getPersistenceXmlResource();
+		final JptXmlResource resource = jpaProject.getPersistenceXmlResource();
 		XmlPersistence xmlPersistence = (XmlPersistence) resource.getRootObject();
 		EList<XmlPersistenceUnit> persistenceUnits = xmlPersistence.getPersistenceUnits();
 		XmlPersistenceUnit persistenceUnit = persistenceUnits.get(0); // Multiply persistence unit support
@@ -411,7 +411,7 @@ public class JPAEditorUtil {
 	}
     
 	public static void createUnregisterEntityFromXMLJob(final JpaProject jpaProject, final String classFQN) {
-		JpaXmlResource resource = jpaProject.getPersistenceXmlResource();
+		JptXmlResource resource = jpaProject.getPersistenceXmlResource();
 		XmlPersistence xmlPersistence = (XmlPersistence) resource.getRootObject();
 		EList<XmlPersistenceUnit> persistenceUnits = xmlPersistence.getPersistenceUnits();
 		XmlPersistenceUnit persistenceUnit = persistenceUnits.get(0);// Multiply persistence unit support